test: update syft-fixtures

Signed-off-by: Christian Kotzbauer <[email protected]>
ckotzbauer · May 14, 2022 · 522483e · 522483e
1 parent a792350
commit 522483e
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 38 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:661b018e-4e5f-4085-b05a-bb9915915967" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:1d5f70a2-16d1-4285-ae6b-1e7305eb61c5" version="1">
   <metadata>
-    <timestamp>2022-04-30T09:58:13+02:00</timestamp>
+    <timestamp>2022-05-14T09:19:42+02:00</timestamp>
     <tools>
       <tool>
         <vendor>anchore</vendor>
         <name>syft</name>
-        <version>0.45.0</version>
+        <version>0.46.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.45.0",
+  "version": "0.46.0",
   "configuration": {
    "configPath": "",
    "verbosity": 0,
@@ -3016,7 +3016,7 @@
    },
    "log": {
     "structured": false,
-    "level": "info",
+    "level": "warning",
     "file-location": ""
    },
    "package": {
@@ -3067,13 +3067,25 @@
    },
    "exclude": [],
    "attest": {
-    "key": "cosign.key"
+    "key": "",
+    "cert": "",
+    "noUpload": false,
+    "force": false,
+    "recursive": false,
+    "replace": false,
+    "fulcioUrl": "https://fulcio.sigstore.dev",
+    "fulcio_identity_token": "",
+    "insecure_skip_verify": false,
+    "rekorUrl": "https://rekor.sigstore.dev",
+    "oidcIssuer": "https://oauth2.sigstore.dev/auth",
+    "oidcClientId": "sigstore",
+    "OIDCRedirectURL": ""
    },
    "platform": ""
   }
  },
  "schema": {
-  "version": "3.2.2",
-  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.2.json"
+  "version": "3.2.3",
+  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.3.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-04-30T07:58:21.621601191Z",
+  "created": "2022-05-14T07:19:45.859285144Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.45.0"
+   "Tool: syft-0.46.0"
   ],
-  "licenseListVersion": "3.16"
+  "licenseListVersion": "3.17"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-30a70c55-c072-46de-bb00-70161a8db832",
+ "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-6a07f9c4-f124-485a-9f0f-dc8013fcaecd",
  "packages": [
   {
    "SPDXID": "SPDXRef-9f527213f4d2a873",

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:ff7d48e2-0b78-4b65-8dda-b9f2b79f18f5" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:35633695-67bd-4d7f-8fab-9e0d6e808c04" version="1">
   <metadata>
-    <timestamp>2022-04-30T09:58:49+02:00</timestamp>
+    <timestamp>2022-05-14T09:20:22+02:00</timestamp>
     <tools>
       <tool>
         <vendor>anchore</vendor>
         <name>syft</name>
-        <version>0.45.0</version>
+        <version>0.46.0</version>
       </tool>
     </tools>
     <component bom-ref="bed2b68c44140e08" type="container">
@@ -573,6 +573,9 @@
         <license>
           <id>GPL-2.0+</id>
         </license>
+        <license>
+          <id>Bitstream-Vera</id>
+        </license>
       </licenses>
       <cpe>cpe:2.3:a:fonts-dejavu-core:fonts-dejavu-core:2.37-2:*:*:*:*:*:*:*</cpe>
       <purl>pkg:deb/debian/[email protected]?arch=all&amp;upstream=fonts-dejavu&amp;distro=debian-11</purl>

diff --git a/internal/syft/fixtures/nginx.json b/internal/syft/fixtures/nginx.json
@@ -96199,7 +96199,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "configuration": {
    "configPath": "",
    "verbosity": 0,
@@ -96222,7 +96222,7 @@
    },
    "log": {
     "structured": false,
-    "level": "info",
+    "level": "warning",
     "file-location": ""
    },
    "package": {
@@ -96273,13 +96273,25 @@
    },
    "exclude": [],
    "attest": {
-    "key": "cosign.key"
+    "key": "",
+    "cert": "",
+    "noUpload": false,
+    "force": false,
+    "recursive": false,
+    "replace": false,
+    "fulcioUrl": "https://fulcio.sigstore.dev",
+    "fulcio_identity_token": "",
+    "insecure_skip_verify": false,
+    "rekorUrl": "https://rekor.sigstore.dev",
+    "oidcIssuer": "https://oauth2.sigstore.dev/auth",
+    "oidcClientId": "sigstore",
+    "OIDCRedirectURL": ""
    },
    "platform": ""
   }
  },
  "schema": {
-  "version": "3.2.2",
-  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.2.json"
+  "version": "3.2.3",
+  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.3.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-04-30T07:59:06.883121311Z",
+  "created": "2022-05-14T07:20:45.536337832Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.45.0"
+   "Tool: syft-0.46.0"
   ],
