test: update syft-fixtures

Signed-off-by: Christian Kotzbauer <[email protected]>
ckotzbauer · Mar 19, 2022 · 1b46b79 · 1b46b79
1 parent 08b2d4e
commit 1b46b79
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 117 deletions.
diff --git a/internal/syft/fixtures/alpine.cyclonedx b/internal/syft/fixtures/alpine.cyclonedx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:0faa6c3b-6cef-43e5-ac4e-8327771c35d9" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:f592d063-2ba4-4998-bce3-eb91f1c709de" version="1">
   <metadata>
-    <timestamp>2022-03-12T09:11:38+01:00</timestamp>
+    <timestamp>2022-03-19T10:32:48+01:00</timestamp>
     <tools>
       <tool>
         <vendor>anchore</vendor>
         <name>syft</name>
-        <version>0.41.4</version>
+        <version>0.42.0</version>
       </tool>
     </tools>
     <component bom-ref="27f24e002ab47c1b" type="container">

diff --git a/internal/syft/fixtures/alpine.json b/internal/syft/fixtures/alpine.json
@@ -2993,7 +2993,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.41.4",
+  "version": "0.42.0",
   "configuration": {
    "configPath": "",
    "output": [
@@ -3072,7 +3072,7 @@
   }
  },
  "schema": {
-  "version": "3.1.0",
-  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.0.json"
+  "version": "3.1.1",
+  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.1.json"
  }
 }
diff --git a/internal/syft/fixtures/alpine.spdxjson b/internal/syft/fixtures/alpine.spdxjson
@@ -3,15 +3,15 @@
  "name": "alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-03-12T08:11:41.13097451Z",
+  "created": "2022-03-19T09:32:52.449138747Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.41.4"
+   "Tool: syft-0.42.0"
   ],
   "licenseListVersion": "3.16"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-12949ac6-71b6-4aa5-8a7b-9920e2cc6f30",
