Skip to content

enable the BSL service account to be used for requests #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s3than wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

enable the BSL service account to be used for requests #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion velero-plugin-for-gcp/object_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,13 @@ func (o *ObjectStore) Init(config map[string]string) error {
if err != nil {
return errors.WithStack(err)
}
if o.fileCredType == serviceAccountKey {
switch o.fileCredType {
case serviceAccountKey:
// Using Credentials File
err = o.initFromKeyFile(creds)
case externalAccountKey:
// Using Workload Identity Federation - read serviceAccount from BSL config for signing
err = o.initFromComputeEngine(config)
}
} else {
// Using compute engine credentials. Use this if workload identity is enabled.
Expand Down
7 changes: 7 additions & 0 deletions velero-plugin-for-gcp/object_store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,13 @@ func TestObjectExists(t *testing.T) {
}
}

func TestCreateSignedURL_emptyGoogleAccessID(t *testing.T) {
o := newObjectStore(velerotest.NewLogger())
// googleAccessID is empty — simulates external_account credentials with no serviceAccount in BSL config
_, err := o.CreateSignedURL("bucket", "key", 0)
require.EqualError(t, err, "GoogleAccessID is empty, perhaps using external_account credentials, cannot create signed URL")
}

func Test_getSecretAccountKey(t *testing.T) {
type args struct {
secretByte []byte
Expand Down
Loading