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.

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

fix: builder ID verification for testing #635

Merged
merged 1 commit into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions verifiers/utils/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ func IsValidBuilderTag(ref string, testing bool) error {
semver.Build(pin) != "" {
return fmt.Errorf("%w: %s: version tag not valid", serrors.ErrorInvalidRef, pin)
}
return nil
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NICE CATCH! Took me a second myself to figure out why it was going to the non-testing block.

}

// Valid semver of the form vX.Y.Z with no metadata.
Expand Down
122 changes: 122 additions & 0 deletions verifiers/utils/builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -648,3 +648,125 @@ func Test_MatchesFull(t *testing.T) {
})
}
}

func Test_IsValidBuilderTag(t *testing.T) {
t.Parallel()
tests := []struct {
name string
ref string
testing bool
err error
}{
// not testing
{
name: "valid full semver",
ref: "refs/tags/v1.2.3",
},
{
name: "valid semver: no patch",
ref: "refs/tags/v1.2",
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: no minor",
ref: "refs/tags/v1",
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: no minor",
ref: "refs/tags/v1",
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: pre-release",
ref: "refs/tags/v1.2.3-rc.0",
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: pre-release w/ build",
ref: "refs/tags/v1.2.3-rc.0+build1",
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: build",
ref: "refs/tags/v1.2.3+build1",
err: serrors.ErrorInvalidRef,
},
{
name: "invalid semver",
ref: "refs/tags/1.2.3",
err: serrors.ErrorInvalidRef,
},
{
name: "invalid ref",
ref: "refs/v1.2.3",
err: serrors.ErrorInvalidRef,
},

// testing
{
name: "valid full semver (testing)",
ref: "refs/tags/v1.2.3",
testing: true,
},
{
name: "valid semver: no patch (testing)",
ref: "refs/tags/v1.2",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: no minor (testing)",
ref: "refs/tags/v1",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: no minor (testing)",
ref: "refs/tags/v1",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
// NOTE: pre-releases are ok when testing.
name: "valid semver: pre-release (testing)",
ref: "refs/tags/v1.2.3-rc.0",
testing: true,
},
{
name: "valid semver: pre-release w/ build (testing)",
ref: "refs/tags/v1.2.3-rc.0+build1",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
name: "valid semver: build (testing)",
ref: "refs/tags/v1.2.3+build1",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
name: "invalid semver (testing)",
ref: "refs/tags/1.2.3",
testing: true,
err: serrors.ErrorInvalidRef,
},
{
name: "invalid ref (testing)",
ref: "refs/v1.2.3",
testing: true,
err: serrors.ErrorInvalidRef,
},
}
for _, tt := range tests {
tt := tt // Re-initializing variable so it is not changed while executing the closure below

t.Run(tt.name, func(t *testing.T) {
t.Parallel()
err := IsValidBuilderTag(tt.ref, tt.testing)
if !cmp.Equal(err, tt.err, cmpopts.EquateErrors()) {
t.Errorf(cmp.Diff(err, tt.err))
}
})
}
}