+ "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-3c94ca1e-7210-4f96-81df-37b20c70137b",
  "packages": [
   {
    "SPDXID": "SPDXRef-8039c8621bcc1383",

diff --git a/internal/syft/fixtures/nginx.cyclonedx b/internal/syft/fixtures/nginx.cyclonedx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:f4eb6c21-a3a5-45e1-9510-81a162753465" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:1cb5f8bd-0b2b-4003-941b-3ad3a3d1ea47" version="1">
   <metadata>
-    <timestamp>2022-03-12T09:12:23+01:00</timestamp>
+    <timestamp>2022-03-19T10:33:33+01:00</timestamp>
     <tools>
       <tool>
         <vendor>anchore</vendor>
         <name>syft</name>
-        <version>0.41.4</version>
+        <version>0.42.0</version>
       </tool>
     </tools>
     <component bom-ref="bed2b68c44140e08" type="container">
@@ -132,7 +132,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:bash:bash:5.1-2\+b3:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b3?arch=amd64&amp;upstream=bash@5.1-2&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b3?arch=amd64&amp;upstream=bash%405.1-2&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -199,7 +199,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:bsdutils:bsdutils:1\:2.36.1-8\+deb11u1:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&amp;upstream=util-linux@2.36.1-8+deb11u1&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&amp;upstream=util-linux%402.36.1-8+deb11u1&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -260,7 +260,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:coreutils:coreutils:8.32-4\+b1:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b1?arch=amd64&amp;upstream=coreutils@8.32-4&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b1?arch=amd64&amp;upstream=coreutils%408.32-4&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -1115,7 +1115,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:libbrotli1:libbrotli1:1.0.9-2\+b2:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=brotli@1.0.9-2&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=brotli%401.0.9-2&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -1279,7 +1279,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:libcap-ng0:libcap-ng0:0.7.9-2.2\+b1:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b1?arch=amd64&amp;upstream=libcap-ng@0.7.9-2.2&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b1?arch=amd64&amp;upstream=libcap-ng%400.7.9-2.2&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -2000,7 +2000,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:libjbig0:libjbig0:2.1-3.1\+b2:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=jbigkit@2.1-3.1&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=jbigkit%402.1-3.1&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -2778,7 +2778,7 @@
         </license>
       </licenses>
       <cpe>cpe:2.3:a:librtmp1:librtmp1:2.4\+20151223.gitfa8646d.1-2\+b2:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&amp;upstream=rtmpdump@2.4+20151223.gitfa8646d.1-2&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&amp;upstream=rtmpdump%402.4+20151223.gitfa8646d.1-2&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>
@@ -2955,7 +2955,7 @@
       <name>libsemanage1</name>
       <version>3.1-1+b2</version>
       <cpe>cpe:2.3:a:libsemanage1:libsemanage1:3.1-1\+b2:*:*:*:*:*:*:*</cpe>
-      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=libsemanage@3.1-1&amp;distro=debian-11</purl>
+      <purl>pkg:deb/debian/[email protected]+b2?arch=amd64&amp;upstream=libsemanage%403.1-1&amp;distro=debian-11</purl>
       <properties>
         <property name="syft:package:foundBy">dpkgdb-cataloger</property>
         <property name="syft:package:metadataType">DpkgMetadata</property>

diff --git a/internal/syft/fixtures/nginx.json b/internal/syft/fixtures/nginx.json
@@ -2843,7 +2843,7 @@
    "cpes": [
     "cpe:2.3:a:bash:bash:5.1-2\\+b3:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b3?arch=amd64&upstream=bash@5.1-2&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b3?arch=amd64&upstream=bash%405.1-2&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "bash",
@@ -3443,7 +3443,7 @@
    "cpes": [
     "cpe:2.3:a:bsdutils:bsdutils:1\\:2.36.1-8\\+deb11u1:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&upstream=util-linux@2.36.1-8+deb11u1&distro=debian-11",
+   "purl": "pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&upstream=util-linux%402.36.1-8+deb11u1&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "bsdutils",
@@ -4876,7 +4876,7 @@
    "cpes": [
     "cpe:2.3:a:coreutils:coreutils:8.32-4\\+b1:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=coreutils@8.32-4&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=coreutils%408.32-4&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "coreutils",
@@ -15259,7 +15259,7 @@
    "cpes": [
     "cpe:2.3:a:libbrotli1:libbrotli1:1.0.9-2\\+b2:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=brotli@1.0.9-2&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=brotli%401.0.9-2&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "libbrotli1",
@@ -18211,7 +18211,7 @@
     "cpe:2.3:a:libcap:libcap-ng0:0.7.9-2.2\\+b1:*:*:*:*:*:*:*",
     "cpe:2.3:a:libcap:libcap_ng0:0.7.9-2.2\\+b1:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=libcap-ng@0.7.9-2.2&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=libcap-ng%400.7.9-2.2&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "libcap-ng0",
@@ -20515,7 +20515,7 @@
    "cpes": [
     "cpe:2.3:a:libjbig0:libjbig0:2.1-3.1\\+b2:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=jbigkit@2.1-3.1&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=jbigkit%402.1-3.1&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "libjbig0",
@@ -24487,7 +24487,7 @@
    "cpes": [
     "cpe:2.3:a:librtmp1:librtmp1:2.4\\+20151223.gitfa8646d.1-2\\+b2:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&upstream=rtmpdump@2.4+20151223.gitfa8646d.1-2&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&upstream=rtmpdump%402.4+20151223.gitfa8646d.1-2&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "librtmp1",
@@ -24995,7 +24995,7 @@
    "cpes": [
     "cpe:2.3:a:libsemanage1:libsemanage1:3.1-1\\+b2:*:*:*:*:*:*:*"
    ],
-   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=libsemanage@3.1-1&distro=debian-11",
+   "purl": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=libsemanage%403.1-1&distro=debian-11",
    "metadataType": "DpkgMetadata",
    "metadata": {
     "package": "libsemanage1",
@@ -96193,7 +96193,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.41.4",
+  "version": "0.42.0",
   "configuration": {
    "configPath": "",
    "output": [
@@ -96272,7 +96272,7 @@
   }
  },
  "schema": {
-  "version": "3.1.0",
-  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.0.json"
+  "version": "3.1.1",
+  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.1.1.json"
  }
 }
diff --git a/internal/syft/fixtures/nginx.spdxjson b/internal/syft/fixtures/nginx.spdxjson
@@ -3,15 +3,15 @@
  "name": "nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-03-12T08:12:42.861996889Z",
+  "created": "2022-03-19T09:33:48.70217332Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.41.4"
+   "Tool: syft-0.42.0"
   ],
   "licenseListVersion": "3.16"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-8113f9c8-367f-47fa-b895-f3156ea35ccc",
+ "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-ffa9f99e-b01b-4bac-850d-fd523c883a64",
  "packages": [
   {
    "SPDXID": "SPDXRef-b04aa27347c2f4d7",
@@ -168,7 +168,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b3?arch=amd64&upstream=bash@5.1-2&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b3?arch=amd64&upstream=bash%405.1-2&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -191,7 +191,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&upstream=util-linux@2.36.1-8+deb11u1&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/bsdutils@1:2.36.1-8+deb11u1?arch=amd64&upstream=util-linux%402.36.1-8+deb11u1&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -262,7 +262,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=coreutils@8.32-4&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=coreutils%408.32-4&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -1185,7 +1185,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=brotli@1.0.9-2&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=brotli%401.0.9-2&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -1375,7 +1375,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=libcap-ng@0.7.9-2.2&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b1?arch=amd64&upstream=libcap-ng%400.7.9-2.2&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -2071,7 +2071,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=jbigkit@2.1-3.1&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=jbigkit%402.1-3.1&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -2958,7 +2958,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&upstream=rtmpdump@2.4+20151223.gitfa8646d.1-2&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+20151223.gitfa8646d.1-2+b2?arch=amd64&upstream=rtmpdump%402.4+20151223.gitfa8646d.1-2&distro=debian-11",
      "referenceType": "purl"
     }
    ],
@@ -3191,7 +3191,7 @@
     },
     {
      "referenceCategory": "PACKAGE_MANAGER",
-     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=libsemanage@3.1-1&distro=debian-11",
+     "referenceLocator": "pkg:deb/debian/[email protected]+b2?arch=amd64&upstream=libsemanage%403.1-1&distro=debian-11",
      "referenceType": "purl"
     }
    ],