From 32cdebc94bc31bbe4ba2fe90fd9d9d2b907e36e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:55:33 +0000 Subject: [PATCH] feat(import): allow to use tuples and tuple_file together 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](https://github.com/actions/setup-go/compare/cdcb36043654635271a94b9a6d1392de5bb323a7...0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32) Updates `anchore/sbom-action` from 0.16.0 to 0.16.1 - [Release notes](https://github.com/anchore/sbom-action/releases) - [Commits](https://github.com/anchore/sbom-action/compare/e8d2a6937ecead383dfe75190d104edd1f9c5751...95b086ac308035dc0850b3853be5b7ab108236a8) --- 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] 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](https://github.com/anchore/sbom-action/compare/95b086ac308035dc0850b3853be5b7ab108236a8...d94f46e13c6c62f59525ac9a1e147a99dc0b9bf5) Updates `docker/login-action` from 3.2.0 to 3.3.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/0d4c9c5ea7693da7b068278f7b52bda2a190a446...9780b0c442fbb1117ed29e0efdff1e18412f7567) 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](https://github.com/slsa-framework/slsa-verifier/compare/eb7007070baa04976cb9e25a0d8034f8db030a86...3714a2a4684014deb874a0e737dffa0ee02dd647) --- 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] 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 --- internal/storetest/storedata.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/storetest/storedata.go b/internal/storetest/storedata.go index 737ca18c..e5b4ffd6 100644 --- a/internal/storetest/storedata.go +++ b/internal/storetest/storedata.go @@ -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...) } }