Update aws config mocks

aws-cloudformation · Mar 1, 2021 · 97582f0 · 97582f0
1 parent 2c3c720
commit 97582f0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/internal/aws/aws.go b/internal/aws/aws.go
@@ -35,18 +35,9 @@ func MFAProvider() (string, error) {
 var awsCfg *aws.Config
 var creds aws.Credentials
 
-// For debug resolver
-type uaResolver string
-
 var defaultSessionName = fmt.Sprintf("%s-%s", config.NAME, config.VERSION)
 var lastSessionName = defaultSessionName
 
-func (u uaResolver) ResolveEndpoint(service string, region string) (aws.Endpoint, error) {
-	return aws.Endpoint{
-		URL: string(u),
-	}, nil
-}
-
 func loadConfig(ctx context.Context, sessionName string) *aws.Config {
 	// Credential configs
 	var configs = make([]func(*awsconfig.LoadOptions) error, 0)

diff --git a/internal/aws/cfn/mock.go b/internal/aws/cfn/mock.go
@@ -193,7 +193,7 @@ func GetChangeSet(stackName, changeSetName string) (*cloudformation.DescribeChan
 					Details: []types.ResourceChangeDetail{
 						{
 							CausingEntity: ptr.String("mock entity"),
-							ChangeSource:  types.ChangeSourceResourceattribute,
+							ChangeSource:  types.ChangeSourceResourceAttribute,
 							Evaluation:    types.EvaluationTypeDynamic,
 							Target: &types.ResourceTargetDefinition{
 								Attribute:          types.ResourceAttributeProperties,

diff --git a/internal/aws/mock.go b/internal/aws/mock.go
@@ -5,6 +5,7 @@ package aws
 
 import (
 	"context"
+	"fmt"
 	"os"
 
 	"github.com/aws-cloudformation/rain/internal/config"
@@ -14,7 +15,10 @@ import (
 
 var awsCfg *aws.Config
 
-func loadConfig(ctx context.Context) aws.Config {
+var defaultSessionName = fmt.Sprintf("%s-%s", config.NAME, config.VERSION)
+var lastSessionName = defaultSessionName
+
+func loadConfig(ctx context.Context, sessionName string) *aws.Config {
 	cfg := aws.Config{}
 
 	if config.Region != "" {
@@ -23,18 +27,29 @@ func loadConfig(ctx context.Context) aws.Config {
 		cfg.Region = r
 	}
 
-	return cfg
+	lastSessionName = sessionName
+
+	return &cfg
 }
 
 // Config loads an aws.Config based on current settings
 func Config() aws.Config {
-	if awsCfg == nil {
-		spinner.Push("Loading AWS config")
+	return NamedConfig(defaultSessionName)
+}
 
-		cfg := loadConfig(context.Background())
+// NamedConfig loads an aws.Config based on current settings
+// with configurable session name
+func NamedConfig(sessionName string) aws.Config {
+	message := "Loading AWS config"
 
-		awsCfg = &cfg
+	if sessionName != lastSessionName {
+		message = "Reloading AWS credentials"
+		awsCfg = nil
+	}
 
+	if awsCfg == nil {
+		spinner.Push(message)
+		awsCfg = loadConfig(context.Background(), sessionName)
 		spinner.Pop()
 	}