From 05375d17f712aeab5ff2eff33081d2e1712a7e70 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Tue, 7 Oct 2025 08:53:27 +0200 Subject: [PATCH] chore(deps): update to module-compatible docker-credential-gcr/v2 (#9591) Signed-off-by: Mikel Olasagasti Uranga --- go.mod | 3 ++- go.sum | 6 ++++-- pkg/fanal/image/registry/google/google.go | 6 +++--- pkg/fanal/image/registry/google/google_test.go | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index fb8f85dd29..8682ce2edc 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3 github.com/BurntSushi/toml v1.5.0 github.com/CycloneDX/cyclonedx-go v0.9.3 - github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible + github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.30 github.com/Masterminds/sprig/v3 v3.3.0 github.com/NYTimes/gziphandler v1.1.1 github.com/alecthomas/chroma v0.10.0 @@ -421,6 +421,7 @@ require ( github.com/tklauser/numcpus v0.7.0 // indirect github.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d // indirect github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect + github.com/toqueteos/webbrowser v1.2.0 // indirect github.com/transparency-dev/merkle v0.0.2 // indirect github.com/ulikunitz/xz v0.5.15 // indirect github.com/valyala/fastjson v1.6.4 // indirect diff --git a/go.sum b/go.sum index a264d38a1d..9e838ca398 100644 --- a/go.sum +++ b/go.sum @@ -113,8 +113,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7Oputl github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= -github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible h1:juIaKLLVhqzP55d8x4cSVgwyQv76Z55/fRv/UBr2KkQ= -github.com/GoogleCloudPlatform/docker-credential-gcr v2.0.5+incompatible/go.mod h1:BB1eHdMLYEFuFdBlRMb0N7YGVdM5s6Pt0njxgvfbGGs= +github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.30 h1:LZKiFW/Mmr5ohlGs/2UmNlv+E0sWoa3lXqbJ8ZKwwDY= +github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.30/go.mod h1:eJtvl30kUrfVmOufsO74vEF32KP0EJBTmpFelxprmVU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 h1:UQUsRi8WTzhZntp5313l+CHIAT95ojUI2lpP/ExlZa4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0/go.mod h1:Cz6ft6Dkn3Et6l2v2a9/RpN7epQ1GtDlO6lj8bEcOvw= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU= @@ -1262,6 +1262,8 @@ github.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d h1:3H+wrTJTy3PV github.com/tonglil/versioning v0.0.0-20170205083536-8b2a4334bd1d/go.mod h1:/jU0OcDkhtRrbaJPiG/p3X7XOP1pkFWLvUbsnQKP6hY= github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 h1:2f304B10LaZdB8kkVEaoXvAMVan2tl9AiK4G0odjQtE= github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0/go.mod h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE= +github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ= +github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM= github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4= github.com/transparency-dev/merkle v0.0.2/go.mod h1:pqSy+OXefQ1EDUVmAJ8MUhHB9TXGuzVAT58PqBoHz1A= github.com/twitchtv/twirp v8.1.3+incompatible h1:+F4TdErPgSUbMZMwp13Q/KgDVuI7HJXP61mNV3/7iuU= diff --git a/pkg/fanal/image/registry/google/google.go b/pkg/fanal/image/registry/google/google.go index 19e91b0246..3e6cf0ed0c 100644 --- a/pkg/fanal/image/registry/google/google.go +++ b/pkg/fanal/image/registry/google/google.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "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/v2/config" + "github.com/GoogleCloudPlatform/docker-credential-gcr/v2/credhelper" + "github.com/GoogleCloudPlatform/docker-credential-gcr/v2/store" "golang.org/x/xerrors" "github.com/aquasecurity/trivy/pkg/fanal/image/registry/intf" diff --git a/pkg/fanal/image/registry/google/google_test.go b/pkg/fanal/image/registry/google/google_test.go index 1bce72897d..cda37a39a7 100644 --- a/pkg/fanal/image/registry/google/google_test.go +++ b/pkg/fanal/image/registry/google/google_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/GoogleCloudPlatform/docker-credential-gcr/store" + "github.com/GoogleCloudPlatform/docker-credential-gcr/v2/store" "github.com/aquasecurity/trivy/pkg/fanal/types" )