Only use accessKey and secretKey if they are not blank (#265)

* allow for empty access key and secret key * Simplify --------- Co-authored-by: Basil Crow <[email protected]>
jenkinsci · Jan 13, 2025 · 8d05df9 · 8d05df9
1 parent 12bc4ec
commit 8d05df9
Show file tree

Hide file tree

Showing 2 changed files with 10 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
@@ -169,7 +169,12 @@ public boolean requiresToken() {
     public AwsCredentials resolveCredentials() {
 
         if (StringUtils.isBlank(iamRoleArn)) {
-            return AwsBasicCredentials.create(accessKey, secretKey.getPlainText());
+            if (StringUtils.isBlank(accessKey) && StringUtils.isBlank(secretKey.getPlainText())) {
+                // AWS SDK v2 does not allow blank accessKey and secretKey
+                return null;
+            } else {
+                return AwsBasicCredentials.create(accessKey, secretKey.getPlainText());
+            }
         } else {
             AwsCredentialsProvider baseProvider;
             // Handle the case of delegation to instance profile

diff --git a/...ava/com/cloudbees/jenkins/plugins/awscredentials/AmazonWebServicesCredentialsBinding.java b/...ava/com/cloudbees/jenkins/plugins/awscredentials/AmazonWebServicesCredentialsBinding.java
@@ -139,8 +139,10 @@ public MultiEnvironment bind(@NonNull Run<?, ?> build, FilePath workspace, Launc
         AwsCredentials credentials = provider.resolveCredentials();
 
         Map<String, String> m = new HashMap<String, String>();
-        m.put(accessKeyVariable, credentials.accessKeyId());
-        m.put(secretKeyVariable, credentials.secretAccessKey());
+        if (credentials != null) {
+            m.put(accessKeyVariable, credentials.accessKeyId());
+            m.put(secretKeyVariable, credentials.secretAccessKey());
+        }
 
         // If role has been assumed, STS requires AWS_SESSION_TOKEN variable set too.
         if (credentials instanceof AwsSessionCredentials) {