Titus: fix aws account lookup to return null if account is not found

spinnaker · Mar 26, 2018 · 585c62d · 585c62d
1 parent e51e218
commit 585c62d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/utils/AwsLookupUtil.groovy b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/caching/utils/AwsLookupUtil.groovy
@@ -185,8 +185,12 @@ class AwsLookupUtil {
   }
 
   String awsAccountId(account, region) {
+    Map awsDetails = lookupAccount(account, region)
+    if (!awsDetails) {
+      return null
+    }
     accountCredentialsProvider.all.find {
-      it instanceof AmazonCredentials && it.name == lookupAccount(account, region).awsAccount
+      it instanceof AmazonCredentials && it.name == awsDetails.awsAccount
     }?.accountId
   }