Skip to content
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

Jump to bottom

Bump actions/setup-go from 2.2.0 to 4.1.0 #162

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump actions/setup-go from 2.2.0 to 4.1.0 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d10b62
add support for session token
grzn Aug 3, 2021
f230b59
Merge branch '99designs:master' into master
grzn Feb 17, 2022
ea4c504
Bump actions/setup-go from 2.2.0 to 4.1.0
dependabot[bot] Aug 9, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:

- name: Set up Go 1.17
uses: actions/setup-go@v2.2.0
uses: actions/setup-go@v4.1.0
with:
go-version: 1.17
id: go
Expand Down
7 changes: 5 additions & 2 deletions cli/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func ConfigureAddCommand(app *kingpin.Application, a *AwsVault) {
}

func AddCommand(input AddCommandInput, keyring keyring.Keyring, awsConfigFile *vault.ConfigFile) error {
var accessKeyId, secretKey string
var accessKeyId, secretKey, sessionToken string

p, _ := awsConfigFile.ProfileSection(input.ProfileName)
if p.SourceProfile != "" {
Expand All @@ -65,6 +65,9 @@ func AddCommand(input AddCommandInput, keyring keyring.Keyring, awsConfigFile *v
if secretKey = os.Getenv("AWS_SECRET_ACCESS_KEY"); secretKey == "" {
return fmt.Errorf("Missing value for AWS_SECRET_ACCESS_KEY")
}
if sessionToken = os.Getenv("AWS_SESSION_TOKEN"); sessionToken == "" {
return fmt.Errorf("Missing value for AWS_SESSION_TOKEN")
}
} else {
var err error
if accessKeyId, err = prompt.TerminalPrompt("Enter Access Key ID: "); err != nil {
Expand All @@ -75,7 +78,7 @@ func AddCommand(input AddCommandInput, keyring keyring.Keyring, awsConfigFile *v
}
}

creds := aws.Credentials{AccessKeyID: accessKeyId, SecretAccessKey: secretKey}
creds := aws.Credentials{AccessKeyID: accessKeyId, SecretAccessKey: secretKey, SessionToken: sessionToken}

ckr := &vault.CredentialKeyring{Keyring: keyring}
if err := ckr.Set(input.ProfileName, creds); err != nil {
Expand Down