Merge branch 'master' into feat.suppressionBackupServerModify

rudderlabs · Apr 3, 2023 · c9abdb8 · c9abdb8
2 parents ff2bd6b + c2f6dd8
commit c9abdb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/utils/awsutils/session.go b/utils/awsutils/session.go
@@ -106,14 +106,14 @@ func NewSimpleSessionConfig(config map[string]interface{}, serviceName string) (
 		return nil, fmt.Errorf("unable to populate session config using destinationConfig: %w", err)
 	}
 
-	if sessionConfig.RoleBasedAuth && sessionConfig.IAMRoleARN == "" {
-		return nil, errors.New("incompatible role configuration")
-	}
-
 	if !isRoleBasedAuthFieldExist(config) {
 		sessionConfig.RoleBasedAuth = sessionConfig.IAMRoleARN != ""
 	}
 
+	if sessionConfig.IAMRoleARN == "" {
+		sessionConfig.RoleBasedAuth = false
+	}
+
 	// Some AWS destinations are using SecretAccessKey instead of accessKey
 	if sessionConfig.SecretAccessKey != "" {
 		sessionConfig.AccessKey = sessionConfig.SecretAccessKey

diff --git a/utils/awsutils/session_test.go b/utils/awsutils/session_test.go
@@ -162,8 +162,7 @@ func TestNewSessionConfigWithRoleBasedAuth(t *testing.T) {
 			WorkspaceID: someWorkspaceID,
 		}
 		_, err := NewSessionConfigForDestination(&destinationWithRole, httpTimeout, serviceName)
-		assert.NotNil(t, err)
-		assert.EqualError(t, err, "incompatible role configuration")
+		assert.Nil(t, err)
 	})
 }