chore: restore wh related (out of scope)

Author: parker-snyk

lib/extractor/index.ts

@@ -228,7 +228,7 @@ function layersWithLatestFileModifications(
       // if finding a deleted file - trimming to its original file name for excluding it from extractedLayers
       // + not adding this file
       if (isWhitedOutFile(filename)) {
-        removedFilesToIgnore.add(filename.replace(/\.wh\./, ""));
+        removedFilesToIgnore.add(filename.replace(/.wh./, ""));
         continue;
       }
       // not adding previously found to be whited out files to extractedLayers
@@ -248,13 +248,8 @@ function layersWithLatestFileModifications(
   return extractedLayers;
 }
 
-/**
- * check if a file is 'whited out', which is shown by
- * prefixing the filename with a .wh.
- * https://www.madebymikal.com/interpreting-whiteout-files-in-docker-image-layers/
- */
 export function isWhitedOutFile(filename: string) {
-  return filename.includes(".wh.");
+  return filename.match(/.wh./gm);
 }
 
 function isBufferType(type: FileContent): type is Buffer {

test/lib/extractor/index.spec.ts

@@ -1,4 +1,4 @@
-import { getContentAsString, isWhitedOutFile } from "../../../lib/extractor";
+import { getContentAsString } from "../../../lib/extractor";
 import { ExtractAction, ExtractedLayers } from "../../../lib/extractor/types";
 
 describe("index", () => {
@@ -18,39 +18,3 @@ describe("index", () => {
     expect(result).toEqual("Hello, world!");
   });
 });
-
-describe("isWhitedOutFile", () => {
-  test("should return true for files containing .wh. in their path", () => {
-    expect(isWhitedOutFile("/etc/.wh.hosts")).toBe(true);
-    expect(isWhitedOutFile("/var/lib/.wh.data")).toBe(true);
-    expect(isWhitedOutFile("/.wh.config")).toBe(true);
-  });
-
-  test("should return false for files not containing .wh.", () => {
-    expect(isWhitedOutFile("/etc/hosts")).toBe(false);
-    expect(isWhitedOutFile("")).toBe(false);
-    expect(isWhitedOutFile("/")).toBe(false);
-  });
-
-  test("should return false for similar but different patterns", () => {
-    // make sure the dots are literal and not match all
-    expect(isWhitedOutFile("/etc/wh.hosts")).toBe(false);
-    expect(isWhitedOutFile("/etc/.whosts")).toBe(false);
-    expect(isWhitedOutFile("/etc/whhosts")).toBe(false);
-
-    // dots in wrong places
-    expect(isWhitedOutFile("/etc/.w.h.hosts")).toBe(false);
-    expect(isWhitedOutFile("/etc/..wh..hosts")).toBe(false);
-
-    // case sensitive
-    expect(isWhitedOutFile("/etc/.WH.hosts")).toBe(false);
-    expect(isWhitedOutFile("/etc/.Wh.hosts")).toBe(false);
-  });
-
-  test("should handle .wh. at different positions", () => {
-    expect(isWhitedOutFile(".wh.start")).toBe(true);
-    expect(isWhitedOutFile("middle.wh.file")).toBe(true);
-    expect(isWhitedOutFile("end.wh.")).toBe(true);
-    expect(isWhitedOutFile("/deeply/nested/path/.wh.present")).toBe(true);
-  });
-});