Merge pull request #1277 from jcechace/release-2.13.0-PBM-1660-creds-err-fix

jcechace · web-flow · commit e9b57e1395fe · 2026-02-26T13:22:33.000+01:00
PBM-1660: Passing correct cause error when finding default credentials fails
diff --git a/pbm/storage/gcs/google_client.go b/pbm/storage/gcs/google_client.go
@@ -59,11 +59,11 @@ func newGoogleClient(cfg *Config, l log.LogEvent) (*googleClient, error) {
 		// We only check the credentials type, the scoped used hear doesn't really matter
 		adc, adcErr := google.FindDefaultCredentials(ctx, storagegcs.ScopeReadOnly)
 		if adcErr != nil {
-			return nil, fmt.Errorf("finding default credentials: %w", err)
+			return nil, fmt.Errorf("finding default credentials: %w", adcErr)
 		}
 		adcErr = validateDefaultCredentialType(adc)
 		if adcErr != nil {
-			return nil, fmt.Errorf("validate default credential type: %w", err)
+			return nil, fmt.Errorf("validate default credential type: %w", adcErr)
 		}
 		cli, err = storagegcs.NewClient(ctx)
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,11 @@ func newGoogleClient(cfg Config, l log.LogEvent) (googleClient, error) {`
`59`	`59`	`// We only check the credentials type, the scoped used hear doesn't really matter`
`60`	`60`	`adc, adcErr := google.FindDefaultCredentials(ctx, storagegcs.ScopeReadOnly)`
`61`	`61`	`if adcErr != nil {`
`62`		`- return nil, fmt.Errorf("finding default credentials: %w", err)`
	`62`	`+ return nil, fmt.Errorf("finding default credentials: %w", adcErr)`
`63`	`63`	`}`
`64`	`64`	`adcErr = validateDefaultCredentialType(adc)`
`65`	`65`	`if adcErr != nil {`
`66`		`- return nil, fmt.Errorf("validate default credential type: %w", err)`
	`66`	`+ return nil, fmt.Errorf("validate default credential type: %w", adcErr)`
`67`	`67`	`}`
`68`	`68`	`cli, err = storagegcs.NewClient(ctx)`
`69`	`69`	`}`