Use versions from BOM (#262)

Only use accessKey and secretKey if they are not blank fix formatting
jenkinsci · Jan 9, 2025 · 47e2ec6 · 47e2ec6
1 parent 6d844a6
commit 47e2ec6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,21 +68,10 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3761.vd922730f0fd2</version>
+        <version>3850.vb_c5319efa_e29</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!-- TODO until in BOM -->
-      <dependency>
-        <groupId>io.jenkins.plugins.aws-java-sdk2</groupId>
-        <artifactId>aws-java-sdk2-core</artifactId>
-        <version>2.29.34-9.v117ff2a_65538</version>
-      </dependency>
-      <dependency>
-        <groupId>io.jenkins.plugins.aws-java-sdk2</groupId>
-        <artifactId>aws-java-sdk2-ec2</artifactId>
-        <version>2.29.34-9.v117ff2a_65538</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java b/src/main/java/com/cloudbees/jenkins/plugins/awscredentials/AWSCredentialsImpl.java
@@ -168,7 +168,9 @@ public boolean requiresToken() {
     @Override
     public AwsCredentials resolveCredentials() {
 
-        if (StringUtils.isBlank(iamRoleArn)) {
+        if (StringUtils.isBlank(iamRoleArn)
+                && !StringUtils.isBlank(accessKey)
+                && !StringUtils.isBlank(secretKey.getPlainText())) {
             return AwsBasicCredentials.create(accessKey, secretKey.getPlainText());
         } else {
             AwsCredentialsProvider baseProvider;