fix: resolved linting issues

Author: ividalATSnyk

lib/extractor/docker-archive/index.ts

@@ -8,6 +8,5 @@ export { extractArchive } from "./layer";
 
 export { getManifestLayers };
 
-export const getImageIdFromManifest = createGetImageIdFromManifest(
-  dockerArchiveConfig,
-);
+export const getImageIdFromManifest =
+  createGetImageIdFromManifest(dockerArchiveConfig);

lib/extractor/generic-archive-extractor.ts

@@ -35,17 +35,15 @@ export interface ArchiveConfig {
 
 export const dockerArchiveConfig: ArchiveConfig = {
   isLayerFile: (name) => basename(name).endsWith(".tar"),
-  isImageConfigFile: (name) =>
-    new RegExp("[A-Fa-f0-9]{64}\\.json").test(name),
+  isImageConfigFile: (name) => new RegExp("[A-Fa-f0-9]{64}\\.json").test(name),
   formatLabel: "Docker",
   layerErrorType: "tar",
   extractImageId: (configValue) => configValue.split(".")[0],
 };
 
 export const kanikoArchiveConfig: ArchiveConfig = {
   isLayerFile: (name) => basename(name).endsWith(".tar.gz"),
-  isImageConfigFile: (name) =>
-    new RegExp("sha256:[A-Fa-f0-9]{64}").test(name),
+  isImageConfigFile: (name) => new RegExp("sha256:[A-Fa-f0-9]{64}").test(name),
   formatLabel: "Kaniko",
   layerErrorType: "tar.gz",
   extractImageId: (configValue) => configValue,
@@ -77,14 +75,13 @@ export function createExtractArchive(
             } catch (error) {
               debug(`Error extracting layer content from: '${error.message}'`);
               reject(
-                new Error(
-                  `Error reading ${config.layerErrorType} archive`,
-                ),
+                new Error(`Error reading ${config.layerErrorType} archive`),
               );
             }
           } else if (isManifestFile(normalizedName)) {
-            const manifestArray =
-              await getManifestFile<TarArchiveManifest[]>(stream);
+            const manifestArray = await getManifestFile<TarArchiveManifest[]>(
+              stream,
+            );
             manifest = manifestArray[0];
           } else if (config.isImageConfigFile(normalizedName)) {
             imageConfig = await getManifestFile<ImageConfig>(stream);
@@ -97,9 +94,7 @@ export function createExtractArchive(
 
       tarExtractor.on("finish", () => {
         try {
-          resolve(
-            assembleLayersAndManifest(manifest, imageConfig, layers),
-          );
+          resolve(assembleLayersAndManifest(manifest, imageConfig, layers));
         } catch (error) {
           debug(
             `Error getting layers and manifest content from ${config.formatLabel} archive: ${error.message}`,

lib/extractor/index.ts

@@ -8,7 +8,9 @@ import { getErrorMessage } from "../error-utils";
 import { AutoDetectedUserInstructions, ImageType } from "../types";
 import { PluginOptions } from "../types";
 import * as dockerExtractor from "./docker-archive";
+import { InvalidArchiveError } from "./generic-archive-extractor";
 import * as kanikoExtractor from "./kaniko-archive";
+import { isWhitedOutFile } from "./layer";
 import * as ociExtractor from "./oci-archive";
 import {
   DockerArchiveManifest,
@@ -21,8 +23,6 @@ import {
   ImageConfig,
   OciArchiveManifest,
 } from "./types";
-import { isWhitedOutFile } from "./layer";
-import { InvalidArchiveError } from "./generic-archive-extractor";
 
 const debug = Debug("snyk");
 

lib/extractor/kaniko-archive/index.ts

@@ -1,13 +1,12 @@
 import {
   createGetImageIdFromManifest,
-  kanikoArchiveConfig,
   getManifestLayers,
+  kanikoArchiveConfig,
 } from "../generic-archive-extractor";
 
 export { extractArchive } from "./layer";
 
 export { getManifestLayers };
 
-export const getImageIdFromManifest = createGetImageIdFromManifest(
-  kanikoArchiveConfig,
-);
+export const getImageIdFromManifest =
+  createGetImageIdFromManifest(kanikoArchiveConfig);

lib/extractor/types.ts

@@ -50,8 +50,10 @@ export interface TarArchiveManifest {
   Layers: string[];
 }
 
+// tslint:disable-next-line:no-empty-interface
 export interface DockerArchiveManifest extends TarArchiveManifest {}
 
+// tslint:disable-next-line:no-empty-interface
 export interface KanikoArchiveManifest extends TarArchiveManifest {}
 
 export interface ExtractedLayersAndManifest {

test/lib/extractor/generic-archive-extractor.spec.ts

@@ -1,11 +1,14 @@
 import {
   createExtractArchive,
   createGetImageIdFromManifest,
-  getManifestLayers,
   dockerArchiveConfig,
+  getManifestLayers,
   kanikoArchiveConfig,
 } from "../../../lib/extractor/generic-archive-extractor";
-import { DockerArchiveManifest, KanikoArchiveManifest } from "../../../lib/extractor/types";
+import {
+  DockerArchiveManifest,
+  KanikoArchiveManifest,
+} from "../../../lib/extractor/types";
 import { getFixture } from "../../util/index";
 
 describe("generic archive extractor", () => {
@@ -46,9 +49,8 @@ describe("generic archive extractor", () => {
 
   describe("createGetImageIdFromManifest", () => {
     describe("with docker archive config (strips .json extension)", () => {
-      const getImageIdFromManifest = createGetImageIdFromManifest(
-        dockerArchiveConfig,
-      );
+      const getImageIdFromManifest =
+        createGetImageIdFromManifest(dockerArchiveConfig);
 
       it("strips .json and returns imageId with sha256: prefix when prefix is present", () => {
         const manifest: DockerArchiveManifest = {
@@ -76,9 +78,8 @@ describe("generic archive extractor", () => {
     });
 
     describe("with kaniko archive config (uses Config value directly)", () => {
-      const getImageIdFromManifest = createGetImageIdFromManifest(
-        kanikoArchiveConfig,
-      );
+      const getImageIdFromManifest =
+        createGetImageIdFromManifest(kanikoArchiveConfig);
 
       it("returns imageId as-is when sha256: prefix is present", () => {
         const manifest: KanikoArchiveManifest = {
@@ -106,9 +107,8 @@ describe("generic archive extractor", () => {
     });
 
     it("throws when Config is missing", () => {
-      const getImageIdFromManifest = createGetImageIdFromManifest(
-        dockerArchiveConfig,
-      );
+      const getImageIdFromManifest =
+        createGetImageIdFromManifest(dockerArchiveConfig);
       const manifest = { Config: undefined, RepoTags: [], Layers: [] } as any;
       expect(() => getImageIdFromManifest(manifest)).toThrow(
         "Failed to extract image ID from archive manifest",