Skip to content
Merged
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
24 changes: 21 additions & 3 deletions pkg/cfaws/assumer_aws_credential_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,22 @@ func (cpa *CredentialProcessAssumer) AssumeTerminal(ctx context.Context, c *Prof
}
if p.AWSConfig.MFASerial != "" {
aro.SerialNumber = &p.AWSConfig.MFASerial
aro.TokenProvider = MfaTokenProvider
if configOpts.MFATokenCode != "" {
aro.TokenProvider = func() (string, error) {
return configOpts.MFATokenCode, nil
}
} else {
aro.TokenProvider = MfaTokenProvider
}
} else if c.AWSConfig.MFASerial != "" {
aro.SerialNumber = &c.AWSConfig.MFASerial
aro.TokenProvider = MfaTokenProvider
if configOpts.MFATokenCode != "" {
aro.TokenProvider = func() (string, error) {
return configOpts.MFATokenCode, nil
}
} else {
aro.TokenProvider = MfaTokenProvider
}
}
aro.Duration = configOpts.Duration
})
Expand All @@ -69,7 +81,13 @@ func (cpa *CredentialProcessAssumer) AssumeTerminal(ctx context.Context, c *Prof
aro.RoleSessionName = getRoleSessionNameFromProfile(c)
if c.AWSConfig.MFASerial != "" {
aro.SerialNumber = &c.AWSConfig.MFASerial
aro.TokenProvider = MfaTokenProvider
if configOpts.MFATokenCode != "" {
aro.TokenProvider = func() (string, error) {
return configOpts.MFATokenCode, nil
}
} else {
aro.TokenProvider = MfaTokenProvider
}
}
aro.Duration = configOpts.Duration
if c.AWSConfig.ExternalID != "" {
Expand Down