Skip to content

only fetch oidc keys once both apply and plan phases #992

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

Merged
merged 2 commits into from
Jan 3, 2024
Merged

only fetch oidc keys once both apply and plan phases #992

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4296ffc
retrieve keys only once
motatoes Jan 3, 2024
70bd934
fix build error
motatoes Jan 3, 2024
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
15 changes: 9 additions & 6 deletions libs/orchestrator/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ import (
"os"
)

func populateBackendConfig(args []string, provider stscreds.WebIdentityRoleProvider) ([]string, error) {
func populateretrieveBackendConfigArgs(provider stscreds.WebIdentityRoleProvider) ([]string, error) {
creds, err := provider.Retrieve()
var args []string
if err != nil {
return args, fmt.Errorf("populateKeys: Could not retrieve keys from provider %v", err)
}
Expand All @@ -43,17 +44,19 @@ func (job *Job) PopulateAwsCredentialsEnvVarsForJob() error {
if job.StateEnvProvider != nil {
log.Printf("Project-level AWS role detected, Assuming role: %v for project run: %v", job.ProjectName)
var err error
if job.PlanStage != nil {
// TODO: check that the first step is infact the terraform "init" step
job.PlanStage.Steps[0].ExtraArgs, err = populateBackendConfig(job.PlanStage.Steps[0].ExtraArgs, *job.StateEnvProvider)
}
backendConfigArgs, err := populateretrieveBackendConfigArgs(*job.StateEnvProvider)
if err != nil {
log.Printf("Failed to get keys from role: %v", err)
return fmt.Errorf("Failed to get (state) keys from role: %v", err)
}

if job.PlanStage != nil {
// TODO: check that the first step is infact the terraform "init" step
job.PlanStage.Steps[0].ExtraArgs = append(job.PlanStage.Steps[0].ExtraArgs, backendConfigArgs...)
}
if job.ApplyStage != nil {
// TODO: check that the first step is infact the terraform "init" step
job.ApplyStage.Steps[0].ExtraArgs, err = populateBackendConfig(job.ApplyStage.Steps[0].ExtraArgs, *job.StateEnvProvider)
job.ApplyStage.Steps[0].ExtraArgs = append(job.ApplyStage.Steps[0].ExtraArgs, backendConfigArgs...)
}
if err != nil {
log.Printf("Failed to get keys from role: %v", err)
Expand Down