fix: fixes for multi-image oci archives (with and without given repo:tag values)

Author: stevebillings

src/main/java/com/synopsys/integration/blackduck/imageinspector/image/docker/manifest/DockerManifest.java

@@ -99,9 +99,7 @@ private String deriveSpecifiedRepoTag(final String dockerImageName, final String
 
     private void validateImageSpecificity(final List<DockerImageInfo> images, final String targetImageName, final String targetTagName) throws IntegrationException {
         if (images.size() > 1 && (StringUtils.isBlank(targetImageName) || StringUtils.isBlank(targetTagName))) {
-            final String msg = "When the manifest contains multiple images or tags, the target image and tag to inspect must be specified";
-            logger.debug(msg);
-            throw new IntegrationException(msg);
+            throw new IntegrationException("When the manifest contains multiple images or tags, the target image and tag to inspect must be specified");
         }
     }
 

src/main/java/com/synopsys/integration/blackduck/imageinspector/image/oci/OciManifestDescriptorParser.java

@@ -13,13 +13,16 @@
 import com.synopsys.integration.exception.IntegrationException;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class OciManifestDescriptorParser {
     private static final String MANIFEST_FILE_MEDIA_TYPE = "application/vnd.oci.image.manifest.v1+json";
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
     private final ManifestRepoTagMatcher manifestRepoTagMatcher;
 
     public OciManifestDescriptorParser(ManifestRepoTagMatcher manifestRepoTagMatcher) {
@@ -37,9 +40,13 @@ public OciDescriptor getManifestDescriptor(OciImageIndex ociImageIndex,
             throw new IntegrationException(String.format("No manifest descriptor with media type %s was found in OCI image index", MANIFEST_FILE_MEDIA_TYPE));
         }
         if ((trueManifests.size() == 1) && StringUtils.isBlank(givenRepo)) {
+            logger.debug(String.format("User did not specify a repo:tag, and there's only one manifest; inspecting that one; digest=%s", trueManifests.get(0).getDigest()));
             return trueManifests.get(0);
         }
-        if (StringUtils.isBlank(givenTag)) {
+        if ((trueManifests.size() > 1) && StringUtils.isBlank(givenRepo)) {
+            throw new IntegrationException("When the image contains multiple manifests, the target image and tag to inspect must be specified");
+        }
+        if (StringUtils.isNotBlank(givenRepo) && StringUtils.isBlank(givenTag)) {
             givenTag = "latest";
         }
         // Safe to assume both repo and tag have values

src/test/java/com/synopsys/integration/blackduck/imageinspector/api/ImageInspectorApiIntTest.java

@@ -53,7 +53,8 @@ public class ImageInspectorApiIntTest {
     private static final String MULTILAYER_IMAGE_TARFILE = "build/images/test/centos_minus_vim_plus_bacula.tar";
     private static final String NOPKGMGR_IMAGE_TARFILE = "build/images/test/nopkgmgr.tar";
     // TODO need to build this:
-    private static final String OCI_IMAGE_TARFILE = "/tmp/ccc/centos_minus_vim_plus_bacula-oci.tar";
+    //private static final String OCI_IMAGE_TARFILE = "/tmp/ccc/centos_minus_vim_plus_bacula-oci.tar";
+    private static final String OCI_IMAGE_TARFILE = "/tmp/ggg/u_multi_tagged.tar";
 
     private static Os os;
     private static ImageInspectorApi imageInspectorApi;
@@ -231,12 +232,12 @@ public void testAppOnlyFileSystem() throws IntegrationException, IOException, In
         assertTrue(containerFileSystemFile.length() < 80000000);
     }
 
-    @Disabled
+    /////@Disabled
     @Test
     public void testOciImage() throws IntegrationException, IOException, InterruptedException {
         ComponentHierarchyBuilder componentHierarchyBuilder = new ComponentHierarchyBuilder(packageGetter);
-        Mockito.when(os.getLinuxDistroNameFromEtcDir(Mockito.any(File.class))).thenReturn(Optional.of("centos"));
-        Mockito.when(os.deriveOs(Mockito.any(String.class))).thenReturn(ImageInspectorOsEnum.CENTOS);
+        Mockito.when(os.getLinuxDistroNameFromEtcDir(Mockito.any(File.class))).thenReturn(Optional.of("ubuntu"));
+        Mockito.when(os.deriveOs(Mockito.any(String.class))).thenReturn(ImageInspectorOsEnum.UBUNTU);
         Mockito.when(rpmPkgMgr.isApplicable(Mockito.any(File.class))).thenReturn(true);
         Mockito.when(rpmPkgMgr.getType()).thenReturn(PackageManagerEnum.RPM);
         Mockito.when(rpmPkgMgr.getImagePackageManagerDirectory(Mockito.any(File.class))).thenReturn(new File("."));
@@ -247,8 +248,10 @@ public void testOciImage() throws IntegrationException, IOException, Interrupted
                 .setDockerTarfilePath(OCI_IMAGE_TARFILE)
                 //.setBlackDuckProjectName(PROJECT)
                 //.setBlackDuckProjectVersion(PROJECT_VERSION)
+                .setGivenImageRepo("testrepo")
+                .setGivenImageTag("testtag")
                 .setContainerFileSystemOutputPath(containerFileSystemOutputFilePath)
-                .setCurrentLinuxDistro("CENTOS")
+                .setCurrentLinuxDistro("UBUNTU")
                 .setCleanupWorkingDir(true)
                 .build();
         SimpleBdioDocument bdioDocument = imageInspectorApi.getBdio(componentHierarchyBuilder, imageInspectionRequest);