mirror of
https://github.com/anchore/syft.git
synced 2026-10-30 14:02:26 +01:00
Replace core SBOM-creation API with builder pattern (#1383)
* remove existing cataloging API Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add file cataloging config Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add package cataloging config Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add configs for cross-cutting concerns Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * rename CLI option configs to not require import aliases later Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update all nested structs for the Catalog struct Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update Catalog cli options - add new cataloger selection options (selection and default) - remove the excludeBinaryOverlapByOwnership - deprecate "catalogers" flag - add new javascript configuration Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * migrate relationship capabilities to separate internal package Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * refactor golang cataloger to use configuration options when creating packages Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * create internal object to facilitate reading from and writing to an SBOM Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * create a command-like object (task) to facilitate partial SBOM creation Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add cataloger selection capability - be able to parse string expressions into a set of resolved actions against sets - be able to use expressions to select/add/remove tasks to/from the final set of tasks to run Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add package, file, and environment related tasks Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update existing file catalogers to use nested UI elements Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add CreateSBOMConfig that drives the SBOM creation process Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * capture SBOM creation info as a struct Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add CreateSBOM() function Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix tests Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * update docs with SBOM selection help + breaking changes Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix multiple override default inputs Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix deprecation flag printing to stdout Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * refactor cataloger selection description to separate object Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * address review comments Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * keep expression errors and show specific suggestions only Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * address additional review feedback Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * address more review comments Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * addressed additional PR review feedback Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * fix file selection references Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * remove guess language data generation option Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add tests for coordinatesForSelection Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * rename relationship attributes Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add descriptions to relationships config fields Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * improve documentation around configuration options Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * add explicit errors around legacy config entries Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> --------- Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
@@ -0,0 +1,70 @@
|
||||
package task
|
||||
|
||||
type set struct {
|
||||
order []string
|
||||
tasks map[string]Task
|
||||
}
|
||||
|
||||
func newSet(tasks ...Task) *set {
|
||||
s := &set{
|
||||
order: []string{},
|
||||
tasks: make(map[string]Task),
|
||||
}
|
||||
|
||||
s.Add(tasks...)
|
||||
|
||||
return s
|
||||
}
|
||||
|
||||
func (ts *set) Len() int {
|
||||
return len(ts.tasks)
|
||||
}
|
||||
|
||||
func (ts *set) Add(tasks ...Task) {
|
||||
for _, t := range tasks {
|
||||
taskName := t.Name()
|
||||
if _, exists := ts.tasks[taskName]; exists {
|
||||
continue
|
||||
}
|
||||
ts.tasks[taskName] = t
|
||||
ts.order = append(ts.order, taskName)
|
||||
}
|
||||
}
|
||||
|
||||
func (ts *set) Remove(tasks ...Task) {
|
||||
for _, t := range tasks {
|
||||
taskName := t.Name()
|
||||
if _, exists := ts.tasks[taskName]; !exists {
|
||||
continue
|
||||
}
|
||||
|
||||
delete(ts.tasks, taskName)
|
||||
for i, t := range ts.order {
|
||||
if t == taskName {
|
||||
ts.order = append(ts.order[:i], ts.order[i+1:]...)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (ts *set) Intersect(tasks ...Task) {
|
||||
other := newSet(tasks...)
|
||||
result := newSet()
|
||||
for _, taskName := range ts.order {
|
||||
// we make a new set to prevent the original set from being modified while we are iterating over "order"
|
||||
if _, exists := other.tasks[taskName]; exists {
|
||||
// note: keep the original task and ordering
|
||||
result.Add(ts.tasks[taskName])
|
||||
}
|
||||
}
|
||||
*ts = *result
|
||||
}
|
||||
|
||||
func (ts set) Tasks() tasks {
|
||||
var result []Task
|
||||
for _, name := range ts.order {
|
||||
result = append(result, ts.tasks[name])
|
||||
}
|
||||
return result
|
||||
}
|
||||
Reference in New Issue
Block a user