chore: update docker-credential-gcr to use v2

GoogleContainerTools · Feb 26, 2024 · eec0d16 · eec0d16
1 parent 818b139
commit eec0d16
Show file tree

Hide file tree

Showing 35 changed files with 92 additions and 52 deletions.
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -41,7 +41,7 @@ COPY . .
 # Then submit a PR with the changes to `go.mod`, `go.sum`, and `vendor`.
 
 # Get GCR credential helper
-RUN go install github.com/GoogleCloudPlatform/docker-credential-gcr
+RUN go install github.com/GoogleCloudPlatform/docker-credential-gcr/v2
 
 # Get Amazon ECR credential helper
 RUN go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login

diff --git a/go.mod b/go.mod
@@ -1,15 +1,10 @@
 module github.com/GoogleContainerTools/kaniko
 
-go 1.19
+go 1.21
 
 require (
 	cloud.google.com/go/storage v1.38.0
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0
-	// This docker-credential-gcr dependency version is actually the same as v2.1.8.
-	// See https://github.com/GoogleCloudPlatform/docker-credential-gcr/issues/128
-	// To update run: go get github.com/GoogleCloudPlatform/docker-credential-gcr@<commit-sha>
-	// The version string is a side-effect of Go module version numbering rules. Functionality is otherwise unchanged.
-	github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512
 	github.com/aws/aws-sdk-go-v2 v1.25.0
 	github.com/aws/aws-sdk-go-v2/config v1.27.0
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.1
@@ -156,6 +151,7 @@ require (
 	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
+	github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22 // indirect
 	github.com/Microsoft/hcsshim v0.11.0 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5 // indirect

diff --git a/go.sum b/go.sum
@@ -55,6 +55,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512 h1:cauzkEqKnOXwl0L5futNq6BbWWtIRPfJtwDDulac6A8=
 github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512/go.mod h1:6u40niDQl1ufFtykax72lx+pcIO67AoUSu9ebOzdA8Q=
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22 h1:HevuUpLsTedep2D6wnIp6AAJbVgP0BiVxaMt3HXeOyA=
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22/go.mod h1:nzCpg7DFIIkQIZB3mdUPXVvqQ5f/GahA6xgWXTjnK7w=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=

diff --git a/tools/tools.go b/tools/tools.go
@@ -22,7 +22,7 @@ package tools
 // dependencies https://github.com/golang/go/issues/48332
 // These are placeholder imports the make go mod include these tools in its dependency graph.
 import (
-	_ "github.com/GoogleCloudPlatform/docker-credential-gcr"
+	_ "github.com/GoogleCloudPlatform/docker-credential-gcr/v2"
 	_ "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login"
 	_ "github.com/chrismellard/docker-credential-acr-env"
 )
diff --git a/...Platform/docker-credential-gcr/.gitignore → ...tform/docker-credential-gcr/v2/.gitignore b/...Platform/docker-credential-gcr/.gitignore → ...tform/docker-credential-gcr/v2/.gitignore
diff --git a/...orm/docker-credential-gcr/.goreleaser.yml → .../docker-credential-gcr/v2/.goreleaser.yml b/...orm/docker-credential-gcr/.goreleaser.yml → .../docker-credential-gcr/v2/.goreleaser.yml
diff --git a/...CloudPlatform/docker-credential-gcr/BUILD → ...udPlatform/docker-credential-gcr/v2/BUILD b/...CloudPlatform/docker-credential-gcr/BUILD → ...udPlatform/docker-credential-gcr/v2/BUILD
diff --git a/...orm/docker-credential-gcr/CONTRIBUTING.md → .../docker-credential-gcr/v2/CONTRIBUTING.md b/...orm/docker-credential-gcr/CONTRIBUTING.md → .../docker-credential-gcr/v2/CONTRIBUTING.md
diff --git a/...oudPlatform/docker-credential-gcr/LICENSE → ...Platform/docker-credential-gcr/v2/LICENSE b/...oudPlatform/docker-credential-gcr/LICENSE → ...Platform/docker-credential-gcr/v2/LICENSE
diff --git a/...dPlatform/docker-credential-gcr/README.md → ...atform/docker-credential-gcr/v2/README.md b/...dPlatform/docker-credential-gcr/README.md → ...atform/docker-credential-gcr/v2/README.md
diff --git a/...dPlatform/docker-credential-gcr/WORKSPACE → ...atform/docker-credential-gcr/v2/WORKSPACE b/...dPlatform/docker-credential-gcr/WORKSPACE → ...atform/docker-credential-gcr/v2/WORKSPACE
diff --git a/...Platform/docker-credential-gcr/auth/BUILD → ...tform/docker-credential-gcr/v2/auth/BUILD b/...Platform/docker-credential-gcr/auth/BUILD → ...tform/docker-credential-gcr/v2/auth/BUILD
diff --git a/...tform/docker-credential-gcr/auth/login.go → ...rm/docker-credential-gcr/v2/auth/login.go b/...tform/docker-credential-gcr/auth/login.go → ...rm/docker-credential-gcr/v2/auth/login.go
diff --git a/...dPlatform/docker-credential-gcr/cli/BUILD → ...atform/docker-credential-gcr/v2/cli/BUILD b/...dPlatform/docker-credential-gcr/cli/BUILD → ...atform/docker-credential-gcr/v2/cli/BUILD
diff --git a/...atform/docker-credential-gcr/cli/clear.go → ...orm/docker-credential-gcr/v2/cli/clear.go b/...atform/docker-credential-gcr/cli/clear.go → ...orm/docker-credential-gcr/v2/cli/clear.go
diff --git a/...tform/docker-credential-gcr/cli/common.go → ...rm/docker-credential-gcr/v2/cli/common.go b/...tform/docker-credential-gcr/cli/common.go → ...rm/docker-credential-gcr/v2/cli/common.go
diff --git a/...tform/docker-credential-gcr/cli/config.go → ...rm/docker-credential-gcr/v2/cli/config.go b/...tform/docker-credential-gcr/cli/config.go → ...rm/docker-credential-gcr/v2/cli/config.go
diff --git a/...er-credential-gcr/cli/configure-docker.go → ...credential-gcr/v2/cli/configure-docker.go b/...er-credential-gcr/cli/configure-docker.go → ...credential-gcr/v2/cli/configure-docker.go
diff --git a/...docker-credential-gcr/cli/dockerHelper.go → ...ker-credential-gcr/v2/cli/dockerHelper.go b/...docker-credential-gcr/cli/dockerHelper.go → ...ker-credential-gcr/v2/cli/dockerHelper.go
diff --git a/...rm/docker-credential-gcr/cli/gcr-login.go → ...docker-credential-gcr/v2/cli/gcr-login.go b/...rm/docker-credential-gcr/cli/gcr-login.go → ...docker-credential-gcr/v2/cli/gcr-login.go
diff --git a/...m/docker-credential-gcr/cli/gcr-logout.go → ...ocker-credential-gcr/v2/cli/gcr-logout.go b/...m/docker-credential-gcr/cli/gcr-logout.go → ...ocker-credential-gcr/v2/cli/gcr-logout.go
diff --git a/...form/docker-credential-gcr/cli/version.go → ...m/docker-credential-gcr/v2/cli/version.go b/...form/docker-credential-gcr/cli/version.go → ...m/docker-credential-gcr/v2/cli/version.go
diff --git a/...atform/docker-credential-gcr/config/BUILD → ...orm/docker-credential-gcr/v2/config/BUILD b/...atform/docker-credential-gcr/config/BUILD → ...orm/docker-credential-gcr/v2/config/BUILD
diff --git a/...orm/docker-credential-gcr/config/const.go → .../docker-credential-gcr/v2/config/const.go b/...orm/docker-credential-gcr/config/const.go → .../docker-credential-gcr/v2/config/const.go
diff --git a/...form/docker-credential-gcr/config/file.go → ...m/docker-credential-gcr/v2/config/file.go b/...form/docker-credential-gcr/config/file.go → ...m/docker-credential-gcr/v2/config/file.go
diff --git a/...rm/docker-credential-gcr/credhelper/BUILD → ...docker-credential-gcr/v2/credhelper/BUILD b/...rm/docker-credential-gcr/credhelper/BUILD → ...docker-credential-gcr/v2/credhelper/BUILD
diff --git a/...ocker-credential-gcr/credhelper/helper.go → ...er-credential-gcr/v2/credhelper/helper.go b/...ocker-credential-gcr/credhelper/helper.go → ...er-credential-gcr/v2/credhelper/helper.go
diff --git a/...oudPlatform/docker-credential-gcr/main.go → ...Platform/docker-credential-gcr/v2/main.go b/...oudPlatform/docker-credential-gcr/main.go → ...Platform/docker-credential-gcr/v2/main.go
diff --git a/...latform/docker-credential-gcr/store/BUILD → ...form/docker-credential-gcr/v2/store/BUILD b/...latform/docker-credential-gcr/store/BUILD → ...form/docker-credential-gcr/v2/store/BUILD
diff --git a/...form/docker-credential-gcr/store/store.go → ...m/docker-credential-gcr/v2/store/store.go b/...form/docker-credential-gcr/store/store.go → ...m/docker-credential-gcr/v2/store/store.go
diff --git a/...Platform/docker-credential-gcr/util/BUILD → ...tform/docker-credential-gcr/v2/util/BUILD b/...Platform/docker-credential-gcr/util/BUILD → ...tform/docker-credential-gcr/v2/util/BUILD
diff --git a/...form/docker-credential-gcr/util/cmd/BUILD → ...m/docker-credential-gcr/v2/util/cmd/BUILD b/...form/docker-credential-gcr/util/cmd/BUILD → ...m/docker-credential-gcr/v2/util/cmd/BUILD
diff --git a/...rm/docker-credential-gcr/util/cmd/exec.go → ...docker-credential-gcr/v2/util/cmd/exec.go b/...rm/docker-credential-gcr/util/cmd/exec.go → ...docker-credential-gcr/v2/util/cmd/exec.go
diff --git a/...atform/docker-credential-gcr/util/util.go → ...orm/docker-credential-gcr/v2/util/util.go b/...atform/docker-credential-gcr/util/util.go → ...orm/docker-credential-gcr/v2/util/util.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -105,16 +105,16 @@ github.com/Azure/go-autorest/logger
 # github.com/Azure/go-autorest/tracing v0.6.0
 ## explicit; go 1.12
 github.com/Azure/go-autorest/tracing
-# github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512
-## explicit; go 1.17
-github.com/GoogleCloudPlatform/docker-credential-gcr
-github.com/GoogleCloudPlatform/docker-credential-gcr/auth
-github.com/GoogleCloudPlatform/docker-credential-gcr/cli
-github.com/GoogleCloudPlatform/docker-credential-gcr/config
-github.com/GoogleCloudPlatform/docker-credential-gcr/credhelper
-github.com/GoogleCloudPlatform/docker-credential-gcr/store
-github.com/GoogleCloudPlatform/docker-credential-gcr/util
-github.com/GoogleCloudPlatform/docker-credential-gcr/util/cmd
+# github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22
+## explicit; go 1.21
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/auth
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/cli
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/config
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/credhelper
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/store
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/util
+github.com/GoogleCloudPlatform/docker-credential-gcr/v2/util/cmd
 # github.com/Microsoft/go-winio v0.6.1
 ## explicit; go 1.17
 github.com/Microsoft/go-winio