Merge pull request #321 from snyk/fix/oci-archive-labels

fix: Don't return empty labels for oci-archive images
snyk · Feb 10, 2021 · 29eadb6 · 29eadb6
2 parents a284081 + 1230b1a
commit 29eadb6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/lib/extractor/index.ts b/lib/extractor/index.ts
@@ -31,7 +31,6 @@ export async function extractImageContent(
         imageId: ociExtractor.getImageIdFromManifest(ociArchive.manifest),
         manifestLayers: ociExtractor.getManifestLayers(ociArchive.manifest),
         extractedLayers: layersWithLatestFileModifications(ociArchive.layers),
-        imageLabels: {},
       };
     default:
       const dockerArchive = await dockerExtractor.extractArchive(

diff --git a/lib/extractor/types.ts b/lib/extractor/types.ts
@@ -18,7 +18,7 @@ export interface ExtractionResult {
   rootFsLayers?: string[];
   autoDetectedUserInstructions?: DockerFileAnalysis;
   platform?: string;
-  imageLabels: { [key: string]: string };
+  imageLabels?: { [key: string]: string };
 }
 
 export interface ExtractedLayers {

diff --git a/test/system/dockerfile-analysis/__snapshots__/dockerfile.spec.ts.snap b/test/system/dockerfile-analysis/__snapshots__/dockerfile.spec.ts.snap
@@ -390,10 +390,6 @@ Object {
           ],
           "type": "imageLayers",
         },
-        Object {
-          "data": Object {},
-          "type": "imageLabels",
-        },
         Object {
           "data": "Alpine Linux v3.12",
           "type": "imageOsReleasePrettyName",

diff --git a/test/system/image-type/__snapshots__/oci-archive.spec.ts.snap b/test/system/image-type/__snapshots__/oci-archive.spec.ts.snap
@@ -368,10 +368,6 @@ Object {
           ],
           "type": "imageLayers",
         },
-        Object {
-          "data": Object {},
-          "type": "imageLabels",
-        },
         Object {
           "data": "Alpine Linux v3.12",
           "type": "imageOsReleasePrettyName",