fix(imagetagging): asset foundImage count >= upstreamImageIds count (s…

…pinnaker#2799)

orca-clouddriver/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/image/ImageTagger.java

@@ -32,6 +32,7 @@
 import java.util.Map;
 
 import static java.lang.String.format;
+import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toList;
 
 public abstract class ImageTagger {
@@ -84,7 +85,12 @@ protected Collection findImages(Collection<String> imageNames, Collection<String
         String upstreamImageName = (String) allMatchedImages.get(0).get("imageName");
         imageNames.add(upstreamImageName);
 
-        log.info(format("Found upstream image '%s' (executionId: %s)", upstreamImageName, stage.getExecution().getId()));
+        log.info(
+          format("Found upstream image '%s' for imageId '%s' (executionId: %s)",
+            upstreamImageName,
+            upstreamImageId,
+            stage.getExecution().getId())
+        );
       }
     }
 
@@ -102,6 +108,14 @@ protected Collection findImages(Collection<String> imageNames, Collection<String
       foundImages.add(objectMapper.convertValue(matchedImage, matchedImageType));
     }
 
+    if (foundImages.size() < upstreamImageIds.size()) {
+      throw new ImageNotFound(
+        format("Only found %d images to tag but %d were specified upstream (%s)",
+          foundImages.size(),
+          upstreamImageIds.size(),
+          imageNames
+          ), true);
+    }
     return foundImages;
   }