diff --git a/go.mod b/go.mod index 00012e155..b943ac8e5 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e github.com/sergi/go-diff v1.3.1 github.com/sirupsen/logrus v1.9.3 - github.com/spdx/tools-golang v0.5.0 + github.com/spdx/tools-golang v0.5.1 github.com/spf13/afero v1.9.5 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 966186b95..63a059a88 100644 --- a/go.sum +++ b/go.sum @@ -559,8 +559,8 @@ github.com/skeema/knownhosts v1.1.1 h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIn github.com/skeema/knownhosts v1.1.1/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spdx/gordf v0.0.0-20201111095634-7098f93598fb/go.mod h1:uKWaldnbMnjsSAXRurWqqrdyZen1R7kxl8TkmWk2OyM= -github.com/spdx/tools-golang v0.5.0 h1:/fqihV2Jna7fmow65dHpgKNsilgLK7ICpd2tkCnPEyY= -github.com/spdx/tools-golang v0.5.0/go.mod h1:kkGlrSXXfHwuSzHQZJRV3aKu9ZXCq/MSf2+xyiJH1lM= +github.com/spdx/tools-golang v0.5.1 h1:fJg3SVOGG+eIva9ZUBm/hvyA7PIPVFjRxUKe6fdAgwE= +github.com/spdx/tools-golang v0.5.1/go.mod h1:/DRDQuBfB37HctM29YtrX1v+bXiVmT2OpQDalRmX9aU= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= @@ -594,7 +594,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= diff --git a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden index de775cd15..e4ba2ccd9 100644 --- a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden +++ b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONDirectoryEncoder.golden @@ -3,14 +3,14 @@ "dataLicense": "CC0-1.0", "SPDXID": "SPDXRef-DOCUMENT", "name": "/some/path", - "documentNamespace": "https://anchore.com/syft/dir/some/path-5ea40e59-d91a-4682-a016-da45ddd540e4", + "documentNamespace": "https://anchore.com/syft/dir/some/path-303fccb4-22d1-4039-9061-553bc875f086", "creationInfo": { "licenseListVersion": "3.20", "creators": [ "Organization: Anchore, Inc", "Tool: syft-v0.42.0-bogus" ], - "created": "2023-05-09T17:11:26Z" + "created": "2023-06-05T18:49:13Z" }, "packages": [ { @@ -18,6 +18,7 @@ "SPDXID": "SPDXRef-Package-python-package-1-9265397e5e15168a", "versionInfo": "1.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from installed python package manifest file: /some/path/pkg1", "licenseConcluded": "NOASSERTION", "licenseDeclared": "MIT", @@ -40,6 +41,7 @@ "SPDXID": "SPDXRef-Package-deb-package-2-db4abfe497c180d3", "versionInfo": "2.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from DPKG DB: /some/path/pkg1", "licenseConcluded": "NOASSERTION", "licenseDeclared": "NOASSERTION", diff --git a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden index 8b08d7608..3c49c3362 100644 --- a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden +++ b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXJSONImageEncoder.golden @@ -3,14 +3,14 @@ "dataLicense": "CC0-1.0", "SPDXID": "SPDXRef-DOCUMENT", "name": "user-image-input", - "documentNamespace": "https://anchore.com/syft/image/user-image-input-2cc737fb-af51-4e4b-9395-cceabcc305eb", + "documentNamespace": "https://anchore.com/syft/image/user-image-input-5b9aac79-334c-4d6a-b2e6-95a819c1d45a", "creationInfo": { "licenseListVersion": "3.20", "creators": [ "Organization: Anchore, Inc", "Tool: syft-v0.42.0-bogus" ], - "created": "2023-05-09T17:11:26Z" + "created": "2023-06-05T18:49:14Z" }, "packages": [ { @@ -18,6 +18,7 @@ "SPDXID": "SPDXRef-Package-python-package-1-125840abc1c66dd7", "versionInfo": "1.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from installed python package manifest file: /somefile-1.txt", "licenseConcluded": "NOASSERTION", "licenseDeclared": "MIT", @@ -40,6 +41,7 @@ "SPDXID": "SPDXRef-Package-deb-package-2-958443e2d9304af4", "versionInfo": "2.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from DPKG DB: /somefile-2.txt", "licenseConcluded": "NOASSERTION", "licenseDeclared": "NOASSERTION", diff --git a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXRelationshipOrder.golden b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXRelationshipOrder.golden index e269ed535..0dba256d9 100644 --- a/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXRelationshipOrder.golden +++ b/syft/formats/spdxjson/test-fixtures/snapshot/TestSPDXRelationshipOrder.golden @@ -3,14 +3,14 @@ "dataLicense": "CC0-1.0", "SPDXID": "SPDXRef-DOCUMENT", "name": "user-image-input", - "documentNamespace": "https://anchore.com/syft/image/user-image-input-1de3ac0e-5829-4294-9198-8d8fcdb5dd51", + "documentNamespace": "https://anchore.com/syft/image/user-image-input-2a1392ab-7eb5-4f2a-86f6-777aef3232e1", "creationInfo": { "licenseListVersion": "3.20", "creators": [ "Organization: Anchore, Inc", "Tool: syft-v0.42.0-bogus" ], - "created": "2023-05-09T17:11:26Z" + "created": "2023-06-05T18:49:14Z" }, "packages": [ { @@ -18,6 +18,7 @@ "SPDXID": "SPDXRef-Package-python-package-1-125840abc1c66dd7", "versionInfo": "1.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from installed python package manifest file: /somefile-1.txt", "licenseConcluded": "NOASSERTION", "licenseDeclared": "MIT", @@ -40,6 +41,7 @@ "SPDXID": "SPDXRef-Package-deb-package-2-958443e2d9304af4", "versionInfo": "2.0.1", "downloadLocation": "NOASSERTION", + "filesAnalyzed": false, "sourceInfo": "acquired package info from DPKG DB: /somefile-2.txt", "licenseConcluded": "NOASSERTION", "licenseDeclared": "NOASSERTION", diff --git a/syft/formats/spdxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden b/syft/formats/spdxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden index f4aa1e7bb..c799acd24 100644 Binary files a/syft/formats/spdxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden and b/syft/formats/spdxjson/test-fixtures/snapshot/stereoscope-fixture-image-simple.golden differ