Skip to content

Commit

Permalink
preserve syft IDs on decode
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
  • Loading branch information
wagoodman committed Apr 18, 2022
1 parent 248023b commit 630b984
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 5 additions & 1 deletion internal/formats/syftjson/to_syft_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,12 @@ func toSyftPackage(p model.Package, idAliases map[string]string) pkg.Package {
Metadata: p.Metadata,
}

out.SetID()
// we don't know if this package ID is truely unique, however, we need to trust the user input in case there are
// external references to it. That is, we can't derive our own ID (using pkg.SetID()) since consumers won't
// be able to historically interact with data that references the IDs from the original SBOM document being decoded now.
out.OverrideID(artifact.ID(p.ID))

// this alias mapping is currently defunct, but could be useful in the future.
id := string(out.ID())
if id != p.ID {
idAliases[p.ID] = id
Expand Down
4 changes: 4 additions & 0 deletions syft/pkg/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ type Package struct {
Metadata interface{} // additional data found while parsing the package source
}

func (p *Package) OverrideID(id artifact.ID) {
p.id = id
}

func (p *Package) SetID() {
id, err := artifact.IDByHash(p)
if err != nil {
Expand Down

0 comments on commit 630b984

Please sign in to comment.