diff --git a/integration/repo_test.go b/integration/repo_test.go index 4275e09d57cf..8d787104e63f 100644 --- a/integration/repo_test.go +++ b/integration/repo_test.go @@ -369,15 +369,6 @@ func TestRepository(t *testing.T) { }, golden: "testdata/conda-spdx.json.golden", }, - { - name: "conda environment.yaml generating SPDX SBOM", - args: args{ - command: "fs", - format: "spdx-json", - input: "testdata/fixtures/repo/conda-environment", - }, - golden: "testdata/conda-environment-spdx.json.golden", - }, { name: "gomod with fs subcommand", args: args{ diff --git a/integration/testdata/conda-environment-spdx.json.golden b/integration/testdata/conda-environment-spdx.json.golden deleted file mode 100644 index c52b39d87e66..000000000000 --- a/integration/testdata/conda-environment-spdx.json.golden +++ /dev/null @@ -1,76 +0,0 @@ -{ - "spdxVersion": "SPDX-2.3", - "dataLicense": "CC0-1.0", - "SPDXID": "SPDXRef-DOCUMENT", - "name": "testdata/fixtures/repo/conda-environment", - "documentNamespace": "http://aquasecurity.github.io/trivy/filesystem/testdata/fixtures/repo/conda-environment-3ff14136-e09f-4df9-80ea-000000000004", - "creationInfo": { - "creators": [ - "Organization: aquasecurity", - "Tool: trivy-dev" - ], - "created": "2021-08-25T12:20:30Z" - }, - "packages": [ - { - "name": "environment.yaml", - "SPDXID": "SPDXRef-Application-202c31aa4648bfc2", - "downloadLocation": "NONE", - "filesAnalyzed": false, - "attributionTexts": [ - "Class: lang-pkgs", - "Type: conda-environment" - ], - "primaryPackagePurpose": "APPLICATION" - }, - { - "name": "bzip2", - "SPDXID": "SPDXRef-Package-cba4fb2800432780", - "versionInfo": "1.0.8", - "supplier": "NOASSERTION", - "downloadLocation": "NONE", - "filesAnalyzed": false, - "sourceInfo": "package found in: environment.yaml", - "licenseConcluded": "NONE", - "licenseDeclared": "NONE", - "externalRefs": [ - { - "referenceCategory": "PACKAGE-MANAGER", - "referenceType": "purl", - "referenceLocator": "pkg:conda/bzip2@1.0.8" - } - ], - "attributionTexts": [ - "PkgType: conda-environment" - ], - "primaryPackagePurpose": "LIBRARY" - }, - { - "name": "testdata/fixtures/repo/conda-environment", - "SPDXID": "SPDXRef-Filesystem-2702076b98393e0b", - "downloadLocation": "NONE", - "filesAnalyzed": false, - "attributionTexts": [ - "SchemaVersion: 2" - ], - "primaryPackagePurpose": "SOURCE" - } - ], - "relationships": [ - { - "spdxElementId": "SPDXRef-Application-202c31aa4648bfc2", - "relatedSpdxElement": "SPDXRef-Package-cba4fb2800432780", - "relationshipType": "CONTAINS" - }, - { - "spdxElementId": "SPDXRef-DOCUMENT", - "relatedSpdxElement": "SPDXRef-Filesystem-2702076b98393e0b", - "relationshipType": "DESCRIBES" - }, - { - "spdxElementId": "SPDXRef-Filesystem-2702076b98393e0b", - "relatedSpdxElement": "SPDXRef-Application-202c31aa4648bfc2", - "relationshipType": "CONTAINS" - } - ] -} \ No newline at end of file