Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions pbm/storage/gcs/google_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,32 @@ type googleClient struct {

func newGoogleClient(cfg *Config, l log.LogEvent) (*googleClient, error) {
ctx := context.Background()

if cfg.Credentials.PrivateKey == "" || cfg.Credentials.ClientEmail == "" {
return nil, errors.New("clientEmail and privateKey are required for GCS credentials")
}

creds, err := json.Marshal(ServiceAccountCredentials{
Type: "service_account",
PrivateKey: cfg.Credentials.PrivateKey,
ClientEmail: cfg.Credentials.ClientEmail,
AuthURI: "https://accounts.google.com/o/oauth2/auth",
TokenURI: "https://oauth2.googleapis.com/token",
UniverseDomain: "googleapis.com",
AuthProviderCertURL: "https://www.googleapis.com/oauth2/v1/certs",
ClientCertURL: fmt.Sprintf(
"https://www.googleapis.com/robot/v1/metadata/x509/%s",
cfg.Credentials.ClientEmail,
),
})
if err != nil {
return nil, errors.Wrap(err, "marshal GCS credentials")
var cli *storagegcs.Client
var err error

if cfg.Credentials.PrivateKey != "" && cfg.Credentials.ClientEmail != "" {
creds, err := json.Marshal(ServiceAccountCredentials{
Type: "service_account",
PrivateKey: cfg.Credentials.PrivateKey,
ClientEmail: cfg.Credentials.ClientEmail,
AuthURI: "https://accounts.google.com/o/oauth2/auth",
TokenURI: "https://oauth2.googleapis.com/token",
UniverseDomain: "googleapis.com",
AuthProviderCertURL: "https://www.googleapis.com/oauth2/v1/certs",
ClientCertURL: fmt.Sprintf(
"https://www.googleapis.com/robot/v1/metadata/x509/%s",
cfg.Credentials.ClientEmail,
),
})
if err != nil {
return nil, errors.Wrap(err, "marshal GCS credentials")
}
cli, err = storagegcs.NewClient(ctx, option.WithCredentialsJSON(creds))
} else {
// Default to Workload Identity / ADC if no credentials are provided
cli, err = storagegcs.NewClient(ctx)
}

cli, err := storagegcs.NewClient(ctx, option.WithCredentialsJSON(creds))
if err != nil {
return nil, errors.Wrap(err, "new GCS client")
}
Expand Down