Skip to content

Commit

Permalink
feat(import): allow to use tuples and tuple_file together
Browse files Browse the repository at this point in the history
Bumps the dependencies group with 2 updates: [actions/setup-go](https://github.com/actions/setup-go) and [anchore/sbom-action](https://github.com/anchore/sbom-action).

Updates `actions/setup-go` from 5.0.1 to 5.0.2
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@cdcb360...0a12ed9)

Updates `anchore/sbom-action` from 0.16.0 to 0.16.1
- [Release notes](https://github.com/anchore/sbom-action/releases)
- [Commits](anchore/sbom-action@e8d2a69...95b086a)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: anchore/sbom-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

fix: handle get store errors on store import

chore(deps): bump the dependencies group with 3 updates

Bumps the dependencies group with 3 updates: [anchore/sbom-action](https://github.com/anchore/sbom-action), [docker/login-action](https://github.com/docker/login-action) and [slsa-framework/slsa-verifier](https://github.com/slsa-framework/slsa-verifier).

Updates `anchore/sbom-action` from 0.16.1 to 0.17.0
- [Release notes](https://github.com/anchore/sbom-action/releases)
- [Commits](anchore/sbom-action@95b086a...d94f46e)

Updates `docker/login-action` from 3.2.0 to 3.3.0
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@0d4c9c5...9780b0c)

Updates `slsa-framework/slsa-verifier` from 2.5.1 to 2.6.0
- [Release notes](https://github.com/slsa-framework/slsa-verifier/releases)
- [Changelog](https://github.com/slsa-framework/slsa-verifier/blob/main/RELEASE.md)
- [Commits](slsa-framework/slsa-verifier@eb70070...3714a2a)

---
updated-dependencies:
- dependency-name: anchore/sbom-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: slsa-framework/slsa-verifier
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

feat(import): allow to use tuples and tuple_file together

feat(import): allow to use tuples and tuple_file together

feat(import): allow to use tuples and tuple_file together

feat(import): allow to use tuples and tuple_file together

feat(import): allow to use tuples and tuple_file together
  • Loading branch information
dependabot[bot] authored and Daniel Bertocci committed Jul 29, 2024
1 parent c8a792e commit 32cdebc
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion internal/storetest/storedata.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,10 @@ func (storeData *StoreData) LoadTuples(basePath string) error {
tuples, err := tuplefile.ReadTupleFile(path.Join(basePath, storeData.TupleFile))
if err != nil {
errs = fmt.Errorf("failed to process global tuple %s file due to %w", storeData.TupleFile, err)
} else {
} else if storeData.Tuples == nil {
storeData.Tuples = tuples
} else {
storeData.Tuples = append(storeData.Tuples, tuples...)
}
}

Expand Down

0 comments on commit 32cdebc

Please sign in to comment.