fix(ecs): Ensure null is returned when account does not exist (#5092)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Nov 10, 2020 · de10c06 · de10c06
1 parent 10202d9
commit de10c06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/...s/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsAccountMapper.java b/...s/src/main/java/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsAccountMapper.java
@@ -60,7 +60,11 @@ public void removeMapEntry(String ecsAccountName) {
   }
 
   public NetflixECSCredentials fromAwsAccountNameToEcs(String awsAccountName) {
-    return credentialsRepository.getOne(ecsCredentialsMap.get(awsAccountName));
+    String ecsAccountName = ecsCredentialsMap.get(awsAccountName);
+    if (ecsAccountName == null) {
+      return null;
+    }
+    return credentialsRepository.getOne(ecsAccountName);
   }
 
   public NetflixAmazonCredentials fromEcsAccountNameToAws(String ecsAccountName) {

diff --git a/...st/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsAccountMapperSpec.groovy b/...st/groovy/com/netflix/spinnaker/clouddriver/ecs/provider/view/EcsAccountMapperSpec.groovy
@@ -82,4 +82,15 @@ class EcsAccountMapperSpec extends Specification {
     !ecsAccountMapper.ecsCredentialsMap.containsKey(ecsAccountName)
     !ecsAccountMapper.awsCredentialsMap.containsKey(awsAccount)
   }
+
+  def 'should return null if provided name is invalid'() {
+    given:
+    def ecsAccountMapper = new EcsAccountMapper(credentialsRepository, compositeCredentialsRepository)
+
+    when:
+    def result = ecsAccountMapper.fromAwsAccountNameToEcs("invalid")
+
+    then:
+    result == null
+  }
 }