Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: fix builder id matching #308

Merged
merged 3 commits into from
Oct 18, 2022
Merged

tests: fix builder id matching #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bab593e
fix builder id matching
asraa Oct 17, 2022
56fe509
plain version tag does not work
asraa Oct 17, 2022
7eec397
Merge branch 'main' into fix-tests
asraa Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions cli/slsa-verifier/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
t.Parallel()
goBuilder := "https://github.com/slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml"
genericBuilder := "https://github.com/slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml"

tests := []struct {
name string
artifact string
Expand Down Expand Up @@ -157,7 +158,7 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
},
// Provenance contains tag = v13.0.30.
{
name: "tag v31.0.29 no match v13.0.30",
name: "tag v13.0.29 no match v13.0.30",
artifact: "binary-linux-amd64-push-v13.0.30",
source: "github.com/slsa-framework/example-package",
ptag: pString("v13.0.29"),
Expand Down Expand Up @@ -363,24 +364,24 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
},
// Multiple subjects in version v1.2.0+
{
name: "multiple subject first match",
artifact: "binary-linux-amd64-multi-subject-first",
source: "github.com/slsa-framework/example-package",
minversion: "v1.2.0",
builders: []string{"gha_generic"},
name: "multiple subject first match",
artifact: "binary-linux-amd64-multi-subject-first",
source: "github.com/slsa-framework/example-package",
noversion: true,
builders: []string{"gha_generic"},
},
{
name: "multiple subject second match",
artifact: "binary-linux-amd64-multi-subject-second",
source: "github.com/slsa-framework/example-package",
minversion: "v1.2.0",
builders: []string{"gha_generic"},
name: "multiple subject second match",
artifact: "binary-linux-amd64-multi-subject-second",
source: "github.com/slsa-framework/example-package",
noversion: true,
builders: []string{"gha_generic"},
},
{
name: "multiple subject second match - builderID",
artifact: "binary-linux-amd64-multi-subject-second",
source: "github.com/slsa-framework/example-package",
minversion: "v1.2.0",
noversion: true,
builders: []string{"gha_generic"},
pBuilderID: pString("https://github.com/slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml"),
outBuilderID: "https://github.com/slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml",
Expand Down Expand Up @@ -530,7 +531,7 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
// before GA. Add the tests for tag verification.
if version != "" && semver.Compare(version, "v1.0.0") > 0 {
builderIDs = append(builderIDs, []*string{
pString(builder + "@" + sv),
// pString(builder + "@" + sv),
pString(builder + "@refs/tags/" + sv),
}...)
}
Expand All @@ -557,7 +558,7 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
}

if err != nil {
return
continue
}

// Validate against test's expected builderID, if provided.
Expand All @@ -568,7 +569,7 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
}

if bid == nil {
return
continue
}

// Validate against builderID we generated automatically.
Expand Down
0 ....0/binary-linux-amd64-multi-subject-first → ...ta/binary-linux-amd64-multi-subject-first
View file
Open in desktop
File renamed without changes.
0 ...ux-amd64-multi-subject-first.intoto.jsonl → ...ux-amd64-multi-subject-first.intoto.jsonl
View file
Open in desktop
File renamed without changes.
0 ...0/binary-linux-amd64-multi-subject-second → ...a/binary-linux-amd64-multi-subject-second
View file
Open in desktop
File renamed without changes.
0 ...x-amd64-multi-subject-second.intoto.jsonl → ...x-amd64-multi-subject-second.intoto.jsonl
View file
Open in desktop
File renamed without changes.