deps: update to [email protected]

Signed-off-by: Christian Kotzbauer <[email protected]>
ckotzbauer · Mar 5, 2022 · 34849c7 · 34849c7
1 parent e8d2f03
commit 34849c7
Show file tree

Hide file tree

Showing 11 changed files with 5,872 additions and 4,057 deletions.
diff --git a/go.sum b/go.sum
@@ -147,12 +147,8 @@ github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZV
 github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
 github.com/anchore/packageurl-go v0.0.0-20210922164639-b3fa992ebd29 h1:K9LfnxwhqvihqU0+MF325FNy7fsKV9EGaUxdfR4gnWk=
 github.com/anchore/packageurl-go v0.0.0-20210922164639-b3fa992ebd29/go.mod h1:Oc1UkGaJwY6ND6vtAqPSlYrptKRJngHwkwB6W7l1uP0=
-github.com/anchore/stereoscope v0.0.0-20220217141419-c6f02aed9ed2 h1:QuvMG+rqqJmtFRL+jqj5pFgjQcJSnEHEbtj1lKowLLQ=
-github.com/anchore/stereoscope v0.0.0-20220217141419-c6f02aed9ed2/go.mod h1:QpDHHV2h1NNfu7klzU75XC8RvSlaPK6HHgi0dy8A6sk=
 github.com/anchore/stereoscope v0.0.0-20220301220648-8aa8a4a0bf50 h1:+Fe67xv6NRLdZ5V9X2kw959XsKQCUx5/6RL/wQZfs44=
 github.com/anchore/stereoscope v0.0.0-20220301220648-8aa8a4a0bf50/go.mod h1:QpDHHV2h1NNfu7klzU75XC8RvSlaPK6HHgi0dy8A6sk=
-github.com/anchore/syft v0.39.3 h1:tquXrLigizDbIheeCm4lgP+q62sstyjbODOmBloMr3o=
-github.com/anchore/syft v0.39.3/go.mod h1:q2JbddnRXu93j/mtOTfyyuKa7hgVB/HCj7mdsuXjzzk=
 github.com/anchore/syft v0.40.1 h1:UOBOkO1qpPBCN2wqbCXaws/u3DwO5luU/pyoA3/HCAc=
 github.com/anchore/syft v0.40.1/go.mod h1:szP63Qv+uIHGVZ8r5AWUmI6CxpMejXRNmaNOAUIKzTo=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=

diff --git a/internal/syft/fixtures/alpine.cyclonedx b/internal/syft/fixtures/alpine.cyclonedx
diff --git a/internal/syft/fixtures/alpine.json b/internal/syft/fixtures/alpine.json
@@ -2991,7 +2991,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.39.3",
+  "version": "0.40.1",
   "configuration": {
    "configPath": "",
    "output": [

diff --git a/internal/syft/fixtures/alpine.spdx-json b/internal/syft/fixtures/alpine.spdx-json
@@ -3,15 +3,15 @@
  "name": "alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-02-26T14:39:20.987158398Z",
+  "created": "2022-03-05T09:37:57.674707761Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.39.3"
+   "Tool: syft-0.40.1"
   ],
   "licenseListVersion": "3.16"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-e10ccbcf-2d12-4ae2-8bc1-c5c7a5d44498",
+ "documentNamespace": "https://anchore.com/syft/image/alpine@sha256-21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300-fca6d4e4-d9d1-4158-93df-9d61cd1f5aae",
  "packages": [
   {
    "SPDXID": "SPDXRef-8039c8621bcc1383",

diff --git a/internal/syft/fixtures/nginx.cyclonedx b/internal/syft/fixtures/nginx.cyclonedx
diff --git a/internal/syft/fixtures/nginx.json b/internal/syft/fixtures/nginx.json
@@ -96191,7 +96191,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.39.3",
+  "version": "0.40.1",
   "configuration": {
    "configPath": "",
    "output": [

diff --git a/internal/syft/fixtures/nginx.spdx-json b/internal/syft/fixtures/nginx.spdx-json
@@ -3,15 +3,15 @@
  "name": "nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-02-26T14:40:06.703384981Z",
+  "created": "2022-03-05T09:39:24.970906288Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.39.3"
+   "Tool: syft-0.40.1"
   ],
   "licenseListVersion": "3.16"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-89d88ba6-ff48-4918-9c09-e8a85967b97a",
+ "documentNamespace": "https://anchore.com/syft/image/nginx@sha256-2834dc507516af02784808c5f48b7cbe38b8ed5d0f4837f16e78d00deb7e7767-cf55e75d-0db5-49a2-83fb-f43c468d0171",
  "packages": [
   {
    "SPDXID": "SPDXRef-b04aa27347c2f4d7",

diff --git a/internal/syft/fixtures/node.cyclonedx b/internal/syft/fixtures/node.cyclonedx
diff --git a/internal/syft/fixtures/node.json b/internal/syft/fixtures/node.json
@@ -79314,7 +79314,7 @@
  },
  "descriptor": {
   "name": "syft",
-  "version": "0.39.3",
+  "version": "0.40.1",
   "configuration": {
    "configPath": "",
    "output": [

diff --git a/internal/syft/fixtures/node.spdx-json b/internal/syft/fixtures/node.spdx-json
@@ -3,15 +3,15 @@
  "name": "node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec",
  "spdxVersion": "SPDX-2.2",
  "creationInfo": {
-  "created": "2022-02-26T14:41:24.328767297Z",
+  "created": "2022-03-05T09:41:04.060926717Z",
   "creators": [
    "Organization: Anchore, Inc",
-   "Tool: syft-0.39.3"
+   "Tool: syft-0.40.1"
   ],
   "licenseListVersion": "3.16"
  },
  "dataLicense": "CC0-1.0",
- "documentNamespace": "https://anchore.com/syft/image/node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec-8318ee15-bd6f-4dae-87be-a8234795db17",
+ "documentNamespace": "https://anchore.com/syft/image/node@sha256-f527a6118422b888c35162e0a7e2fb2febced4c85a23d96e1342f9edc2789fec-6cf75d42-a81a-4be1-8dd3-fbb776cba12b",
  "packages": [
   {
    "SPDXID": "SPDXRef-94ec80f9f3f113f4",

diff --git a/internal/syft/syft.go b/internal/syft/syft.go
@@ -54,7 +54,13 @@ func (s *Syft) ExecuteSyft(img kubernetes.ContainerImage) (string, error) {
 		return "", err
 	}
 
-	src, cleanup, err := source.New(filepath.Join("docker-archive:", imagePath), nil, nil)
+	input, err := source.ParseInput(filepath.Join("docker-archive:", imagePath), false)
+	if err != nil {
+		logrus.WithError(fmt.Errorf("failed to parse input %s: %w", imagePath, err)).Error("Input-Parsing failed")
+		return "", err
+	}
+
+	src, cleanup, err := source.New(*input, nil, nil)
 	if err != nil {
 		logrus.WithError(fmt.Errorf("failed to construct source from input %s: %w", imagePath, err)).Error("Source-Creation failed")
 		return "", err