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

test: add builder id tests for short form #455

Merged
merged 3 commits into from
Jan 26, 2023
Merged

test: add builder id tests for short form #455

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3928716
test: add builder id tests for short form
asraa Jan 25, 2023
a9a0ddd
Merge branch 'main' into fix-builder-id-tests
asraa Jan 25, 2023
dd0ab2d
Merge branch 'main' into fix-builder-id-tests
asraa Jan 26, 2023
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
35 changes: 22 additions & 13 deletions cli/slsa-verifier/main_regression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,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 @@ -605,6 +605,8 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
BuildWorkflowInputs: tt.inputs,
}

// The outBuilderID is the actual builder ID from the provenance.
// This is always long form for the GHA builders.
outBuilderID, err := cmd.Exec(context.Background(), artifacts)
if !errCmp(err, tt.err) {
t.Errorf("%v: %v", v, cmp.Diff(err, tt.err, cmpopts.EquateErrors()))
Expand All @@ -621,15 +623,6 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
}
}

if bid == nil {
continue
}

// Validate against builderID we generated automatically.
if err := outBuilderID.Matches(*bid, false); err != nil {
t.Errorf(fmt.Sprintf("matches failed (2): %v", err))
}

// Smoke test against the CLI command
cliCmd := verifyArtifactCmd()
args := []string{
Expand Down Expand Up @@ -661,6 +654,18 @@ func Test_runVerifyGHAArtifactPath(t *testing.T) {
if !errCmp(cliErr, tt.err) {
t.Errorf("%v: %v", v, cmp.Diff(cliErr, tt.err, cmpopts.EquateErrors()))
}

if bid == nil {
continue
}

// If we have a generated a user-provided bid, then validate it against the
// resulting builderID returned by the provenance check.
// Since this a GHA and the certificate ID is in long form,
// we pass `allowRef = true`.
if err := outBuilderID.Matches(*bid, true); err != nil {
t.Errorf(fmt.Sprintf("matches failed (2): %v", err))
}
}
}
})
Expand Down Expand Up @@ -810,7 +815,7 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
// 3. With only the name of the builder.
// 4. With no builder ID.
builderIDs := []*string{
// pString(builder + "@" + sv),
pString(builder + "@" + sv),
pString(builder + "@refs/tags/" + sv),
pString(builder),
nil,
Expand Down Expand Up @@ -850,8 +855,12 @@ func Test_runVerifyGHAArtifactImage(t *testing.T) {
if bid == nil {
return
}
// Validate against builderID we generated automatically.
if err := outBuilderID.Matches(*bid, false); err != nil {

// If we have a generated a user-provided bid, then validate it against the
// resulting builderID returned by the provenance check.
// Since this a GHA and the certificate ID is in long form,
// we pass `allowRef = true`.
if err := outBuilderID.Matches(*bid, true); err != nil {
t.Errorf(fmt.Sprintf("matches failed: %v", err))
}
}
Expand Down