Skip to content
This repository was archived by the owner on Mar 5, 2024. It is now read-only.

Adding ARN prefix for assumeRoleArn automatically #459

Merged
merged 1 commit into from
Jul 7, 2021
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cmd/kiam/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (opts *agentCommand) run() error {
b := kiamserver.NewKiamGatewayBuilder().WithAddress(opts.serverAddress).WithKeepAlive(opts.keepaliveParams)
_, err := b.WithTLS(opts.certificatePath, opts.keyPath, opts.caPath)
if err != nil {
log.Errorf("error configuring TLS: ", err.Error())
log.Errorf("error configuring TLS: %s", err.Error())
return err
}

Expand Down
2 changes: 0 additions & 2 deletions pkg/aws/sts/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (
)

type credentialsCache struct {
arnResolver ARNResolver
baseARN string
cache *cache.Cache
expiring chan *CachedCredentials
sessionName string
Expand Down
10 changes: 9 additions & 1 deletion pkg/server/server_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ func (b *KiamServerBuilder) WithAWSSTSGateway() (*KiamServerBuilder, error) {
if err != nil {
return nil, err
}
cfg.WithCredentialsFromAssumedRole(sts.NewSTSCredentialsProvider(), b.config.AssumeRoleArn)
arnResolver, err := newRoleARNResolver(b.config)
if err != nil {
return nil, err
}
assumeRoleARN, err := arnResolver.Resolve(b.config.AssumeRoleArn)
if err != nil {
return nil, err
}
cfg.WithCredentialsFromAssumedRole(sts.NewSTSCredentialsProvider(), assumeRoleARN.ARN)
stsGateway, err := sts.DefaultGateway(cfg.Config())
if err != nil {
return nil, err
Expand Down