Skip to content

Commit 54d655b

Browse files
author
Michael Kania
committed
pass backendtype to getkeyring
1 parent 74e5a68 commit 54d655b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

cmd/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,10 @@ func (u *User) RemoveVaultSession() error {
380380
return nil
381381
}
382382

383-
func getKeyring(keychainName string) (*keyring.Keyring, error) {
383+
func getKeyring(keychainName string, backendType keyring.BackendType) (*keyring.Keyring, error) {
384384
ring, err := keyring.Open(keyring.Config{
385385
ServiceName: "aws-vault",
386-
AllowedBackends: keyring.AvailableBackends(),
386+
AllowedBackends: []keyring.BackendType{backendType},
387387
KeychainName: keychainName,
388388
KeychainTrustApplication: true,
389389
})
@@ -487,7 +487,7 @@ func main() {
487487
if keychainName == "" {
488488
keychainName = "login"
489489
}
490-
keyring, err := getKeyring(keychainName)
490+
keyring, err := getKeyring(keychainName, keyring.KeychainBackend)
491491
if err != nil {
492492
log.Fatal(err)
493493
}

cmd/main_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/99designs/aws-vault/vault"
10+
"github.com/99designs/keyring"
1011
"github.com/stretchr/testify/assert"
1112
)
1213

@@ -36,7 +37,7 @@ func TestExistingAWSProfile(t *testing.T) {
3637
"123456789", "engineer"),
3738
Region: "us-west-2",
3839
}
39-
keyring, err := getKeyring("test")
40+
keyring, err := getKeyring("test", keyring.FileBackend)
4041
assert.NoError(t, err)
4142
user := User{
4243
Name: "test",

0 commit comments

Comments
 (0)