Fix "NullPointerException: Access key ID cannot be blank" (#260)

jenkinsci · Dec 18, 2024 · 6d844a6 · 6d844a6
1 parent 6681a0e
commit 6d844a6
Showing 1 changed file with 3 additions and 3 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
@@ -167,17 +167,17 @@ public boolean requiresToken() {
 
     @Override
     public AwsCredentials resolveCredentials() {
-        AwsCredentials initialCredentials = AwsBasicCredentials.create(accessKey, secretKey.getPlainText());
 
         if (StringUtils.isBlank(iamRoleArn)) {
-            return initialCredentials;
+            return AwsBasicCredentials.create(accessKey, secretKey.getPlainText());
         } else {
             AwsCredentialsProvider baseProvider;
             // Handle the case of delegation to instance profile
             if (StringUtils.isBlank(accessKey) && StringUtils.isBlank(secretKey.getPlainText())) {
                 baseProvider = null;
             } else {
-                baseProvider = StaticCredentialsProvider.create(initialCredentials);
+                baseProvider = StaticCredentialsProvider.create(
+                        AwsBasicCredentials.create(accessKey, secretKey.getPlainText()));
             }
 
             StsClient client = buildStsClient(baseProvider);