fix: revert Add DHI namespace to PURLs for Docker Hardened Images packages (#742)

Revert "feat: Add DHI namespace to PURLs for Docker Hardened Images packages …"

This reverts commit 49e92c0.

Author: parker-snyk

lib/analyzer/package-managers/apt.ts

@@ -93,11 +93,6 @@ export function purl(
     vendor = osRelease.name;
   }
 
-  // Use 'dhi' namespace for Docker Hardened Images packages
-  if (curPkg.Maintainer === "Docker Hardened Images <dhi@docker.com>") {
-    vendor = "dhi";
-  }
-
   return new PackageURL(
     "deb",
     vendor,
@@ -156,9 +151,6 @@ function parseDpkgLine(
         curPkg.Provides.push(name);
       }
       break;
-    case "Maintainer":
-      curPkg.Maintainer = value;
-      break;
     case "Pre-Depends":
     case "Depends":
       for (const depElem of value.split(",")) {

lib/analyzer/types.ts

@@ -10,7 +10,6 @@ export interface AnalyzedPackage {
   Version?: string;
   Source?: string;
   SourceVersion?: string;
-  Maintainer?: string;
   Provides: string[];
   Deps: {
     [name: string]: any;

test/lib/analyzer/package-managers/apt.spec.ts

@@ -39,30 +39,4 @@ describe("purl()", () => {
       } as unknown as AnalyzedPackageWithVersion),
     ).toEqual("pkg:deb/bar@1.2.3-4?upstream=foo%405.6.7%2B8");
   });
-
-  it("uses 'dhi' namespace for Docker Hardened Images packages", () => {
-    expect(
-      purl(
-        {
-          Name: "curl",
-          Version: "7.88.1-10+deb12u8",
-          Maintainer: "Docker Hardened Images <dhi@docker.com>",
-        } as unknown as AnalyzedPackageWithVersion,
-        { name: "debian", version: "12", prettyName: "Debian GNU/Linux 12" },
-      ),
-    ).toEqual("pkg:deb/dhi/curl@7.88.1-10%2Bdeb12u8?distro=debian-bookworm");
-  });
-
-  it("uses osRelease vendor when maintainer is not Docker Hardened Images", () => {
-    expect(
-      purl(
-        {
-          Name: "curl",
-          Version: "7.88.1-10+deb12u8",
-          Maintainer: "Some Other Maintainer <other@example.com>",
-        } as unknown as AnalyzedPackageWithVersion,
-        { name: "debian", version: "12", prettyName: "Debian GNU/Linux 12" },
-      ),
-    ).toEqual("pkg:deb/debian/curl@7.88.1-10%2Bdeb12u8?distro=debian-bookworm");
-  });
 });