-  "licenseListVersion": "3.16"
+  "licenseListVersion": "3.17"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-7ee3d3f4-1f80-4faa-86b3-0e5c1af9d50a",
+ "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-5295eeca-319b-4634-a163-9c6a12eccf92",
  "packages": [
   {
    "SPDXID": "SPDXRef-a124711c55c5b5ec",
@@ -575,7 +575,7 @@
   {
    "SPDXID": "SPDXRef-16c100737263f237",
    "name": "fonts-dejavu-core",
-   "licenseConcluded": "GPL-2.0 AND GPL-2.0+",
+   "licenseConcluded": "GPL-2.0 AND GPL-2.0+ AND Bitstream-Vera",
    "downloadLocation": "NOASSERTION",
    "externalRefs": [
     {
@@ -635,7 +635,7 @@
     }
    ],
    "filesAnalyzed": false,
-   "licenseDeclared": "GPL-2.0 AND GPL-2.0+",
+   "licenseDeclared": "GPL-2.0 AND GPL-2.0+ AND Bitstream-Vera",
    "originator": "Person: Debian Fonts Task Force <[email protected]>",
    "sourceInfo": "acquired package info from DPKG DB: /usr/share/doc/fonts-dejavu-core/copyright, /var/lib/dpkg/info/fonts-dejavu-core.conffiles, /var/lib/dpkg/info/fonts-dejavu-core.md5sums, /var/lib/dpkg/status",
    "versionInfo": "2.37-2"

diff --git a/internal/syft/fixtures/node.cyclonedx b/internal/syft/fixtures/node.cyclonedx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:adc0ddd4-1d4d-44b0-9c0f-cd255449dc07" version="1">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:6f2aeeab-87a8-4072-8f44-443a373e6540" version="1">
   <metadata>
-    <timestamp>2022-04-30T09:59:47+02:00</timestamp>
+    <timestamp>2022-05-14T09:21:34+02:00</timestamp>
     <tools>
       <tool>
         <vendor>anchore</vendor>
         <name>syft</name>
-        <version>0.45.0</version>
+        <version>0.46.0</version>
       </tool>
     </tools>
     <component bom-ref="36cc3d123ca150cc" type="container">

diff --git a/internal/syft/fixtures/node.json b/internal/syft/fixtures/node.json
@@ -79316,7 +79316,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "configuration": {
    "configPath": "",
    "verbosity": 0,
@@ -79339,7 +79339,7 @@
    },
    "log": {
     "structured": false,
-    "level": "info",
+    "level": "warning",
     "file-location": ""
    },
    "package": {
@@ -79390,13 +79390,25 @@
    },
    "exclude": [],
    "attest": {
-    "key": "cosign.key"
+    "key": "",
+    "cert": "",
+    "noUpload": false,
+    "force": false,
+    "recursive": false,
+    "replace": false,
+    "fulcioUrl": "https://fulcio.sigstore.dev",
+    "fulcio_identity_token": "",
+    "insecure_skip_verify": false,
+    "rekorUrl": "https://rekor.sigstore.dev",
+    "oidcIssuer": "https://oauth2.sigstore.dev/auth",
+    "oidcClientId": "sigstore",
+    "OIDCRedirectURL": ""
    },
    "platform": ""
   }
  },
  "schema": {
-  "version": "3.2.2",
-  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.2.json"
+  "version": "3.2.3",
+  "url": "https://raw.githubusercontent.com/anchore/syft/main/schema/json/schema-3.2.3.json"
  }
 }
diff --git a/internal/syft/fixtures/node.spdxjson b/internal/syft/fixtures/node.spdxjson
@@ -3,15 +3,15 @@
  "name": "node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-04-30T08:00:19.370003268Z",
+  "created": "2022-05-14T07:21:54.953183695Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.45.0"
+   "Tool: syft-0.46.0"
   ],
-  "licenseListVersion": "3.16"
+  "licenseListVersion": "3.17"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec-86ddd7eb-d92e-4c81-a6df-162bf4f1eedb",
+ "documentNamespace": "https://anchore.com/syft/image/node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec-da69e88c-45bc-4274-af6c-1bdb3f133c5c",
  "packages": [
   {
    "SPDXID": "SPDXRef-357eb6b8320e6221",