diff --git a/go.mod b/go.mod index 6534436c2b6f..4b22057b5cf6 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04 github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b github.com/anchore/packageurl-go v0.0.0-20210922164639-b3fa992ebd29 - github.com/anchore/stereoscope v0.0.0-20220214165125-25ebd49a842b + github.com/anchore/stereoscope v0.0.0-20220217141419-c6f02aed9ed2 github.com/antihax/optional v1.0.0 github.com/bmatcuk/doublestar/v4 v4.0.2 github.com/docker/docker v20.10.12+incompatible diff --git a/go.sum b/go.sum index 8839a06e6fb0..593a0a4b4500 100644 --- a/go.sum +++ b/go.sum @@ -111,8 +111,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-20220214165125-25ebd49a842b h1:PMMXpTEHVVLErrXQ6mH9ocLAQyvQu/LUhdstrhx7AC4= -github.com/anchore/stereoscope v0.0.0-20220214165125-25ebd49a842b/go.mod h1:QpDHHV2h1NNfu7klzU75XC8RvSlaPK6HHgi0dy8A6sk= +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/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= diff --git a/syft/file/metadata_cataloger_test.go b/syft/file/metadata_cataloger_test.go index b4aae78fc7e4..9ca27a6d014f 100644 --- a/syft/file/metadata_cataloger_test.go +++ b/syft/file/metadata_cataloger_test.go @@ -66,7 +66,7 @@ func TestFileMetadataCataloger(t *testing.T) { LinkDestination: "file-1.txt", UserID: 1, GroupID: 2, - MIMEType: "text/plain", + MIMEType: "", }, }, { @@ -78,7 +78,7 @@ func TestFileMetadataCataloger(t *testing.T) { LinkDestination: "file-1.txt", UserID: 0, GroupID: 0, - MIMEType: "text/plain", + MIMEType: "", }, }, { @@ -89,7 +89,7 @@ func TestFileMetadataCataloger(t *testing.T) { Type: "CharacterDevice", UserID: 0, GroupID: 0, - MIMEType: "text/plain", + MIMEType: "", }, }, { @@ -100,7 +100,7 @@ func TestFileMetadataCataloger(t *testing.T) { Type: "BlockDevice", UserID: 0, GroupID: 0, - MIMEType: "text/plain", + MIMEType: "", }, }, { @@ -111,7 +111,7 @@ func TestFileMetadataCataloger(t *testing.T) { Type: "FIFONode", UserID: 0, GroupID: 0, - MIMEType: "text/plain", + MIMEType: "", }, }, { @@ -122,7 +122,7 @@ func TestFileMetadataCataloger(t *testing.T) { Type: "Directory", UserID: 0, GroupID: 0, - MIMEType: "text/plain", + MIMEType: "", }, }, } diff --git a/syft/source/image_squash_resolver_test.go b/syft/source/image_squash_resolver_test.go index 13b2eb321a51..80329252a3d6 100644 --- a/syft/source/image_squash_resolver_test.go +++ b/syft/source/image_squash_resolver_test.go @@ -241,7 +241,7 @@ func Test_imageSquashResolver_FilesByMIMEType(t *testing.T) { { fixtureName: "image-simple", mimeType: "text/plain", - expectedPaths: strset.New("/somefile-1.txt", "/somefile-2.txt", "/really/nested/file-3.txt", "/really/nested", "/really"), + expectedPaths: strset.New("/somefile-1.txt", "/somefile-2.txt", "/really/nested/file-3.txt"), }, }