-
Notifications
You must be signed in to change notification settings - Fork 599
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'spdx-absolute-path-file' of https://github.com/anchore/…
…syft into spdx-absolute-path-file * 'spdx-absolute-path-file' of https://github.com/anchore/syft: chore(deps): update CPE dictionary index (#3507) chore(deps): update tools to latest versions (#3506) chore(deps): bump github.com/magiconair/properties from 1.8.7 to 1.8.9 (#3508) chore(deps): bump actions/cache from 4.1.2 to 4.2.0 (#3503) Add relationships for rust audit binary packages (#3500) fix order of rust dependencies and support git sources in Cargo.lock dependencies (#3502) chore(deps): update tools to latest versions (#3501) chore(deps): bump golang.org/x/net from 0.31.0 to 0.32.0 (#3499) chore: add and document target for updating unit snapshots (#3498) fix: emit NOASSERTION for copyright text to fix SPDX 2.2 validation failure (#3495)
- Loading branch information
Showing
34 changed files
with
1,695 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
syft/format/internal/testutil/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| { | ||
| "spdxVersion": "SPDX-2.3", | ||
| "dataLicense": "CC0-1.0", | ||
| "SPDXID": "SPDXRef-DOCUMENT", | ||
| "name": "user-image-input", | ||
| "documentNamespace":"redacted", | ||
| "creationInfo": { | ||
| "licenseListVersion":"redacted", | ||
| "creators": [ | ||
| "Organization: Anchore, Inc", | ||
| "Tool: syft-v0.42.0-bogus" | ||
| ], | ||
| "created":"redacted" | ||
| }, | ||
| "packages": [ | ||
| { | ||
| "name": "package-1", | ||
| "SPDXID": "SPDXRef-Package-python-package-1-c5cf7ac34cbca450", | ||
| "versionInfo": "1.0.1", | ||
| "supplier": "NOASSERTION", | ||
| "downloadLocation": "NOASSERTION", | ||
| "filesAnalyzed": false, | ||
| "sourceInfo": "acquired package info from installed python package manifest file: /somefile-1.txt", | ||
| "licenseConcluded": "NOASSERTION", | ||
| "licenseDeclared": "MIT", | ||
| "copyrightText": "NOASSERTION", | ||
| "externalRefs": [ | ||
| { | ||
| "referenceCategory": "SECURITY", | ||
| "referenceType": "cpe23Type", | ||
| "referenceLocator": "cpe:2.3:*:some:package:1:*:*:*:*:*:*:*" | ||
| }, | ||
| { | ||
| "referenceCategory": "PACKAGE-MANAGER", | ||
| "referenceType": "purl", | ||
| "referenceLocator": "a-purl-1" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "package-2", | ||
| "SPDXID": "SPDXRef-Package-deb-package-2-4b756c6f6fb127a3", | ||
| "versionInfo": "2.0.1", | ||
| "supplier": "NOASSERTION", | ||
| "downloadLocation": "NOASSERTION", | ||
| "filesAnalyzed": false, | ||
| "sourceInfo": "acquired package info from DPKG DB: /somefile-2.txt", | ||
| "licenseConcluded": "NOASSERTION", | ||
| "licenseDeclared": "NOASSERTION", | ||
| "copyrightText": "NOASSERTION", | ||
| "externalRefs": [ | ||
| { | ||
| "referenceCategory": "SECURITY", | ||
| "referenceType": "cpe23Type", | ||
| "referenceLocator": "cpe:2.3:*:some:package:2:*:*:*:*:*:*:*" | ||
| }, | ||
| { | ||
| "referenceCategory": "PACKAGE-MANAGER", | ||
| "referenceType": "purl", | ||
| "referenceLocator": "pkg:deb/debian/package-2@2.0.1" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "user-image-input", | ||
| "SPDXID": "SPDXRef-DocumentRoot-Image-user-image-input", | ||
| "versionInfo": "sha256:2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368", | ||
| "supplier": "NOASSERTION", | ||
| "downloadLocation": "NOASSERTION", | ||
| "filesAnalyzed": false, | ||
| "checksums": [ | ||
| { | ||
| "algorithm": "SHA256", | ||
| "checksumValue": "2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368" | ||
| } | ||
| ], | ||
| "licenseConcluded": "NOASSERTION", | ||
| "licenseDeclared": "NOASSERTION", | ||
| "externalRefs": [ | ||
| { | ||
| "referenceCategory": "PACKAGE-MANAGER", | ||
| "referenceType": "purl", | ||
| "referenceLocator": "pkg:oci/user-image-input@sha256:2731251dc34951c0e50fcc643b4c5f74922dad1a5d98f302b504cf46cd5d9368?arch=" | ||
| } | ||
| ], | ||
| "primaryPackagePurpose": "CONTAINER" | ||
| } | ||
| ], | ||
| "relationships": [ | ||
| { | ||
| "spdxElementId": "SPDXRef-DocumentRoot-Image-user-image-input", | ||
| "relatedSpdxElement": "SPDXRef-Package-python-package-1-c5cf7ac34cbca450", | ||
| "relationshipType": "CONTAINS" | ||
| }, | ||
| { | ||
| "spdxElementId": "SPDXRef-DocumentRoot-Image-user-image-input", | ||
| "relatedSpdxElement": "SPDXRef-Package-deb-package-2-4b756c6f6fb127a3", | ||
| "relationshipType": "CONTAINS" | ||
| }, | ||
| { | ||
| "spdxElementId": "SPDXRef-DOCUMENT", | ||
| "relatedSpdxElement": "SPDXRef-DocumentRoot-Image-user-image-input", | ||
| "relationshipType": "DESCRIBES" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.