Merge pull request jenkinsci#3 from fbelzunc/JENKINS-35220

[FIXED JENKINS-35220] Correctly display the credentials
fbelzunc · May 30, 2016 · 2b6a8ed · 2b6a8ed
2 parents 252cd85 + d59cbec
commit 2b6a8ed
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/amazonecr/AmazonECSRegistryCredential.java b/src/main/java/com/cloudbees/jenkins/plugins/amazonecr/AmazonECSRegistryCredential.java
@@ -63,9 +63,19 @@ public String getCredentialsId() {
     }
 
     public AmazonWebServicesCredentials getCredentials() {
-        List<AmazonWebServicesCredentials> c = CredentialsProvider.lookupCredentials(
+        List<AmazonWebServicesCredentials> credentials = CredentialsProvider.lookupCredentials(
                 AmazonWebServicesCredentials.class, Jenkins.getInstance(), ACL.SYSTEM, Collections.EMPTY_LIST);
-        return c.isEmpty() ? null : c.get(0);
+
+        if (credentials.isEmpty()) {
+            return null;
+        }
+
+        for (AmazonWebServicesCredentials awsCredentials : credentials) {
+            if (awsCredentials.getId().equals(this.credentialsId)) {
+                return awsCredentials;
+            }
+        }
+        return  null;
     }
 
     public String getDescription() {