From 87401302f6009350e5ce7c8d9ed402453965dc31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Jan 2026 15:47:58 +0000 Subject: [PATCH] chore(deps): bump google.golang.org/api from 0.257.0 to 0.258.0 (#17761) Bumps [google.golang.org/api](https://github.com/googleapis/google-api-go-client) from 0.257.0 to 0.258.0. - [Release notes](https://github.com/googleapis/google-api-go-client/releases) - [Changelog](https://github.com/googleapis/google-api-go-client/blob/main/CHANGES.md) - [Commits](https://github.com/googleapis/google-api-go-client/compare/v0.257.0...v0.258.0) --- updated-dependencies: - dependency-name: google.golang.org/api dependency-version: 0.258.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- storage/remote/googleiam/googleiam.go | 11 ++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c8d1250cca..808b391c45 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( golang.org/x/sync v0.19.0 golang.org/x/sys v0.39.0 golang.org/x/text v0.32.0 - google.golang.org/api v0.257.0 + google.golang.org/api v0.258.0 google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b google.golang.org/grpc v1.78.0 google.golang.org/protobuf v1.36.11 diff --git a/go.sum b/go.sum index 823a33c02d..bbe0ea9129 100644 --- a/go.sum +++ b/go.sum @@ -706,8 +706,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= -google.golang.org/api v0.257.0 h1:8Y0lzvHlZps53PEaw+G29SsQIkuKrumGWs9puiexNAA= -google.golang.org/api v0.257.0/go.mod h1:4eJrr+vbVaZSqs7vovFd1Jb/A6ml6iw2e6FBYf3GAO4= +google.golang.org/api v0.258.0 h1:IKo1j5FBlN74fe5isA2PVozN3Y5pwNKriEgAXPOkDAc= +google.golang.org/api v0.258.0/go.mod h1:qhOMTQEZ6lUps63ZNq9jhODswwjkjYYguA7fA3TBFww= google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4= google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s= google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b h1:uA40e2M6fYRBf0+8uN5mLlqUtV192iiksiICIBkYJ1E= diff --git a/storage/remote/googleiam/googleiam.go b/storage/remote/googleiam/googleiam.go index acf3bd5a68..0555458d69 100644 --- a/storage/remote/googleiam/googleiam.go +++ b/storage/remote/googleiam/googleiam.go @@ -19,6 +19,7 @@ import ( "context" "fmt" "net/http" + "os" "golang.org/x/oauth2/google" "google.golang.org/api/option" @@ -41,7 +42,15 @@ func NewRoundTripper(cfg *Config, next http.RoundTripper) (http.RoundTripper, er option.WithScopes(scopes), } if cfg.CredentialsFile != "" { - opts = append(opts, option.WithCredentialsFile(cfg.CredentialsFile)) + credBytes, err := os.ReadFile(cfg.CredentialsFile) + if err != nil { + return nil, fmt.Errorf("error reading Google credentials file: %w", err) + } + creds, err := google.CredentialsFromJSON(ctx, credBytes, scopes) + if err != nil { + return nil, fmt.Errorf("error parsing Google credentials file: %w", err) + } + opts = append(opts, option.WithCredentials(creds)) } else { creds, err := google.FindDefaultCredentials(ctx, scopes) if err != nil {