update golden files

aquasecurity · May 10, 2024 · 01e1987 · 01e1987
1 parent 7535d92
commit 01e1987
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 37 deletions.
diff --git a/integration/testdata/julia-cyclonedx.json.golden b/integration/testdata/julia-cyclonedx.json.golden
@@ -2,7 +2,7 @@
   "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.5",
-  "serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000001",
+  "serialNumber": "urn:uuid:3ff14136-e09f-4df9-80ea-000000000006",
   "version": 1,
   "metadata": {
     "timestamp": "2021-08-25T12:20:30+00:00",
@@ -17,7 +17,7 @@
       ]
     },
     "component": {
-      "bom-ref": "3ff14136-e09f-4df9-80ea-000000000002",
+      "bom-ref": "3ff14136-e09f-4df9-80ea-000000000001",
       "type": "application",
       "name": "testdata/fixtures/repo/julia",
       "properties": [
@@ -30,7 +30,7 @@
   },
   "components": [
     {
-      "bom-ref": "98bde055-d07d-4cb8-91a7-cf00399e7169",
+      "bom-ref": "3ff14136-e09f-4df9-80ea-000000000002",
       "type": "application",
       "name": "Manifest.toml",
       "properties": [
@@ -98,16 +98,17 @@
   ],
   "dependencies": [
     {
-      "ref": "3ff14136-e09f-4df9-80ea-000000000002",
+      "ref": "3ff14136-e09f-4df9-80ea-000000000001",
       "dependsOn": [
-        "3ff14136-e09f-4df9-80ea-000000000003"
+        "3ff14136-e09f-4df9-80ea-000000000002"
       ]
     },
     {
-      "ref": "3ff14136-e09f-4df9-80ea-000000000003",
+      "ref": "3ff14136-e09f-4df9-80ea-000000000002",
       "dependsOn": [
         "pkg:julia/A@1.9.0?uuid=ead4f63c-334e-11e9-00e6-e7f0a5f21b60",
-        "pkg:julia/B@1.9.0?uuid=edca9bc6-334e-11e9-3554-9595dbb4349c"
+        "pkg:julia/B@1.9.0?uuid=edca9bc6-334e-11e9-3554-9595dbb4349c",
+        "pkg:julia/B@1.9.0?uuid=f41f7b98-334e-11e9-1257-49272045fb24"
       ]
     },
     {

diff --git a/integration/testdata/julia-spdx.json.golden b/integration/testdata/julia-spdx.json.golden
@@ -3,7 +3,7 @@
   "dataLicense": "CC0-1.0",
   "SPDXID": "SPDXRef-DOCUMENT",
   "name": "testdata/fixtures/repo/julia",
-  "documentNamespace": "http://aquasecurity.github.io/trivy/filesystem/testdata/fixtures/repo/julia-3ff14136-e09f-4df9-80ea-000000000001",
+  "documentNamespace": "http://aquasecurity.github.io/trivy/filesystem/testdata/fixtures/repo/julia-3ff14136-e09f-4df9-80ea-000000000006",
   "creationInfo": {
     "creators": [
       "Organization: aquasecurity",
@@ -12,13 +12,25 @@
     "created": "2021-08-25T12:20:30Z"
   },
   "packages": [
+    {
+      "name": "Manifest.toml",
+      "SPDXID": "SPDXRef-Application-18fc3597717a3e56",
+      "downloadLocation": "NONE",
+      "filesAnalyzed": false,
+      "attributionTexts": [
+        "Class: lang-pkgs",
+        "Type: julia"
+      ],
+      "primaryPackagePurpose": "APPLICATION"
+    },
     {
       "name": "A",
-      "SPDXID": "SPDXRef-Package-46973d9aca091871",
+      "SPDXID": "SPDXRef-Package-2a46714189f3b9de",
       "versionInfo": "1.9.0",
       "supplier": "NOASSERTION",
       "downloadLocation": "NONE",
       "filesAnalyzed": false,
+      "sourceInfo": "package found in: Manifest.toml",
       "licenseConcluded": "NONE",
       "licenseDeclared": "NONE",
       "externalRefs": [
@@ -29,60 +41,57 @@
         }
       ],
       "attributionTexts": [
-        "PkgID: ead4f63c-334e-11e9-00e6-e7f0a5f21b60"
+        "PkgID: ead4f63c-334e-11e9-00e6-e7f0a5f21b60",
+        "PkgType: julia"
       ],
       "primaryPackagePurpose": "LIBRARY"
     },
     {
       "name": "B",
-      "SPDXID": "SPDXRef-Package-436cd42285772e07",
+      "SPDXID": "SPDXRef-Package-4a8e351c4c9b7318",
       "versionInfo": "1.9.0",
       "supplier": "NOASSERTION",
       "downloadLocation": "NONE",
       "filesAnalyzed": false,
+      "sourceInfo": "package found in: Manifest.toml",
       "licenseConcluded": "NONE",
       "licenseDeclared": "NONE",
       "externalRefs": [
         {
           "referenceCategory": "PACKAGE-MANAGER",
           "referenceType": "purl",
-          "referenceLocator": "pkg:julia/B@1.9.0?uuid=f41f7b98-334e-11e9-1257-49272045fb24"
+          "referenceLocator": "pkg:julia/B@1.9.0?uuid=edca9bc6-334e-11e9-3554-9595dbb4349c"
         }
       ],
       "attributionTexts": [
-        "PkgID: f41f7b98-334e-11e9-1257-49272045fb24"
+        "PkgID: edca9bc6-334e-11e9-3554-9595dbb4349c",
+        "PkgType: julia"
       ],
       "primaryPackagePurpose": "LIBRARY"
     },
     {
       "name": "B",
-      "SPDXID": "SPDXRef-Package-fa368ab116ed505f",
+      "SPDXID": "SPDXRef-Package-d10d5e4a30a43fff",
       "versionInfo": "1.9.0",
       "supplier": "NOASSERTION",
       "downloadLocation": "NONE",
       "filesAnalyzed": false,
+      "sourceInfo": "package found in: Manifest.toml",
       "licenseConcluded": "NONE",
       "licenseDeclared": "NONE",
       "externalRefs": [
         {
           "referenceCategory": "PACKAGE-MANAGER",
           "referenceType": "purl",
-          "referenceLocator": "pkg:julia/B@1.9.0?uuid=edca9bc6-334e-11e9-3554-9595dbb4349c"
+          "referenceLocator": "pkg:julia/B@1.9.0?uuid=f41f7b98-334e-11e9-1257-49272045fb24"
         }
       ],
       "attributionTexts": [
-        "PkgID: edca9bc6-334e-11e9-3554-9595dbb4349c"
+        "PkgID: f41f7b98-334e-11e9-1257-49272045fb24",
+        "PkgType: julia"
       ],
       "primaryPackagePurpose": "LIBRARY"
     },
-    {
-      "name": "julia",
-      "SPDXID": "SPDXRef-Application-7d3c9e4ebc4e0210",
-      "downloadLocation": "NONE",
-      "filesAnalyzed": false,
-      "sourceInfo": "Manifest.toml",
-      "primaryPackagePurpose": "APPLICATION"
-    },
     {
       "name": "testdata/fixtures/repo/julia",
       "SPDXID": "SPDXRef-Filesystem-1be792dd0077c431",
@@ -96,29 +105,34 @@
   ],
   "relationships": [
     {
-      "spdxElementId": "SPDXRef-DOCUMENT",
-      "relatedSpdxElement": "SPDXRef-Filesystem-1be792dd0077c431",
-      "relationshipType": "DESCRIBES"
+      "spdxElementId": "SPDXRef-Application-18fc3597717a3e56",
+      "relatedSpdxElement": "SPDXRef-Package-2a46714189f3b9de",
+      "relationshipType": "CONTAINS"
     },
     {
-      "spdxElementId": "SPDXRef-Filesystem-1be792dd0077c431",
-      "relatedSpdxElement": "SPDXRef-Application-7d3c9e4ebc4e0210",
+      "spdxElementId": "SPDXRef-Application-18fc3597717a3e56",
+      "relatedSpdxElement": "SPDXRef-Package-4a8e351c4c9b7318",
       "relationshipType": "CONTAINS"
     },
     {
-      "spdxElementId": "SPDXRef-Application-7d3c9e4ebc4e0210",
-      "relatedSpdxElement": "SPDXRef-Package-46973d9aca091871",
+      "spdxElementId": "SPDXRef-Application-18fc3597717a3e56",
+      "relatedSpdxElement": "SPDXRef-Package-d10d5e4a30a43fff",
       "relationshipType": "CONTAINS"
     },
     {
-      "spdxElementId": "SPDXRef-Application-7d3c9e4ebc4e0210",
-      "relatedSpdxElement": "SPDXRef-Package-fa368ab116ed505f",
-      "relationshipType": "CONTAINS"
+      "spdxElementId": "SPDXRef-DOCUMENT",
+      "relatedSpdxElement": "SPDXRef-Filesystem-1be792dd0077c431",
+      "relationshipType": "DESCRIBES"
     },
     {
-      "spdxElementId": "SPDXRef-Application-7d3c9e4ebc4e0210",
-      "relatedSpdxElement": "SPDXRef-Package-436cd42285772e07",
+      "spdxElementId": "SPDXRef-Filesystem-1be792dd0077c431",
+      "relatedSpdxElement": "SPDXRef-Application-18fc3597717a3e56",
       "relationshipType": "CONTAINS"
+    },
+    {
+      "spdxElementId": "SPDXRef-Package-2a46714189f3b9de",
+      "relatedSpdxElement": "SPDXRef-Package-d10d5e4a30a43fff",
+      "relationshipType": "DEPENDS_ON"
     }
   ]
-}
+}