fix: TW-84201 IAM role from old S3 Connection can be lost during conv…

…erting AWS S3 Settings Merge-request: TC-MR-7413 Merged-by: Andrei Efimov <Andrei.Efimov@jetbrains.com>
JetBrains · Oct 20, 2023 · ef63fad · ef63fad
1 parent 5e3671b
commit ef63fad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/s3-artifact-storage-ui/src/App/AwsConnection/AwsConnectionDialog.tsx b/s3-artifact-storage-ui/src/App/AwsConnection/AwsConnectionDialog.tsx
@@ -118,7 +118,10 @@ export default function AwsConnectionDialog({
       return;
     }
 
-    if (parametersPreset.useDefaultCredentialsProviderChain) {
+    if (parametersPreset.iamRole && parametersPreset.iamRole.length > 0) {
+      setCredentialsTypeSelector(CredentialsTypeEnum.awsAssumeIamRole);
+      setIamRoleArn(parametersPreset.iamRole);
+    } else if (parametersPreset.useDefaultCredentialsProviderChain) {
       setCredentialsTypeSelector(CredentialsTypeEnum.defaultProvider);
     } else if (
       parametersPreset.awsAccessKeyId &&
@@ -129,9 +132,6 @@ export default function AwsConnectionDialog({
         parametersPreset.awsAccessKeyId,
         parametersPreset.awsSecretAccessKey
       );
-    } else {
-      setCredentialsTypeSelector(CredentialsTypeEnum.awsAssumeIamRole);
-      setIamRoleArn(parametersPreset.iamRole);
     }
   }, [parametersPreset]);