Merge pull request #386 from coveooss/fix/DT-5209-infinite-loop-sessi…

…on-duration

Fix infinite loop when extending role session duration

config.go

@@ -162,18 +162,13 @@ func (config TGFConfig) String() string {
 
 var cachedAwsConfig *aws.Config
 
-func (tgfConfig *TGFConfig) getAwsConfig(assumeRoleDuration time.Duration) (aws.Config, error) {
-	if cachedAwsConfig != nil {
-		log.Debug("Using cached AWS config")
-		return *cachedAwsConfig, nil
-	}
-
+func (tgfConfig *TGFConfig) loadDefaultConfig(assumeRoleDuration time.Duration) (aws.Config, error) {
 	log.Debugf("Creating new AWS config (assumeRoleDuration=%s)", assumeRoleDuration)
-	config, err := awsConfig.LoadDefaultConfig(
+	return awsConfig.LoadDefaultConfig(
 		context.TODO(),
 		awsConfig.WithSharedConfigProfile(tgfConfig.tgf.AwsProfile),
 		awsConfig.WithLogger(awsLogger),
-		// The logger level controlled by the --aws-debug flag controls whether or not the logs are shown.
+		// The logger level controlled by the --aws-debug flag controls whether the logs are shown.
 		// With that in mind, we just let the AWS SDK blindly log and rely on the logger to decide if it should print or not.
 		awsConfig.WithClientLogMode(
 			aws.LogRetries|
@@ -189,7 +184,15 @@ func (tgfConfig *TGFConfig) getAwsConfig(assumeRoleDuration time.Duration) (aws.
 			}
 		}),
 	)
+}
+
+func (tgfConfig *TGFConfig) getAwsConfig(assumeRoleDuration time.Duration) (aws.Config, error) {
+	if cachedAwsConfig != nil {
+		log.Debug("Using cached AWS config")
+		return *cachedAwsConfig, nil
+	}
 
+	config, err := tgfConfig.loadDefaultConfig(assumeRoleDuration)
 	if err != nil {
 		return config, err
 	}
@@ -217,7 +220,7 @@ func (tgfConfig *TGFConfig) getAwsConfig(assumeRoleDuration time.Duration) (aws.
 		)
 
 		shortConfig := config
-		config, err = tgfConfig.getAwsConfig(newDuration)
+		config, err = tgfConfig.loadDefaultConfig(assumeRoleDuration)
 		if err != nil {
 			log.Warning("Failed to extend current AWS session, will use the current short duration.", err)
 			config = shortConfig