fix(tagging): NPE if image has no tags

spinnaker · Feb 26, 2018 · b8ee2ea · b8ee2ea
1 parent be06733
commit b8ee2ea
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.../groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/AmazonImageFinder.java b/.../groovy/com/netflix/spinnaker/orca/clouddriver/tasks/providers/aws/AmazonImageFinder.java
@@ -28,6 +28,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyMap;
 import static java.util.stream.Collectors.toMap;
 
 @Component
@@ -95,7 +96,9 @@ static class AmazonImage implements Comparable<AmazonImage> {
     ImageDetails toAmazonImageDetails(String region) {
       String imageId = amis.get(region).get(0);
 
-      Map<String, String> imageTags = tagsByImageId.get(imageId);
+      Map<String, String> imageTags = Optional.ofNullable(tagsByImageId)
+        .map(it -> it.get(imageId))
+        .orElse(emptyMap());
       AppVersion appVersion = AppVersion.parseName(imageTags.get("appversion"));
       JenkinsDetails jenkinsDetails = Optional
         .ofNullable(appVersion)