Update pipeline drone-kaniko-harness

.harness/harness.yaml

@@ -37,7 +37,7 @@ pipeline:
                       identifier: Build
                       spec:
                         connectorRef: Plugins_Docker_Hub_Connector
-                        image: golang:1.23.0
+                        image: golang:1.22.4
                         shell: Sh
                         command: |-
                           go test ./...
@@ -322,7 +322,7 @@ pipeline:
                       identifier: Build_and_Test
                       spec:
                         connectorRef: Plugins_Docker_Hub_Connector
-                        image: golang:1.23.0
+                        image: golang:1.22.4
                         shell: Sh
                         command: |-
                           go test ./...

README.md

@@ -53,45 +53,6 @@ docker build \
   --file docker/ecr/Dockerfile.linux.amd64 --tag plugins/kaniko-ecr .
 ```
 
-### Enhanced Build Arguments Support
-
-The drone-kaniko plugin now supports an improved build arguments system with the `CustomStringSliceFlag` implementation. This feature provides a more flexible way to pass multiple build arguments to your Docker builds.
-
-#### Multiple Build Arguments with Semicolon Delimiter
-
-A new custom CLI flag type that allows passing multiple build arguments using semicolon (`;`) as a delimiter. This flag is available across all registry implementations:
-
-- `kaniko-docker`
-- `kaniko-gcr` (Google Container Registry)
-- `kaniko-ecr` (Amazon Elastic Container Registry)
-- `kaniko-acr` (Azure Container Registry)
-- `kaniko-gar` (Google Artifact Registry)
-
-**Usage:**
-
-```console
-docker run --rm \
-    -e PLUGIN_BUILD_ARGS_NEW="ARG1=value1;ARG2=value2;ARG3=value3" \
-    -e PLUGIN_REPO=foo/bar \
-    -v $(pwd):/drone \
-    -w /drone \
-    plugins/kaniko:linux-amd64
-```
-
-#### For build args containing commas
-
-When your build arguments contain commas, enable the `PLUGIN_MULTIPLE_BUILD_ARGS` flag:
-
-```console
-docker run --rm \
-    -e PLUGIN_MULTIPLE_BUILD_ARGS=true \
-    -e PLUGIN_BUILD_ARGS_NEW="KEY1=value,with,comma;KEY2=another,value" \
-    -e PLUGIN_REPO=foo/bar \
-    -v $(pwd):/drone \
-    -w /drone \
-    plugins/kaniko:linux-amd64
-```
-
 ## Usage
 
 ### Operation Modes

cmd/kaniko-acr/main.go

@@ -13,8 +13,6 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/crane"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
@@ -22,7 +20,6 @@ import (
 	kaniko "github.com/drone/drone-kaniko"
 	"github.com/drone/drone-kaniko/pkg/artifact"
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 )
 
 const (
@@ -99,17 +96,6 @@ func main() {
 			Usage:  "build args",
 			EnvVar: "PLUGIN_BUILD_ARGS",
 		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
 		cli.StringFlag{
 			Name:   "target",
 			Usage:  "build target",
@@ -220,21 +206,6 @@ func main() {
 			Usage:  "Set this flag if you only want to build the image, without pushing to a registry",
 			EnvVar: "PLUGIN_NO_PUSH",
 		},
-		cli.BoolFlag{
-			Name:   "push-only",
-			Usage:  "Set this flag if you only want to push a pre-built image from a tarball",
-			EnvVar: "PLUGIN_PUSH_ONLY",
-		},
-		cli.StringFlag{
-			Name:   "source-tar-path",
-			Usage:  "Path to the local tarball to be pushed when push-only is set",
-			EnvVar: "PLUGIN_SOURCE_TAR_PATH",
-		},
-		cli.StringFlag{
-			Name:   "tar-path",
-			Usage:  "Set this flag to save the image as a tarball at path",
-			EnvVar: "PLUGIN_TAR_PATH,PLUGIN_DESTINATION_TAR_PATH",
-		},
 		cli.StringFlag{
 			Name:   "verbosity",
 			Usage:  "Set this flag with value as oneof <panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
@@ -409,11 +380,6 @@ func main() {
 }
 
 func run(c *cli.Context) error {
-	// Check if push-only flag is set
-	if c.Bool("push-only") {
-		return handlePushOnly(c)
-	}
-
 	registry := c.String("registry")
 	noPush := c.Bool("no-push")
 
@@ -444,8 +410,6 @@ func run(c *cli.Context) error {
 			AutoTagSuffix:               c.String("auto-tag-suffix"),
 			ExpandTag:                   c.Bool("expand-tag"),
 			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
 			Target:                      c.String("target"),
 			Repo:                        c.String("repo"),
 			Mirrors:                     c.StringSlice("registry-mirrors"),
@@ -507,12 +471,6 @@ func run(c *cli.Context) error {
 		flag := c.Bool("ignore-var-run")
 		plugin.Build.IgnoreVarRun = &flag
 	}
-
-	// Set tar-path if provided
-	if c.IsSet("tar-path") {
-		plugin.Build.TarPath = c.String("tar-path")
-	}
-
 	return plugin.Exec()
 }
 
@@ -725,114 +683,21 @@ func setDockerAuth(username, password, registry, dockerUsername, dockerPassword,
 		Password: password,
 	}
 
-	credentials := []docker.RegistryCredentials{pushToRegistryCreds}
+	pullFromRegistryCreds := docker.RegistryCredentials{
-
+		Registry: dockerRegistry,
-	if dockerRegistry != "" {
+		Username: dockerUsername,
-		pullFromRegistryCreds := docker.RegistryCredentials{
+		Password: dockerPassword,
-			Registry: dockerRegistry,
-			Username: dockerUsername,
-			Password: dockerPassword,
-		}
-		credentials = append(credentials, pullFromRegistryCreds)
-	} else {
-		fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-			"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
 	}
+
+	credentials := []docker.RegistryCredentials{pushToRegistryCreds, pullFromRegistryCreds}
 	return dockerConfig.CreateDockerConfig(credentials, dockerConfigPath)
+
 }
 
 func encodeParam(s string) string {
 	return url.QueryEscape(s)
 }
 
-func handlePushOnly(c *cli.Context) error {
-	// Validate inputs for push-only operation
-	sourceTarPath := c.String("source-tar-path")
-	if sourceTarPath == "" {
-		return fmt.Errorf("source_tar_path is required when push_only is set")
-	}
-
-	if _, err := os.Stat(sourceTarPath); os.IsNotExist(err) {
-		return fmt.Errorf("image tarball does not exist at path: %s", sourceTarPath)
-	}
-
-	repo := c.String("repo")
-	registry := c.String("registry")
-	if repo == "" || registry == "" {
-		return fmt.Errorf("repository and registry must be specified for push-only operation")
-	}
-
-	// Setup ACR authentication
-	publicUrl, err := setupAuth(
-		c.String("tenant-id"),
-		c.String("client-id"),
-		c.String("client-cert"),
-		c.String("client-secret"),
-		c.String("subscription-id"),
-		registry,
-		c.String("base-image-username"),
-		c.String("base-image-password"),
-		c.String("base-image-registry"),
-		false, // We want to push in push-only mode
-	)
-	if err != nil {
-		return err
-	}
-
-	// Load the image from the tarball
-	logrus.Infof("Loading image from tarball: %s", sourceTarPath)
-
-	img, err := crane.Load(sourceTarPath)
-	if err != nil {
-		return fmt.Errorf("failed to load image from tarball: %v", err)
-	}
-
-	// Check if the Docker config directory exists (should have been created by setupAuth)
-	if _, err := os.Stat(dockerConfigPath); os.IsNotExist(err) {
-		return fmt.Errorf("Docker config directory does not exist: %v", err)
-	} else if err != nil {
-		return fmt.Errorf("error checking Docker config directory: %v", err)
-	}
-
-	// Explicitly set DOCKER_CONFIG environment variable to ensure crane finds the config
-	if err := os.Setenv("DOCKER_CONFIG", dockerConfigPath); err != nil {
-		return fmt.Errorf("failed to set DOCKER_CONFIG environment variable: %v", err)
-	}
-
-	// Setup crane options
-	opts := []crane.Option{
-		crane.WithAuthFromKeychain(authn.DefaultKeychain),
-	}
-
-	// Push for each tag
-	tags := c.StringSlice("tags")
-	if len(tags) == 0 {
-		tags = []string{"latest"}
-	}
-
-	// Use the registry from setupAuth if publicUrl is available, otherwise use the provided registry
-	pushRegistry := registry
-	if publicUrl != "" {
-		logrus.Infof("Using public URL for pushing: %s", publicUrl)
-		// Extract just the registry part from the full URL if needed
-		// This depends on the format of publicUrl, adjust parsing as needed
-		pushRegistry = publicUrl
-	}
-
-	for _, tag := range tags {
-		dest := fmt.Sprintf("%s/%s:%s", pushRegistry, repo, tag)
-		logrus.Infof("Pushing image to: %s", dest)
-
-		if err := crane.Push(img, dest, opts...); err != nil {
-			return fmt.Errorf("failed to push image to %s: %v", dest, err)
-		}
-
-		logrus.Infof("Successfully pushed image to %s", dest)
-	}
-
-	return nil
-}
-
 type strct struct {
 	Value []struct {
 		ID string `json:"id"`

cmd/kaniko-acr/main_test.go

@@ -9,9 +9,7 @@ import (
 	"testing"
 
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 	"github.com/stretchr/testify/assert"
-	"github.com/urfave/cli"
 )
 
 const (
@@ -155,215 +153,4 @@ func TestCreateDockerConfigWithoutBaseRegistry(t *testing.T) {
 	// Check if the public Docker Hub auth is not set
 	_, exists := config.Auths[""]
 	assert.False(t, exists)
-}
+}
-
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestCLIIntegrationWithCustomFlag(t *testing.T) {
-	// Test CLI integration with proper flag setup
-	tests := []struct {
-		name     string
-		args     []string
-		expected []string
-	}{
-		{
-			name:     "CLI with single arg",
-			args:     []string{"acr-test", "--args-new", "ARG1=value1"},
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "CLI with multiple args",
-			args:     []string{"acr-test", "--args-new", "ARG1=value1;ARG2=value2"},
-			expected: []string{"ARG1=value1", "ARG2=value2"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			app := cli.NewApp()
-			app.Name = "acr-test"
-
-			var capturedArgs []string
-
-			app.Flags = []cli.Flag{
-				cli.GenericFlag{
-					Name:   "args-new",
-					Usage:  "build args new",
-					EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-					Value:  new(utils.CustomStringSliceFlag),
-				},
-			}
-
-			app.Action = func(c *cli.Context) error {
-				if genericFlag := c.Generic("args-new"); genericFlag != nil {
-					if customFlag, ok := genericFlag.(*utils.CustomStringSliceFlag); ok {
-						capturedArgs = customFlag.GetValue()
-					}
-				}
-				return nil
-			}
-
-			err := app.Run(tt.args)
-			if err != nil {
-				t.Errorf("CLI run error = %v, want nil", err)
-				return
-			}
-
-			if len(capturedArgs) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(capturedArgs), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if capturedArgs[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, capturedArgs[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestACRBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of ACR plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "azure specific args",
-			argsNew:       "AZURE_TENANT_ID=tenant123;AZURE_CLIENT_ID=client456",
-			expectedCount: 2,
-			expectedFirst: "AZURE_TENANT_ID=tenant123",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}
-
-func TestACRAuthenticationFlow(t *testing.T) {
-	// Test that ACR authentication works with build args
-	tests := []struct {
-		name         string
-		tenantId     string
-		clientId     string
-		clientSecret string
-		expectError  bool
-	}{
-		{
-			name:         "missing tenant id",
-			tenantId:     "",
-			clientId:     "client123",
-			clientSecret: "secret456",
-			expectError:  true,
-		},
-		{
-			name:         "missing client id",
-			tenantId:     "tenant123",
-			clientId:     "",
-			clientSecret: "secret456",
-			expectError:  true,
-		},
-		{
-			name:         "missing client secret",
-			tenantId:     "tenant123",
-			clientId:     "client456",
-			clientSecret: "",
-			expectError:  true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This test validates the parameter validation logic
-			// without actually making network calls
-			if tt.tenantId == "" && !tt.expectError {
-				t.Error("Expected error for missing tenant ID")
-			}
-			if tt.clientId == "" && !tt.expectError {
-				t.Error("Expected error for missing client ID")
-			}
-			if tt.clientSecret == "" && !tt.expectError {
-				t.Error("Expected error for missing client secret")
-			}
-		})
-	}
-}

cmd/kaniko-docker/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 	"strings"
 
@@ -13,7 +12,6 @@ import (
 	kaniko "github.com/drone/drone-kaniko"
 	"github.com/drone/drone-kaniko/pkg/artifact"
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 )
 
 const (
@@ -103,17 +101,6 @@ func main() {
 			Usage:  "build args",
 			EnvVar: "PLUGIN_BUILD_ARGS",
 		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
 		cli.StringFlag{
 			Name:   "target",
 			Usage:  "build target",
@@ -251,7 +238,6 @@ func main() {
 			Usage:  "Enable or disable compressed caching.",
 			EnvVar: "PLUGIN_COMPRESSED_CACHING",
 		},
-
 		cli.StringFlag{
 			Name:   "context-sub-path",
 			Usage:  "Sub-path within the context to build.",
@@ -434,8 +420,6 @@ func run(c *cli.Context) error {
 			AutoTagSuffix:               c.String("auto-tag-suffix"),
 			ExpandTag:                   c.Bool("expand-tag"),
 			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
 			Target:                      c.String("target"),
 			Repo:                        buildRepo(c.String("registry"), c.String("repo"), c.Bool("expand-repo")),
 			Mirrors:                     c.StringSlice("registry-mirrors"),
@@ -524,9 +508,6 @@ func setDockerAuth(username, password, registry, baseImageUsername, baseImagePas
 			Password: baseImagePassword,
 		}
 		credentials = append(credentials, pullFromRegistryCreds)
-	} else {
-		fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-			"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
 	}
 	// Creates docker config for both the regustries used for authentication
 	return dockerConfig.CreateDockerConfig(credentials, dockerPath)

cmd/kaniko-docker/main_test.go

@@ -6,8 +6,6 @@ import (
 	"testing"
 
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
-	"github.com/urfave/cli"
 )
 
 func Test_buildRepo(t *testing.T) {
@@ -44,168 +42,6 @@ func Test_buildRepo(t *testing.T) {
 	}
 }
 
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestCLIIntegrationWithCustomFlag(t *testing.T) {
-	// Test CLI integration with proper flag setup
-	tests := []struct {
-		name     string
-		args     []string
-		expected []string
-	}{
-		{
-			name:     "CLI with single arg",
-			args:     []string{"docker-test", "--args-new", "ARG1=value1"},
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "CLI with multiple args",
-			args:     []string{"docker-test", "--args-new", "ARG1=value1;ARG2=value2"},
-			expected: []string{"ARG1=value1", "ARG2=value2"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			app := cli.NewApp()
-			app.Name = "docker-test"
-
-			var capturedArgs []string
-
-			app.Flags = []cli.Flag{
-				cli.GenericFlag{
-					Name:   "args-new",
-					Usage:  "build args new",
-					EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-					Value:  new(utils.CustomStringSliceFlag),
-				},
-			}
-
-			app.Action = func(c *cli.Context) error {
-				if genericFlag := c.Generic("args-new"); genericFlag != nil {
-					if customFlag, ok := genericFlag.(*utils.CustomStringSliceFlag); ok {
-						capturedArgs = customFlag.GetValue()
-					}
-				}
-				return nil
-			}
-
-			err := app.Run(tt.args)
-			if err != nil {
-				t.Errorf("CLI run error = %v, want nil", err)
-				return
-			}
-
-			if len(capturedArgs) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(capturedArgs), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if capturedArgs[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, capturedArgs[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestDockerBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of Docker plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-		{
-			name:          "args with equals and semicolons",
-			argsNew:       "API_URL=https://api.example.com;DEBUG=true;VERSION=1.0.0",
-			expectedCount: 3,
-			expectedFirst: "API_URL=https://api.example.com",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}
-
 func TestCreateDockerConfig(t *testing.T) {
 	config := docker.NewConfig()
 	tempDir, err := ioutil.TempDir("", "docker-config-test")

cmd/kaniko-ecr/custom_string_slice.go

@@ -1,4 +1,4 @@
-package utils
+package main
 
 import (
 	"strings"
@@ -10,7 +10,6 @@ type CustomStringSliceFlag struct {
 	Value []string
 }
 
-// GetValue returns the slice of strings stored in the flag
 func (f *CustomStringSliceFlag) GetValue() []string {
 	if f.Value == nil {
 		return make([]string, 0)
@@ -18,7 +17,6 @@ func (f *CustomStringSliceFlag) GetValue() []string {
 	return f.Value
 }
 
-// String returns a string representation of the flag
 func (f *CustomStringSliceFlag) String() string {
 	if f.Value == nil {
 		return ""
@@ -26,7 +24,6 @@ func (f *CustomStringSliceFlag) String() string {
 	return strings.Join(f.Value, ";")
 }
 
-// Set sets the value of the flag from a string
 func (f *CustomStringSliceFlag) Set(v string) error {
 	for _, s := range strings.Split(v, ";") {
 		s = strings.TrimSpace(s)

cmd/kaniko-ecr/main.go

@@ -30,7 +30,6 @@ import (
 	kaniko "github.com/drone/drone-kaniko"
 	"github.com/drone/drone-kaniko/pkg/artifact"
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/crane"
 )
@@ -133,7 +132,7 @@ func main() {
 			Name:   "args-new",
 			Usage:  "build args new",
 			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
+			Value:  new(CustomStringSliceFlag),
 		},
 		cli.BoolFlag{
 			Name:   "plugin-multiple-build-agrs",
@@ -505,7 +504,7 @@ func run(c *cli.Context) error {
 			AutoTagSuffix:               c.String("auto-tag-suffix"),
 			ExpandTag:                   c.Bool("expand-tag"),
 			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
+			ArgsNew:                     c.Generic("args-new").(*CustomStringSliceFlag).GetValue(),
 			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
 			Target:                      c.String("target"),
 			Repo:                        fmt.Sprintf("%s/%s", c.String("registry"), c.String("repo")),
@@ -586,9 +585,6 @@ func setDockerAuth(dockerRegistry, dockerUsername, dockerPassword, accessKey, se
 			Password: dockerPassword,
 		}
 		credentials = append(credentials, pullFromRegistryCreds)
-	} else {
-		fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-			"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
 	}
 
 	if assumeRole != "" && oidcToken != "" {
@@ -895,60 +891,6 @@ func createECRSession(region, accessKey, secretKey, sessionToken string) *ecrv1.
 	return ecrv1.New(sess)
 }
 
-func getECRCredentials(region, registry, assumeRole, externalId, accessKey, secretKey, oidcToken string) (string, string, error) {
-	if assumeRole != "" && oidcToken != "" {
-		// For OIDC auth with assume role
-		awsAccessKey, awsSecretKey, awsSessionToken, err := getOidcCreds(oidcToken, assumeRole)
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get OIDC credentials: %w", err)
-		}
-
-		// Create ECR session and get auth info
-		svc := createECRSession(region, awsAccessKey, awsSecretKey, awsSessionToken)
-		username, password, _, err := getAuthInfo(svc)
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get ECR credentials: %w", err)
-		}
-		return username, password, nil
-	} else if assumeRole != "" {
-		// For assume role auth
-		username, password, _, err := getAssumeRoleCreds(region, assumeRole, externalId, "")
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get ECR credentials: %w", err)
-		}
-		return username, password, nil
-	} else if accessKey != "" && secretKey != "" {
-		// For direct credentials
-		sess := session.Must(session.NewSession(&awsv1.Config{
-			Region: awsv1.String(region),
-			Credentials: credentials.NewStaticCredentials(
-				accessKey,
-				secretKey,
-				"",
-			),
-		}))
-		svc := ecrv1.New(sess)
-
-		username, password, _, err := getAuthInfo(svc)
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get ECR credentials: %w", err)
-		}
-		return username, password, nil
-	} else {
-		// For IAM role auth (default credentials)
-		sess := session.Must(session.NewSession(&awsv1.Config{
-			Region: awsv1.String(region),
-		}))
-		svc := ecrv1.New(sess)
-
-		username, password, _, err := getAuthInfo(svc)
-		if err != nil {
-			return "", "", fmt.Errorf("failed to get ECR credentials: %w", err)
-		}
-		return username, password, nil
-	}
-}
-
 func handlePushOnly(c *cli.Context) error {
 	sourceTarPath := c.String("source-tar-path")
 	if sourceTarPath == "" {
@@ -971,18 +913,40 @@ func handlePushOnly(c *cli.Context) error {
 		return fmt.Errorf("failed to load image from tarball: %v", err)
 	}
 
-	// Get ECR credentials using the common function
+	// Get ECR credentials using existing auth methods
-	username, password, err := getECRCredentials(
+	var username, password string
-		c.String("region"),
+	var svc *ecrv1.ECR
-		registry,
+	if oidcToken := c.String("oidc-token-id"); oidcToken != "" && c.String("assume-role") != "" {
-		c.String("assume-role"),
+		accessKey, secretKey, sessionToken, err := getOidcCreds(oidcToken, c.String("assume-role"))
-		c.String("external-id"),
+		if err != nil {
-		c.String("access-key"),
+			return fmt.Errorf("failed to get OIDC credentials: %v", err)
-		c.String("secret-key"),
+		}
-		c.String("oidc-token-id"),
+
-	)
+		svc = createECRSession(c.String("region"), accessKey, secretKey, sessionToken)
+	} else if assumeRole := c.String("assume-role"); assumeRole != "" {
+		accessKey, secretKey, sessionToken, err := getAssumeRoleCreds(c.String("region"), assumeRole, c.String("external-id"), "")
+		if err != nil {
+			return fmt.Errorf("failed to get assume role credentials: %v", err)
+		}
+
+		svc = createECRSession(c.String("region"), accessKey, secretKey, sessionToken)
+	} else {
+		// Use direct credentials or IAM role
+		sess := session.Must(session.NewSession(&awsv1.Config{
+			Region: awsv1.String(c.String("region")),
+			Credentials: credentials.NewStaticCredentials(
+				c.String("access-key"),
+				c.String("secret-key"),
+				"",
+			),
+		}))
+		svc = ecrv1.New(sess)
+	}
+	
+	// Get ECR auth token using the configured session
+	username, password, _, err = getAuthInfo(svc)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to get ECR credentials: %v", err)
 	}
 
 	// Setup crane auth

cmd/kaniko-ecr/main_test.go

@@ -7,9 +7,7 @@ import (
 	"testing"
 
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 	"github.com/stretchr/testify/assert"
-	"github.com/urfave/cli"
 )
 
 func TestCreateDockerConfigForECRWithBaseRegistry(t *testing.T) {
@@ -44,166 +42,4 @@ func TestCreateDockerConfigForECRWithBaseRegistry(t *testing.T) {
 
 	expectedDockerAuth := docker.Auth{Auth: base64.StdEncoding.EncodeToString([]byte(dockerUsername + ":" + dockerPassword))}
 	assert.Equal(t, expectedDockerAuth, config.Auths[dockerRegistry])
-}
+}
-
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestCLIIntegrationWithCustomFlag(t *testing.T) {
-	// Test CLI integration with proper flag setup
-	tests := []struct {
-		name     string
-		args     []string
-		expected []string
-	}{
-		{
-			name:     "CLI with single arg",
-			args:     []string{"ecr-test", "--args-new", "ARG1=value1"},
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "CLI with multiple args",
-			args:     []string{"ecr-test", "--args-new", "ARG1=value1;ARG2=value2"},
-			expected: []string{"ARG1=value1", "ARG2=value2"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			app := cli.NewApp()
-			app.Name = "ecr-test"
-
-			var capturedArgs []string
-
-			app.Flags = []cli.Flag{
-				cli.GenericFlag{
-					Name:   "args-new",
-					Usage:  "build args new",
-					EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-					Value:  new(utils.CustomStringSliceFlag),
-				},
-			}
-
-			app.Action = func(c *cli.Context) error {
-				if genericFlag := c.Generic("args-new"); genericFlag != nil {
-					if customFlag, ok := genericFlag.(*utils.CustomStringSliceFlag); ok {
-						capturedArgs = customFlag.GetValue()
-					}
-				}
-				return nil
-			}
-
-			err := app.Run(tt.args)
-			if err != nil {
-				t.Errorf("CLI run error = %v, want nil", err)
-				return
-			}
-
-			if len(capturedArgs) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(capturedArgs), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if capturedArgs[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, capturedArgs[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestECRBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of ECR plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "aws specific args",
-			argsNew:       "AWS_REGION=us-west-2;AWS_ACCOUNT_ID=123456789012",
-			expectedCount: 2,
-			expectedFirst: "AWS_REGION=us-west-2",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}

cmd/kaniko-gar/main.go

@@ -1,12 +1,9 @@
 package main
 
 import (
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 
 	"github.com/joho/godotenv"
 	"github.com/pkg/errors"
@@ -16,17 +13,13 @@ import (
 	kaniko "github.com/drone/drone-kaniko"
 	"github.com/drone/drone-kaniko/pkg/artifact"
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/google/go-containerregistry/pkg/authn"
-	"github.com/google/go-containerregistry/pkg/crane"
-	"github.com/drone/drone-kaniko/pkg/utils"
-
 )
 
 const (
 	dockerConfigPath string = "/kaniko/.docker"
 	// GAR JSON key file path
-	garKeyPath     string = "/kaniko/config.json"
+	garKeyPath       string = "/kaniko/config.json"
-	garEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS"
+	garEnvVariable   string = "GOOGLE_APPLICATION_CREDENTIALS"
 
 	defaultDigestFile string = "/kaniko/digest-file"
 )
@@ -98,17 +91,6 @@ func main() {
 			Usage:  "build args",
 			EnvVar: "PLUGIN_BUILD_ARGS",
 		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
 		cli.StringFlag{
 			Name:   "target",
 			Usage:  "build target",
@@ -184,21 +166,6 @@ func main() {
 			Usage:  "Set this flag if you only want to build the image, without pushing to a registry",
 			EnvVar: "PLUGIN_NO_PUSH",
 		},
-		cli.BoolFlag{
-			Name:   "push-only",
-			Usage:  "Set this flag if you only want to push a pre-built image from a tarball",
-			EnvVar: "PLUGIN_PUSH_ONLY",
-		},
-		cli.StringFlag{
-			Name:   "source-tar-path",
-			Usage:  "Path to the local tarball to be pushed when push-only is set",
-			EnvVar: "PLUGIN_SOURCE_TAR_PATH",
-		},
-		cli.StringFlag{
-			Name:   "tar-path",
-			Usage:  "Set this flag to save the image as a tarball at path",
-			EnvVar: "PLUGIN_TAR_PATH,PLUGIN_DESTINATION_TAR_PATH",
-		},
 		cli.StringFlag{
 			Name:   "verbosity",
 			Usage:  "Set this flag as --verbosity=<panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
@@ -373,11 +340,6 @@ func main() {
 }
 
 func run(c *cli.Context) error {
-	// Check if this is a push-only operation
-	if c.Bool("push-only") {
-		return handlePushOnly(c)
-	}
-
 	noPush := c.Bool("no-push")
 	jsonKey := c.String("json-key")
 	// JSON key may not be set in the following cases:
@@ -389,7 +351,7 @@ func run(c *cli.Context) error {
 		}
 
 		// setup docker config only when base image registry is specified
-		if c.String("base-image-registry") != "" {
+		if c.String("base-image-registry") != ""{
 			if err := setDockerAuth(
 				c.String("base-image-username"),
 				c.String("base-image-password"),
@@ -397,9 +359,6 @@ func run(c *cli.Context) error {
 			); err != nil {
 				return errors.Wrap(err, "failed to create docker config")
 			}
-		} else {
-			fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-				"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
 		}
 	}
 
@@ -414,8 +373,6 @@ func run(c *cli.Context) error {
 			AutoTagSuffix:               c.String("auto-tag-suffix"),
 			ExpandTag:                   c.Bool("expand-tag"),
 			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
 			Target:                      c.String("target"),
 			Repo:                        fmt.Sprintf("%s/%s", c.String("registry"), c.String("repo")),
 			Mirrors:                     c.StringSlice("registry-mirrors"),
@@ -426,9 +383,6 @@ func run(c *cli.Context) error {
 			CacheTTL:                    c.Int("cache-ttl"),
 			DigestFile:                  defaultDigestFile,
 			NoPush:                      noPush,
-			PushOnly:                    c.Bool("push-only"),
-			SourceTarPath:               c.String("source-tar-path"),
-			TarPath:                     c.String("tar-path"),
 			Verbosity:                   c.String("verbosity"),
 			Platform:                    c.String("platform"),
 			SkipUnusedStages:            c.Bool("skip-unused-stages"),
@@ -483,7 +437,7 @@ func run(c *cli.Context) error {
 	return plugin.Exec()
 }
 
-func setDockerAuth(dockerUsername, dockerPassword, dockerRegistry string) error {
+func setDockerAuth(dockerUsername, dockerPassword, dockerRegistry string) (error) {
 	dockerConfig := docker.NewConfig()
 	dockerRegistryCreds := docker.RegistryCredentials{
 		Registry: dockerRegistry,
@@ -507,113 +461,3 @@ func setupGARAuth(jsonKey string) error {
 	}
 	return nil
 }
-
-func handlePushOnly(c *cli.Context) error {
-	// Validate inputs for push-only operation
-	sourceTarPath := c.String("source-tar-path")
-	if sourceTarPath == "" {
-		return fmt.Errorf("source_tar_path is required when push_only is set")
-	}
-
-	if _, err := os.Stat(sourceTarPath); os.IsNotExist(err) {
-		return fmt.Errorf("image tarball does not exist at path: %s", sourceTarPath)
-	}
-
-	repo := c.String("repo")
-	registry := c.String("registry")
-	if repo == "" || registry == "" {
-		return fmt.Errorf("repository and registry must be specified for push-only operation")
-	}
-
-	// Authentication options for crane
-	var opts []crane.Option
-
-	// Setup GAR authentication
-	jsonKey := c.String("json-key")
-	if jsonKey != "" {
-		if err := setupGARAuth(jsonKey); err != nil {
-			return err
-		}
-
-		logrus.Info("Setting up authentication for GAR")
-
-		// Create Docker config directory if it doesn't exist
-		dockerConfigDir := "/kaniko/.docker"
-		if err := os.MkdirAll(dockerConfigDir, 0755); err != nil {
-			return fmt.Errorf("failed to create Docker config directory: %v", err)
-		}
-
-		// Generate a Docker config with GAR auth
-		type DockerAuth struct {
-			Username string `json:"username"`
-			Password string `json:"password"`
-			Auth     string `json:"auth"`
-		}
-
-		type DockerConfig struct {
-			Auths map[string]DockerAuth `json:"auths"`
-		}
-
-		// Create proper Auth field (base64 encoded username:password)
-		username := "_json_key"
-		authString := base64.StdEncoding.EncodeToString([]byte(username + ":" + jsonKey))
-
-		// Use _json_key as username and the key content as password for GAR
-		config := DockerConfig{
-			Auths: map[string]DockerAuth{
-				registry: {
-					Username: username,
-					Password: jsonKey,
-					Auth:     authString,
-				},
-			},
-		}
-
-		// Write the Docker config
-		configBytes, err := json.Marshal(config)
-		if err != nil {
-			return fmt.Errorf("failed to marshal Docker config: %v", err)
-		}
-
-		dockerConfigPath := filepath.Join(dockerConfigDir, "config.json")
-		if err := ioutil.WriteFile(dockerConfigPath, configBytes, 0644); err != nil {
-			return fmt.Errorf("failed to write Docker config: %v", err)
-		}
-
-		// Explicitly set DOCKER_CONFIG environment variable to ensure crane finds the config
-		if err := os.Setenv("DOCKER_CONFIG", dockerConfigDir); err != nil {
-			return fmt.Errorf("failed to set DOCKER_CONFIG environment variable: %v", err)
-		}
-
-		// Set up crane to use basic auth with docker config
-		opts = append(opts, crane.WithAuthFromKeychain(authn.DefaultKeychain))
-	} else {
-		logrus.Warn("No JSON key provided, authentication may fail if not running with workload identity")
-	}
-
-	// Load the image from the tarball
-	logrus.Infof("Loading image from tarball: %s", sourceTarPath)
-	img, err := crane.Load(sourceTarPath)
-	if err != nil {
-		return fmt.Errorf("failed to load image from tarball: %v", err)
-	}
-
-	// Push for each tag
-	tags := c.StringSlice("tags")
-	if len(tags) == 0 {
-		tags = []string{"latest"}
-	}
-
-	for _, tag := range tags {
-		dest := fmt.Sprintf("%s/%s:%s", registry, repo, tag)
-		logrus.Infof("Pushing image to: %s", dest)
-
-		if err := crane.Push(img, dest, opts...); err != nil {
-			return fmt.Errorf("failed to push image to %s: %v", dest, err)
-		}
-
-		logrus.Infof("Successfully pushed image to %s", dest)
-	}
-
-	return nil
-}

cmd/kaniko-gar/main_test.go

@@ -1,286 +0,0 @@
-package main
-
-import (
-	"os"
-	"testing"
-
-	"github.com/drone/drone-kaniko/pkg/utils"
-	"github.com/urfave/cli"
-)
-
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestCLIIntegrationWithCustomFlag(t *testing.T) {
-	// Test CLI integration with proper flag setup
-	tests := []struct {
-		name     string
-		args     []string
-		expected []string
-	}{
-		{
-			name:     "CLI with single arg",
-			args:     []string{"gar-test", "--args-new", "ARG1=value1"},
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "CLI with multiple args",
-			args:     []string{"gar-test", "--args-new", "ARG1=value1;ARG2=value2"},
-			expected: []string{"ARG1=value1", "ARG2=value2"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			app := cli.NewApp()
-			app.Name = "gar-test"
-
-			var capturedArgs []string
-
-			app.Flags = []cli.Flag{
-				cli.GenericFlag{
-					Name:   "args-new",
-					Usage:  "build args new",
-					EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-					Value:  new(utils.CustomStringSliceFlag),
-				},
-			}
-
-			app.Action = func(c *cli.Context) error {
-				if genericFlag := c.Generic("args-new"); genericFlag != nil {
-					if customFlag, ok := genericFlag.(*utils.CustomStringSliceFlag); ok {
-						capturedArgs = customFlag.GetValue()
-					}
-				}
-				return nil
-			}
-
-			err := app.Run(tt.args)
-			if err != nil {
-				t.Errorf("CLI run error = %v, want nil", err)
-				return
-			}
-
-			if len(capturedArgs) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(capturedArgs), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if capturedArgs[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, capturedArgs[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestEnvironmentVariableIntegration(t *testing.T) {
-	// Test that environment variables work with CustomStringSliceFlag
-	originalEnv := os.Getenv("PLUGIN_BUILD_ARGS_NEW")
-	defer func() {
-		if originalEnv != "" {
-			os.Setenv("PLUGIN_BUILD_ARGS_NEW", originalEnv)
-		} else {
-			os.Unsetenv("PLUGIN_BUILD_ARGS_NEW")
-		}
-	}()
-
-	os.Setenv("PLUGIN_BUILD_ARGS_NEW", "ENV_ARG1=env_value1;ENV_ARG2=env_value2")
-
-	app := cli.NewApp()
-	app.Flags = []cli.Flag{
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-	}
-
-	var capturedArgs []string
-	app.Action = func(c *cli.Context) error {
-		if flag := c.Generic("args-new"); flag != nil {
-			if customFlag, ok := flag.(*utils.CustomStringSliceFlag); ok {
-				capturedArgs = customFlag.GetValue()
-			}
-		}
-		return nil
-	}
-
-	err := app.Run([]string{"test"})
-	if err != nil {
-		t.Errorf("App.Run() error = %v, want nil", err)
-		return
-	}
-
-	expected := []string{"ENV_ARG1=env_value1", "ENV_ARG2=env_value2"}
-	if len(capturedArgs) != len(expected) {
-		t.Errorf("Environment variable test: got %d args, want %d", len(capturedArgs), len(expected))
-		return
-	}
-
-	for i, exp := range expected {
-		if capturedArgs[i] != exp {
-			t.Errorf("Environment variable test: got arg[%d] = %v, want %v", i, capturedArgs[i], exp)
-		}
-	}
-}
-
-func TestGARBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of GAR plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "google cloud specific args",
-			argsNew:       "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json;PROJECT_ID=my-project",
-			expectedCount: 2,
-			expectedFirst: "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}
-
-func TestGARRegistryFormatting(t *testing.T) {
-	// Test GAR-specific registry formatting
-	tests := []struct {
-		name     string
-		registry string
-		repo     string
-		expected string
-	}{
-		{
-			name:     "standard GAR format",
-			registry: "us-central1-docker.pkg.dev",
-			repo:     "my-project/my-repo/my-image",
-			expected: "us-central1-docker.pkg.dev/my-project/my-repo/my-image",
-		},
-		{
-			name:     "different region",
-			registry: "europe-west1-docker.pkg.dev",
-			repo:     "project123/repo456/image789",
-			expected: "europe-west1-docker.pkg.dev/project123/repo456/image789",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This would be the format used in the GAR plugin
-			result := tt.registry + "/" + tt.repo
-			if result != tt.expected {
-				t.Errorf("GAR formatting: got %v, want %v", result, tt.expected)
-			}
-		})
-	}
-}
-
-func TestGARAuthSetup(t *testing.T) {
-	// Test GAR authentication setup
-	tests := []struct {
-		name           string
-		jsonKey        string
-		expectAuthFile bool
-	}{
-		{
-			name:           "with json key",
-			jsonKey:        `{"type":"service_account","project_id":"test"}`,
-			expectAuthFile: true,
-		},
-		{
-			name:           "without json key (workload identity)",
-			jsonKey:        "",
-			expectAuthFile: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This simulates the auth setup logic
-			hasAuthFile := tt.jsonKey != ""
-			if hasAuthFile != tt.expectAuthFile {
-				t.Errorf("Auth file expectation: got %v, want %v", hasAuthFile, tt.expectAuthFile)
-			}
-		})
-	}
-}

cmd/kaniko-gcr/main.go

@@ -13,14 +13,13 @@ import (
 	kaniko "github.com/drone/drone-kaniko"
 	"github.com/drone/drone-kaniko/pkg/artifact"
 	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
 )
 
 const (
 	dockerConfigPath string = "/kaniko/.docker"
 	// GCR JSON key file path
-	gcrKeyPath     string = "/kaniko/config.json"
+	gcrKeyPath       string = "/kaniko/config.json"
-	gcrEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS"
+	gcrEnvVariable   string = "GOOGLE_APPLICATION_CREDENTIALS"
 
 	defaultDigestFile string = "/kaniko/digest-file"
 )
@@ -334,18 +333,6 @@ func main() {
 			Usage:  "Number of retries for downloading base images.",
 			EnvVar: "PLUGIN_IMAGE_DOWNLOAD_RETRY",
 		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
-		
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -366,7 +353,7 @@ func run(c *cli.Context) error {
 		}
 
 		// setup docker config only when base image registry is specified
-		if c.String("base-image-registry") != "" {
+		if c.String("base-image-registry") != ""{
 			if err := setDockerAuth(
 				c.String("base-image-username"),
 				c.String("base-image-password"),
@@ -374,9 +361,6 @@ func run(c *cli.Context) error {
 			); err != nil {
 				return errors.Wrap(err, "failed to create docker config")
 			}
-		} else {
-			fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-				"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
 		}
 	}
 
@@ -391,8 +375,6 @@ func run(c *cli.Context) error {
 			AutoTagSuffix:               c.String("auto-tag-suffix"),
 			ExpandTag:                   c.Bool("expand-tag"),
 			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
 			Target:                      c.String("target"),
 			Repo:                        fmt.Sprintf("%s/%s", c.String("registry"), c.String("repo")),
 			Mirrors:                     c.StringSlice("registry-mirrors"),
@@ -457,7 +439,7 @@ func run(c *cli.Context) error {
 	return plugin.Exec()
 }
 
-func setDockerAuth(dockerUsername, dockerPassword, dockerRegistry string) error {
+func setDockerAuth(dockerUsername, dockerPassword, dockerRegistry string) (error) {
 	dockerConfig := docker.NewConfig()
 	dockerRegistryCreds := docker.RegistryCredentials{
 		Registry: dockerRegistry,

cmd/kaniko-gcr/main_test.go

@@ -1,270 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/drone/drone-kaniko/pkg/utils"
-	"github.com/urfave/cli"
-)
-
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestEnvironmentVariableIntegration(t *testing.T) {
-	// Test that environment variables work with CustomStringSliceFlag
-	originalEnv := os.Getenv("PLUGIN_BUILD_ARGS_NEW")
-	defer func() {
-		if originalEnv != "" {
-			os.Setenv("PLUGIN_BUILD_ARGS_NEW", originalEnv)
-		} else {
-			os.Unsetenv("PLUGIN_BUILD_ARGS_NEW")
-		}
-	}()
-
-	os.Setenv("PLUGIN_BUILD_ARGS_NEW", "ENV_ARG1=env_value1;ENV_ARG2=env_value2")
-
-	app := cli.NewApp()
-	app.Flags = []cli.Flag{
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-	}
-
-	var capturedArgs []string
-	app.Action = func(c *cli.Context) error {
-		if flag := c.Generic("args-new"); flag != nil {
-			if customFlag, ok := flag.(*utils.CustomStringSliceFlag); ok {
-				capturedArgs = customFlag.GetValue()
-			}
-		}
-		return nil
-	}
-
-	err := app.Run([]string{"test"})
-	if err != nil {
-		t.Errorf("App.Run() error = %v, want nil", err)
-		return
-	}
-
-	expected := []string{"ENV_ARG1=env_value1", "ENV_ARG2=env_value2"}
-	if len(capturedArgs) != len(expected) {
-		t.Errorf("Environment variable test: got %d args, want %d", len(capturedArgs), len(expected))
-		return
-	}
-
-	for i, exp := range expected {
-		if capturedArgs[i] != exp {
-			t.Errorf("Environment variable test: got arg[%d] = %v, want %v", i, capturedArgs[i], exp)
-		}
-	}
-}
-
-func TestGCRBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of GCR plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "google cloud specific args",
-			argsNew:       "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json;PROJECT_ID=my-project",
-			expectedCount: 2,
-			expectedFirst: "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}
-
-func TestGCRRegistryFormatting(t *testing.T) {
-	// Test GCR-specific registry formatting
-	tests := []struct {
-		name     string
-		registry string
-		repo     string
-		expected string
-	}{
-		{
-			name:     "standard GCR format",
-			registry: "gcr.io",
-			repo:     "my-project/my-image",
-			expected: "gcr.io/my-project/my-image",
-		},
-		{
-			name:     "regional GCR",
-			registry: "us.gcr.io",
-			repo:     "project123/image456",
-			expected: "us.gcr.io/project123/image456",
-		},
-		{
-			name:     "european GCR",
-			registry: "eu.gcr.io",
-			repo:     "my-eu-project/my-app",
-			expected: "eu.gcr.io/my-eu-project/my-app",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This would be the format used in the GCR plugin
-			result := tt.registry + "/" + tt.repo
-			if result != tt.expected {
-				t.Errorf("GCR formatting: got %v, want %v", result, tt.expected)
-			}
-		})
-	}
-}
-
-func TestGCRJSONKeyValidation(t *testing.T) {
-	// Test JSON key validation for GCR authentication
-	tests := []struct {
-		name      string
-		jsonKey   string
-		expectErr bool
-	}{
-		{
-			name:      "empty json key",
-			jsonKey:   "",
-			expectErr: false, // Empty is allowed (workload identity)
-		},
-		{
-			name:      "valid json structure",
-			jsonKey:   `{"type":"service_account","project_id":"test","private_key_id":"123"}`,
-			expectErr: false,
-		},
-		{
-			name:      "invalid json",
-			jsonKey:   `{invalid json}`,
-			expectErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This simulates the JSON key validation that would happen in GCR
-			if tt.jsonKey != "" {
-				var data map[string]interface{}
-				err := json.Unmarshal([]byte(tt.jsonKey), &data)
-				if err != nil && !tt.expectErr {
-					t.Errorf("Expected no error for JSON key, got %v", err)
-				}
-				if err == nil && tt.expectErr {
-					t.Errorf("Expected error for JSON key, got nil")
-				}
-			}
-		})
-	}
-}
-
-func TestGCRAuthSetup(t *testing.T) {
-	// Test GCR authentication setup
-	tests := []struct {
-		name           string
-		jsonKey        string
-		expectAuthFile bool
-	}{
-		{
-			name:           "with json key",
-			jsonKey:        `{"type":"service_account","project_id":"test"}`,
-			expectAuthFile: true,
-		},
-		{
-			name:           "without json key (workload identity)",
-			jsonKey:        "",
-			expectAuthFile: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This simulates the auth setup logic
-			hasAuthFile := tt.jsonKey != ""
-			if hasAuthFile != tt.expectAuthFile {
-				t.Errorf("Auth file expectation: got %v, want %v", hasAuthFile, tt.expectAuthFile)
-			}
-		})
-	}
-}

docker/acr/Dockerfile.linux.amd64

@@ -1,5 +1,5 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-amd64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 ADD release/linux/amd64/kaniko-acr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-acr"]

docker/acr/Dockerfile.linux.arm64

@@ -1,8 +1,8 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-arm64
+FROM gcr.io/kaniko-project/executor:v1.23.0
 
 ENV HOME /root
 ENV USER root
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.0
 ADD release/linux/arm64/kaniko-acr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-acr"]

docker/docker/Dockerfile.linux.amd64

@@ -1,5 +1,5 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-amd64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 ADD release/linux/amd64/kaniko-docker /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-docker"]

docker/docker/Dockerfile.linux.arm64

@@ -1,8 +1,8 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-arm64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
 ENV HOME /root
 ENV USER root
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 ADD release/linux/arm64/kaniko-docker /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-docker"]

docker/ecr/Dockerfile.linux.amd64

@@ -1,5 +1,5 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-amd64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 ADD release/linux/amd64/kaniko-ecr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-ecr"]

docker/ecr/Dockerfile.linux.arm64

@@ -1,8 +1,8 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-arm64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
 ENV HOME /root
 ENV USER root
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 
 ADD release/linux/arm64/kaniko-ecr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-ecr"]

docker/gar/Dockerfile.linux.amd64

@@ -1,5 +1,5 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-amd64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 ADD release/linux/amd64/kaniko-gar /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-gar"]

docker/gar/Dockerfile.linux.arm64

@@ -1,8 +1,8 @@
-FROM harnesscommunity/kaniko-executor:1.25.0-linux-arm64
+FROM gcr.io/kaniko-project/executor:v1.23.2
 
 ENV HOME /root
 ENV USER root
-ENV KANIKO_VERSION=1.25.0
+ENV KANIKO_VERSION=1.23.2
 
 ADD release/linux/arm64/kaniko-gar /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-gar"]

go.mod

@@ -10,15 +10,15 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.8
 	github.com/aws/smithy-go v1.12.0
 	github.com/coreos/go-semver v0.3.0
-	github.com/google/go-cmp v0.6.0
+	github.com/google/go-cmp v0.5.9
-	github.com/google/go-containerregistry v0.20.3
+	github.com/google/go-containerregistry v0.20.2
 	github.com/hashicorp/go-version v1.6.0
 	github.com/joho/godotenv v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.8.4
-	github.com/urfave/cli v1.22.15
+	github.com/urfave/cli v1.22.12
-	golang.org/x/mod v0.22.0
+	golang.org/x/mod v0.17.0
 )
 
 require (
@@ -32,32 +32,31 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.8 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.11.12 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 // indirect
-	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/cli v27.5.0+incompatible // indirect
+	github.com/docker/cli v27.1.1+incompatible // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.2 // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/vbatts/tar-split v0.11.6 // indirect
+	github.com/vbatts/tar-split v0.11.3 // indirect
 	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-go 1.23.0
+go 1.22.4
-
-toolchain go1.23.8

go.sum

@@ -6,7 +6,7 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 h1:jp0dGvZ7ZK0mgqnTSClMxa5
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.5.3 h1:TsFCaaF5tR4XN8b4zLVl/J4qMb0nf80Q4CXcpXDNJDY=
 github.com/AzureAD/microsoft-authentication-library-for-go v0.5.3/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/aws/aws-sdk-go v1.44.52 h1:kHLbYJj59C7VrsLM4gm7pxsvaNIvhXCCIDYEFFoQ+VE=
 github.com/aws/aws-sdk-go v1.44.52/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
 github.com/aws/aws-sdk-go-v2 v1.16.7 h1:zfBwXus3u14OszRxGcqCDS4MfMCv10e8SMJ2r8Xm0Ns=
@@ -35,34 +35,35 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.16.9 h1:yOfILxyjmtr2ubRkRJldlHDFBhf5
 github.com/aws/aws-sdk-go-v2/service/sts v1.16.9/go.mod h1:O1IvkYxr+39hRf960Us6j0x1P8pDqhTX+oXM5kQNl/Y=
 github.com/aws/smithy-go v1.12.0 h1:gXpeZel/jPoWQ7OEmLIgCUnhkFftqNfwWUwAHSlp1v0=
 github.com/aws/smithy-go v1.12.0/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
-github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8=
+github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k=
-github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
+github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
-github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
+github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE=
-github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
+github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
-github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
+github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
+github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
-github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
+github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=
 github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
 github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
+github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo=
-github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
+github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -74,8 +75,12 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -83,56 +88,61 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
-github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/urfave/cli v1.22.12 h1:igJgVw1JdKH+trcLWLeLwZjU9fEfPesQ+9/e4MQ44S8=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
-github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
+github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=
-github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
+github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
-github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
-github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=