Revert "create prefix for assumeRoleArn (uswitch#459)"

This reverts commit 8103483.

cmd/kiam/agent.go

@@ -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: %s", err.Error())
+		log.Errorf("error configuring TLS: ", err.Error())
 		return err
 	}
 

pkg/aws/sts/cache.go

@@ -25,6 +25,8 @@ import (
 )
 
 type credentialsCache struct {
+	arnResolver     ARNResolver
+	baseARN         string
 	cache           *cache.Cache
 	expiring        chan *CachedCredentials
 	sessionName     string

pkg/server/server_builder.go

@@ -61,15 +61,7 @@ func (b *KiamServerBuilder) WithAWSSTSGateway() (*KiamServerBuilder, error) {
 	if err != nil {
 		return nil, err
 	}
-	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)
+	cfg.WithCredentialsFromAssumedRole(sts.NewSTSCredentialsProvider(), b.config.AssumeRoleArn)
 	stsGateway, err := sts.DefaultGateway(cfg.Config())
 	if err != nil {
 		return nil, err