From 6d23969c454565d5dc020828c4416f8e469d4e07 Mon Sep 17 00:00:00 2001 From: houdini91 Date: Tue, 12 Dec 2023 14:26:35 +0200 Subject: [PATCH 1/6] fix panic haskill cataloger Signed-off-by: houdini91 --- syft/pkg/cataloger/haskell/parse_stack_lock.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/syft/pkg/cataloger/haskell/parse_stack_lock.go b/syft/pkg/cataloger/haskell/parse_stack_lock.go index 40dc6aa6ca4..c49773ebfd5 100644 --- a/syft/pkg/cataloger/haskell/parse_stack_lock.go +++ b/syft/pkg/cataloger/haskell/parse_stack_lock.go @@ -63,6 +63,9 @@ func parseStackLock(_ file.Resolver, _ *generic.Environment, reader file.Locatio } for _, pack := range lockFile.Packages { + if pack.Completed.Hackage == "" { + continue + } pkgName, pkgVersion, pkgHash := parseStackPackageEncoding(pack.Completed.Hackage) pkgs = append( pkgs, @@ -86,7 +89,9 @@ func parseStackPackageEncoding(pkgEncoding string) (name, version, hash string) remainingEncoding := pkgEncoding[lastDashIdx+1:] encodingSplits := strings.Split(remainingEncoding, "@") version = encodingSplits[0] - startHash, endHash := strings.Index(encodingSplits[1], ":")+1, strings.Index(encodingSplits[1], ",") - hash = encodingSplits[1][startHash:endHash] + if len(encodingSplits) > 1 { + startHash, endHash := strings.Index(encodingSplits[1], ":")+1, strings.Index(encodingSplits[1], ",") + hash = encodingSplits[1][startHash:endHash] + } return } From 5fc8634d377e28f0486fcd5f1d382dbef397b969 Mon Sep 17 00:00:00 2001 From: houdini91 Date: Wed, 13 Dec 2023 11:33:18 +0200 Subject: [PATCH 2/6] haskell only package name found Signed-off-by: houdini91 --- syft/pkg/cataloger/haskell/parse_stack_lock.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/syft/pkg/cataloger/haskell/parse_stack_lock.go b/syft/pkg/cataloger/haskell/parse_stack_lock.go index c49773ebfd5..9a144ef9c27 100644 --- a/syft/pkg/cataloger/haskell/parse_stack_lock.go +++ b/syft/pkg/cataloger/haskell/parse_stack_lock.go @@ -85,7 +85,12 @@ func parseStackLock(_ file.Resolver, _ *generic.Environment, reader file.Locatio } func parseStackPackageEncoding(pkgEncoding string) (name, version, hash string) { lastDashIdx := strings.LastIndex(pkgEncoding, "-") - name = pkgEncoding[:lastDashIdx] + if lastDashIdx == -1 { + name = pkgEncoding + return + } else { + name = pkgEncoding[:lastDashIdx] + } remainingEncoding := pkgEncoding[lastDashIdx+1:] encodingSplits := strings.Split(remainingEncoding, "@") version = encodingSplits[0] From e43d7f96f6dd02ac3fe86cfdada4b84872660b80 Mon Sep 17 00:00:00 2001 From: Will Murphy Date: Tue, 12 Dec 2023 16:33:05 -0500 Subject: [PATCH 3/6] add unit test for Haskell cataloger panic fix Signed-off-by: Will Murphy --- syft/pkg/cataloger/haskell/parse_stack_lock.go | 4 ++-- .../cataloger/haskell/test-fixtures/stack.yaml.lock | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/syft/pkg/cataloger/haskell/parse_stack_lock.go b/syft/pkg/cataloger/haskell/parse_stack_lock.go index 9a144ef9c27..62ee5bc1644 100644 --- a/syft/pkg/cataloger/haskell/parse_stack_lock.go +++ b/syft/pkg/cataloger/haskell/parse_stack_lock.go @@ -83,14 +83,14 @@ func parseStackLock(_ file.Resolver, _ *generic.Environment, reader file.Locatio return pkgs, nil, nil } + func parseStackPackageEncoding(pkgEncoding string) (name, version, hash string) { lastDashIdx := strings.LastIndex(pkgEncoding, "-") if lastDashIdx == -1 { name = pkgEncoding return - } else { - name = pkgEncoding[:lastDashIdx] } + name = pkgEncoding[:lastDashIdx] remainingEncoding := pkgEncoding[lastDashIdx+1:] encodingSplits := strings.Split(remainingEncoding, "@") version = encodingSplits[0] diff --git a/syft/pkg/cataloger/haskell/test-fixtures/stack.yaml.lock b/syft/pkg/cataloger/haskell/test-fixtures/stack.yaml.lock index a185422556e..22076504386 100644 --- a/syft/pkg/cataloger/haskell/test-fixtures/stack.yaml.lock +++ b/syft/pkg/cataloger/haskell/test-fixtures/stack.yaml.lock @@ -67,6 +67,19 @@ packages: sha256: 557c438345de19f82bf01d676100da2a191ef06f624e7a4b90b09ac17cbb52a5 original: hackage: ptr-0.16.8.2@sha256:708ebb95117f2872d2c5a554eb6804cf1126e86abe793b2673f913f14e5eb1ac,3959 +- completed: + commit: a5847301404583e16d55cd4d051b8e605d704fbc + git: https://github.com/runtimeverification/haskell-backend.git + name: kore + pantry-tree: + sha256: 30a502eda589be5af735b1b59760ce3e0235c0cae8961978a46b3564dd8db32b + size: 44685 + subdir: kore + version: 0.60.0.0 + original: + commit: a5847301404583e16d55cd4d051b8e605d704fbc + git: https://github.com/runtimeverification/haskell-backend.git + subdir: kore snapshots: - completed: size: 618951 From 1db4f15526dfbc2803c281f8916dd2b26fdee313 Mon Sep 17 00:00:00 2001 From: mikey strauss Date: Wed, 20 Dec 2023 16:46:04 +0200 Subject: [PATCH 4/6] fix: don't panic in haskell cataloger (#2419) Fixes a bug where previously the haskell cataloger would panic when parsing a stack.yaml.lock file that had an entry with an empty hackage string. Signed-off-by: houdini91 --- .../test-fixtures/postgrest.stack.yaml | 32 ++++ .../test-fixtures/postgrest.stack.yaml.lock | 149 ++++++++++++++++++ syft/source/stereoscope_image_source.go | 1 - 3 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml create mode 100644 syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock diff --git a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml new file mode 100644 index 00000000000..9a26c645d21 --- /dev/null +++ b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml @@ -0,0 +1,32 @@ +resolver: lts-19.14 # 2022-07-01, GHC 9.0.2 + +nix: + packages: + - pcre + - pkgconfig + - postgresql + - zlib + # disable pure by default so that the test enviroment can be passed + pure: false + +extra-deps: + - HTTP-4000.3.16 + - configurator-pg-0.2.6 + - hashable-1.4.1.0 + - hashtables-1.3 + - hasql-1.6.1.1 + - hasql-dynamic-statements-0.3.1.2 + - hasql-implicits-0.1.0.5 + - hasql-notifications-0.2.0.3 + - hasql-pool-0.8.0.6 + - hasql-transaction-1.0.1.2 + - isomorphism-class-0.1.0.6 + - lens-aeson-1.1.3 + - optparse-applicative-0.16.1.0 + - postgresql-binary-0.12.5 + - protolude-0.3.2 + - ptr-0.16.8.2 + - text-builder-0.6.7 + - text-builder-dev-0.3.3 + - git: https://github.com/PostgREST/postgresql-libpq.git + commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 diff --git a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock new file mode 100644 index 00000000000..250e161aebd --- /dev/null +++ b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock @@ -0,0 +1,149 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: +- completed: + hackage: HTTP-4000.3.16@sha256:6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71,5947 + pantry-tree: + size: 1428 + sha256: b73a7f6d21cf20bbf819e19039409c9010efb5000d2b72cdd8fd67a9027c14e8 + original: + hackage: HTTP-4000.3.16 +- completed: + hackage: configurator-pg-0.2.6@sha256:cd9b06a458428e493a4d6def725af7ab1ab0fef678fbd871f9586fc7f9aa70be,2849 + pantry-tree: + size: 2463 + sha256: 97efe7a22afc93033bda5adcffdabc0f1c30dc32b2c3ba02114ce7cd74c942fd + original: + hackage: configurator-pg-0.2.6 +- completed: + hackage: hashable-1.4.1.0@sha256:50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b,5019 + pantry-tree: + size: 1248 + sha256: 9af2f7a42674f7effcabbebc043f97057240783f1709338a77f58216f4a5f18c + original: + hackage: hashable-1.4.1.0 +- completed: + hackage: hashtables-1.3@sha256:ab21804fdafbbd8ad918b2911dabb729ae0ea891780fe66bf7804cbcd07edadf,10379 + pantry-tree: + size: 2895 + sha256: e71f113ad989dbc994e0fb52bcc219d62930de9afa8b3441bf7909e864481b33 + original: + hackage: hashtables-1.3 +- completed: + hackage: hasql-1.6.1.1@sha256:948a2137308cc5354e4997bc3666753867124cd25db792424cb9614b1c1b44cf,6626 + pantry-tree: + size: 2622 + sha256: 28d21bf061522fc513f040e9c383b90532222b7258216cc094e07736add8be10 + original: + hackage: hasql-1.6.1.1 +- completed: + hackage: hasql-dynamic-statements-0.3.1.2@sha256:417aa533c84f074e2fa16bb2c4d4231326aa512097dd1025d915388e56acd1eb,2675 + pantry-tree: + size: 595 + sha256: 91696d3f3e0ef3254772ae5a8e4e89be68285febb49b302ed83d85ac4037a417 + original: + hackage: hasql-dynamic-statements-0.3.1.2 +- completed: + hackage: hasql-implicits-0.1.0.5@sha256:d16aacad6dc21428d72447d3ae8bcc03839a2f0aa1ec29c797ed9aca4609f9af,1361 + pantry-tree: + size: 264 + sha256: 0451b99a0a1d02db673d0c40acdf60d4e769e15852eed9e8dc05bffaf43efb70 + original: + hackage: hasql-implicits-0.1.0.5 +- completed: + hackage: hasql-notifications-0.2.0.3@sha256:aca3f7ee847a8f0b7ef6f989dc48f4a094a06c1a34e92aa3c8bb230085966ea6,2027 + pantry-tree: + size: 452 + sha256: 999f0f2856a00d21f4498a8a58452bbefc4ea972fe2984fd234a68a5fe61d98b + original: + hackage: hasql-notifications-0.2.0.3 +- completed: + hackage: hasql-pool-0.8.0.6@sha256:b63bb83409bab5bc20ff24f5d62205e9b117701a0fc24531ddeac20ab8c2a42c,1818 + pantry-tree: + size: 346 + sha256: c4100946b7eae44375511e35a393abe2e1db0e5637c68cea8f53176b796bfd5b + original: + hackage: hasql-pool-0.8.0.6 +- completed: + hackage: hasql-transaction-1.0.1.2@sha256:297b158cd1f0727f9b0e175bd7d3741c1bcb725a8094956d0ee79b41aafdb30a,2890 + pantry-tree: + size: 983 + sha256: 3679e6d5c835cc17a8fa0c252b8221e282880044b7219aa1de2531bbd5c40691 + original: + hackage: hasql-transaction-1.0.1.2 +- completed: + hackage: isomorphism-class-0.1.0.6@sha256:d93da31287359c761953b876354de28381f409c5c50e3241c572a443e50c553d,1703 + pantry-tree: + size: 465 + sha256: c97f922d1ae8f1a0db4c28fac9383d2716934879e95ff0b2b88ebb861d6fba14 + original: + hackage: isomorphism-class-0.1.0.6 +- completed: + hackage: lens-aeson-1.1.3@sha256:52c8eaecd2d1c2a969c0762277c4a8ee72c339a686727d5785932e72ef9c3050,1764 + pantry-tree: + size: 541 + sha256: b31392b78f2a03111c805f4400007778eb93b49f998ab41dfbebaaf9b5526bad + original: + hackage: lens-aeson-1.1.3 +- completed: + hackage: optparse-applicative-0.16.1.0@sha256:418c22ed6a19124d457d96bc66bd22c93ac22fad0c7100fe4972bbb4ac989731,4982 + pantry-tree: + size: 2979 + sha256: dd092d843091c08691485d68a1908517079b1bc6f3d73928f37635a19dc27fc1 + original: + hackage: optparse-applicative-0.16.1.0 +- completed: + hackage: postgresql-binary-0.12.5@sha256:de9da3cba9be541d6c75ae8da2858c33d83dc1b2e0c639b0b9781816b78a91f4,5594 + pantry-tree: + size: 1619 + sha256: b392337f91031a5b3407393e2f04dfe4e7a28019e88eae6a9370538b90e28c51 + original: + hackage: postgresql-binary-0.12.5 +- completed: + hackage: protolude-0.3.2@sha256:2a38b3dad40d238ab644e234b692c8911423f9d3ed0e36b62287c4a698d92cd1,2240 + pantry-tree: + size: 1594 + sha256: a36d2912ac552d950ba4476de7d950b56b82dd28e48b9f4d0efee938f10bc525 + original: + hackage: protolude-0.3.2 +- completed: + hackage: ptr-0.16.8.2@sha256:708ebb95117f2872d2c5a554eb6804cf1126e86abe793b2673f913f14e5eb1ac,3959 + pantry-tree: + size: 1303 + sha256: 557c438345de19f82bf01d676100da2a191ef06f624e7a4b90b09ac17cbb52a5 + original: + hackage: ptr-0.16.8.2 +- completed: + hackage: text-builder-0.6.7@sha256:efbb3e06107e9c8d1cfe85c963938ca9f375a74379af03da3173be4ef5c37bcf,2364 + pantry-tree: + size: 425 + sha256: cd0ae197e6f9f3860a8ab71f5b87c4a8452ed1fce2fdfd35e36d68ded6e6648e + original: + hackage: text-builder-0.6.7 +- completed: + hackage: text-builder-dev-0.3.3@sha256:79ec422defcc2e5b34f94129c72b98d34b2efc1ed8bbd945ccb8f4f535a892c3,2784 + pantry-tree: + size: 724 + sha256: 8883631a132438e7892fcb13e89d6bbcdc0ac76c56fbea8df8d7aa482ce81f73 + original: + hackage: text-builder-dev-0.3.3 +- completed: + name: postgresql-libpq + version: 0.9.4.3 + git: https://github.com/PostgREST/postgresql-libpq.git + pantry-tree: + size: 1081 + sha256: 0df271e48af32eb8292a45301af45e114110d54099ee73dbc609d39770e8175e + commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 + original: + git: https://github.com/PostgREST/postgresql-libpq.git + commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 +snapshots: +- completed: + size: 618951 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/14.yaml + sha256: 4c31d4ef975b0211078862566aedf3b82b6cea569fc2cde4c72a51e5a8d236ce + original: lts-19.14 \ No newline at end of file diff --git a/syft/source/stereoscope_image_source.go b/syft/source/stereoscope_image_source.go index 53bca00250a..8f5e961ce56 100644 --- a/syft/source/stereoscope_image_source.go +++ b/syft/source/stereoscope_image_source.go @@ -64,7 +64,6 @@ func NewFromStereoscopeImage(cfg StereoscopeImageConfig) (*StereoscopeImageSourc if cfg.Platform != nil { opts = append(opts, stereoscope.WithPlatform(cfg.Platform.String())) } - img, err := stereoscope.GetImageFromSource(ctx, cfg.Reference, cfg.From, opts...) if err != nil { return nil, fmt.Errorf("unable to load image: %w", err) From fd8e0a1591823a51eb8faa4854530fd1ffd5867b Mon Sep 17 00:00:00 2001 From: Will Murphy Date: Wed, 20 Dec 2023 09:48:36 -0500 Subject: [PATCH 5/6] chore: delete extraneous files Signed-off-by: Will Murphy --- .../test-fixtures/postgrest.stack.yaml | 32 ---- .../test-fixtures/postgrest.stack.yaml.lock | 149 ------------------ 2 files changed, 181 deletions(-) delete mode 100644 syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml delete mode 100644 syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock diff --git a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml deleted file mode 100644 index 9a26c645d21..00000000000 --- a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml +++ /dev/null @@ -1,32 +0,0 @@ -resolver: lts-19.14 # 2022-07-01, GHC 9.0.2 - -nix: - packages: - - pcre - - pkgconfig - - postgresql - - zlib - # disable pure by default so that the test enviroment can be passed - pure: false - -extra-deps: - - HTTP-4000.3.16 - - configurator-pg-0.2.6 - - hashable-1.4.1.0 - - hashtables-1.3 - - hasql-1.6.1.1 - - hasql-dynamic-statements-0.3.1.2 - - hasql-implicits-0.1.0.5 - - hasql-notifications-0.2.0.3 - - hasql-pool-0.8.0.6 - - hasql-transaction-1.0.1.2 - - isomorphism-class-0.1.0.6 - - lens-aeson-1.1.3 - - optparse-applicative-0.16.1.0 - - postgresql-binary-0.12.5 - - protolude-0.3.2 - - ptr-0.16.8.2 - - text-builder-0.6.7 - - text-builder-dev-0.3.3 - - git: https://github.com/PostgREST/postgresql-libpq.git - commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 diff --git a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock b/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock deleted file mode 100644 index 250e161aebd..00000000000 --- a/syft/pkg/cataloger/haskell/test-fixtures/postgrest.stack.yaml.lock +++ /dev/null @@ -1,149 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: HTTP-4000.3.16@sha256:6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71,5947 - pantry-tree: - size: 1428 - sha256: b73a7f6d21cf20bbf819e19039409c9010efb5000d2b72cdd8fd67a9027c14e8 - original: - hackage: HTTP-4000.3.16 -- completed: - hackage: configurator-pg-0.2.6@sha256:cd9b06a458428e493a4d6def725af7ab1ab0fef678fbd871f9586fc7f9aa70be,2849 - pantry-tree: - size: 2463 - sha256: 97efe7a22afc93033bda5adcffdabc0f1c30dc32b2c3ba02114ce7cd74c942fd - original: - hackage: configurator-pg-0.2.6 -- completed: - hackage: hashable-1.4.1.0@sha256:50b2f002c68fe67730ee7a3cd8607486197dd99b084255005ad51ecd6970a41b,5019 - pantry-tree: - size: 1248 - sha256: 9af2f7a42674f7effcabbebc043f97057240783f1709338a77f58216f4a5f18c - original: - hackage: hashable-1.4.1.0 -- completed: - hackage: hashtables-1.3@sha256:ab21804fdafbbd8ad918b2911dabb729ae0ea891780fe66bf7804cbcd07edadf,10379 - pantry-tree: - size: 2895 - sha256: e71f113ad989dbc994e0fb52bcc219d62930de9afa8b3441bf7909e864481b33 - original: - hackage: hashtables-1.3 -- completed: - hackage: hasql-1.6.1.1@sha256:948a2137308cc5354e4997bc3666753867124cd25db792424cb9614b1c1b44cf,6626 - pantry-tree: - size: 2622 - sha256: 28d21bf061522fc513f040e9c383b90532222b7258216cc094e07736add8be10 - original: - hackage: hasql-1.6.1.1 -- completed: - hackage: hasql-dynamic-statements-0.3.1.2@sha256:417aa533c84f074e2fa16bb2c4d4231326aa512097dd1025d915388e56acd1eb,2675 - pantry-tree: - size: 595 - sha256: 91696d3f3e0ef3254772ae5a8e4e89be68285febb49b302ed83d85ac4037a417 - original: - hackage: hasql-dynamic-statements-0.3.1.2 -- completed: - hackage: hasql-implicits-0.1.0.5@sha256:d16aacad6dc21428d72447d3ae8bcc03839a2f0aa1ec29c797ed9aca4609f9af,1361 - pantry-tree: - size: 264 - sha256: 0451b99a0a1d02db673d0c40acdf60d4e769e15852eed9e8dc05bffaf43efb70 - original: - hackage: hasql-implicits-0.1.0.5 -- completed: - hackage: hasql-notifications-0.2.0.3@sha256:aca3f7ee847a8f0b7ef6f989dc48f4a094a06c1a34e92aa3c8bb230085966ea6,2027 - pantry-tree: - size: 452 - sha256: 999f0f2856a00d21f4498a8a58452bbefc4ea972fe2984fd234a68a5fe61d98b - original: - hackage: hasql-notifications-0.2.0.3 -- completed: - hackage: hasql-pool-0.8.0.6@sha256:b63bb83409bab5bc20ff24f5d62205e9b117701a0fc24531ddeac20ab8c2a42c,1818 - pantry-tree: - size: 346 - sha256: c4100946b7eae44375511e35a393abe2e1db0e5637c68cea8f53176b796bfd5b - original: - hackage: hasql-pool-0.8.0.6 -- completed: - hackage: hasql-transaction-1.0.1.2@sha256:297b158cd1f0727f9b0e175bd7d3741c1bcb725a8094956d0ee79b41aafdb30a,2890 - pantry-tree: - size: 983 - sha256: 3679e6d5c835cc17a8fa0c252b8221e282880044b7219aa1de2531bbd5c40691 - original: - hackage: hasql-transaction-1.0.1.2 -- completed: - hackage: isomorphism-class-0.1.0.6@sha256:d93da31287359c761953b876354de28381f409c5c50e3241c572a443e50c553d,1703 - pantry-tree: - size: 465 - sha256: c97f922d1ae8f1a0db4c28fac9383d2716934879e95ff0b2b88ebb861d6fba14 - original: - hackage: isomorphism-class-0.1.0.6 -- completed: - hackage: lens-aeson-1.1.3@sha256:52c8eaecd2d1c2a969c0762277c4a8ee72c339a686727d5785932e72ef9c3050,1764 - pantry-tree: - size: 541 - sha256: b31392b78f2a03111c805f4400007778eb93b49f998ab41dfbebaaf9b5526bad - original: - hackage: lens-aeson-1.1.3 -- completed: - hackage: optparse-applicative-0.16.1.0@sha256:418c22ed6a19124d457d96bc66bd22c93ac22fad0c7100fe4972bbb4ac989731,4982 - pantry-tree: - size: 2979 - sha256: dd092d843091c08691485d68a1908517079b1bc6f3d73928f37635a19dc27fc1 - original: - hackage: optparse-applicative-0.16.1.0 -- completed: - hackage: postgresql-binary-0.12.5@sha256:de9da3cba9be541d6c75ae8da2858c33d83dc1b2e0c639b0b9781816b78a91f4,5594 - pantry-tree: - size: 1619 - sha256: b392337f91031a5b3407393e2f04dfe4e7a28019e88eae6a9370538b90e28c51 - original: - hackage: postgresql-binary-0.12.5 -- completed: - hackage: protolude-0.3.2@sha256:2a38b3dad40d238ab644e234b692c8911423f9d3ed0e36b62287c4a698d92cd1,2240 - pantry-tree: - size: 1594 - sha256: a36d2912ac552d950ba4476de7d950b56b82dd28e48b9f4d0efee938f10bc525 - original: - hackage: protolude-0.3.2 -- completed: - hackage: ptr-0.16.8.2@sha256:708ebb95117f2872d2c5a554eb6804cf1126e86abe793b2673f913f14e5eb1ac,3959 - pantry-tree: - size: 1303 - sha256: 557c438345de19f82bf01d676100da2a191ef06f624e7a4b90b09ac17cbb52a5 - original: - hackage: ptr-0.16.8.2 -- completed: - hackage: text-builder-0.6.7@sha256:efbb3e06107e9c8d1cfe85c963938ca9f375a74379af03da3173be4ef5c37bcf,2364 - pantry-tree: - size: 425 - sha256: cd0ae197e6f9f3860a8ab71f5b87c4a8452ed1fce2fdfd35e36d68ded6e6648e - original: - hackage: text-builder-0.6.7 -- completed: - hackage: text-builder-dev-0.3.3@sha256:79ec422defcc2e5b34f94129c72b98d34b2efc1ed8bbd945ccb8f4f535a892c3,2784 - pantry-tree: - size: 724 - sha256: 8883631a132438e7892fcb13e89d6bbcdc0ac76c56fbea8df8d7aa482ce81f73 - original: - hackage: text-builder-dev-0.3.3 -- completed: - name: postgresql-libpq - version: 0.9.4.3 - git: https://github.com/PostgREST/postgresql-libpq.git - pantry-tree: - size: 1081 - sha256: 0df271e48af32eb8292a45301af45e114110d54099ee73dbc609d39770e8175e - commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 - original: - git: https://github.com/PostgREST/postgresql-libpq.git - commit: 33ff97db570b5b432255f5f24a68db51453f6eb8 -snapshots: -- completed: - size: 618951 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/14.yaml - sha256: 4c31d4ef975b0211078862566aedf3b82b6cea569fc2cde4c72a51e5a8d236ce - original: lts-19.14 \ No newline at end of file From ef8ae506342925d5e6af19e53623020dae4b617a Mon Sep 17 00:00:00 2001 From: Will Murphy Date: Wed, 20 Dec 2023 09:51:22 -0500 Subject: [PATCH 6/6] chore: revert accidental whitespace change Signed-off-by: Will Murphy --- syft/source/stereoscope_image_source.go | 1 + 1 file changed, 1 insertion(+) diff --git a/syft/source/stereoscope_image_source.go b/syft/source/stereoscope_image_source.go index 8f5e961ce56..53bca00250a 100644 --- a/syft/source/stereoscope_image_source.go +++ b/syft/source/stereoscope_image_source.go @@ -64,6 +64,7 @@ func NewFromStereoscopeImage(cfg StereoscopeImageConfig) (*StereoscopeImageSourc if cfg.Platform != nil { opts = append(opts, stereoscope.WithPlatform(cfg.Platform.String())) } + img, err := stereoscope.GetImageFromSource(ctx, cfg.Reference, cfg.From, opts...) if err != nil { return nil, fmt.Errorf("unable to load image: %w", err)