Merge pull request #125 from jtnord/patch-1

jenkinsci · Feb 10, 2022 · 3551d56 · 3551d56
2 parents 9ffa1a4 + 5fcd8bb
commit 3551d56
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java b/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java
@@ -226,10 +226,13 @@ public String getDisplayName() {
     }
 
     private static AssumeRoleRequest createAssumeRoleRequest(String iamRoleArn, String iamExternalId) {
-        return new AssumeRoleRequest()
+        AssumeRoleRequest retval = new AssumeRoleRequest()
                 .withRoleArn(iamRoleArn)
-                .withExternalId(iamExternalId)
                 .withRoleSessionName("Jenkins");
+       if (iamExternalId != null && !iamExternalId.isEmpty()) {
+           return retval.withExternalId(iamExternalId);
+       }
+       return retval;
     }
 
     /**