oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

SPDX file has duplicate sha256 tag in versionInfo (#2300)

Browse Source 
* SPDX file has duplicate sha256 tag in versionInfo

Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>

* add tests

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: Colm O hEigeartaigh <coheigea@apache.org>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Co-authored-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Colm O hEigeartaigh 2023-11-08 22:49:31 +00:00 committed by GitHub
parent bae5a2e741
commit dc14dbb326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
syft/source/file_source.go
View File

@ -108,10 +108,6 @@ func deriveIDFromFile(cfg FileConfig) (artifact.ID, string) {
info += fmt.Sprintf(":%s@%s", cfg.Alias.Name, cfg.Alias.Version) info += fmt.Sprintf(":%s@%s", cfg.Alias.Name, cfg.Alias.Version)
} }
if d != "" {
d = fmt.Sprintf("sha256:%s", d)
}
return artifactIDFromDigest(digest.SHA256.FromString(info).String()), d return artifactIDFromDigest(digest.SHA256.FromString(info).String()), d
} }

25
syft/source/file_source_test.go
View File

@ -211,10 +211,11 @@ func createArchive(t testing.TB, sourceDirPath, destinationArchivePath string, l
func Test_FileSource_ID(t *testing.T) { func Test_FileSource_ID(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
cfg FileConfig cfg FileConfig
want artifact.ID want artifact.ID
wantErr require.ErrorAssertionFunc wantDigest string
wantErr require.ErrorAssertionFunc
}{ }{
{ {
name: "empty", name: "empty",
@ -236,9 +237,10 @@ func Test_FileSource_ID(t *testing.T) {
wantErr: require.Error, wantErr: require.Error,
}, },
{ {
name: "with path", name: "with path",
cfg: FileConfig{Path: "./test-fixtures/image-simple/Dockerfile"}, cfg: FileConfig{Path: "./test-fixtures/image-simple/Dockerfile"},
want: artifact.ID("db7146472cf6d49b3ac01b42812fb60020b0b4898b97491b21bb690c808d5159"), want: artifact.ID("db7146472cf6d49b3ac01b42812fb60020b0b4898b97491b21bb690c808d5159"),
wantDigest: "sha256:38601c0bb4269a10ce1d00590ea7689c1117dd9274c758653934ab4f2016f80f",
}, },
{ {
name: "with path and alias", name: "with path and alias",
@ -249,7 +251,8 @@ func Test_FileSource_ID(t *testing.T) {
Version: "version-me-this!", Version: "version-me-this!",
}, },
}, },
want: artifact.ID("3c713003305ac6605255cec8bf4ea649aa44b2b9a9f3a07bd683869d1363438a"), want: artifact.ID("3c713003305ac6605255cec8bf4ea649aa44b2b9a9f3a07bd683869d1363438a"),
wantDigest: "sha256:38601c0bb4269a10ce1d00590ea7689c1117dd9274c758653934ab4f2016f80f",
}, },
{ {
name: "other fields do not affect ID", name: "other fields do not affect ID",
@ -259,7 +262,8 @@ func Test_FileSource_ID(t *testing.T) {
Paths: []string{"a", "b"}, Paths: []string{"a", "b"},
}, },
}, },
want: artifact.ID("db7146472cf6d49b3ac01b42812fb60020b0b4898b97491b21bb690c808d5159"), want: artifact.ID("db7146472cf6d49b3ac01b42812fb60020b0b4898b97491b21bb690c808d5159"),
wantDigest: "sha256:38601c0bb4269a10ce1d00590ea7689c1117dd9274c758653934ab4f2016f80f",
}, },
} }
for _, tt := range tests { for _, tt := range tests {
@ -272,7 +276,8 @@ func Test_FileSource_ID(t *testing.T) {
if err != nil { if err != nil {
return return
} }
assert.Equalf(t, tt.want, s.ID(), "ID()") assert.Equalf(t, tt.want, s.ID(), "ID() mismatch")
assert.Equalf(t, tt.wantDigest, s.digestForVersion, "digestForVersion mismatch")
}) })
} }
} }