Improve BuildVersion verification and local checks in krel build

cmd/krel/cmd/release.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
@@ -132,7 +133,13 @@ func init() {
 func runRelease(options *anago.ReleaseOptions) error {
 	options.NoMock = rootOpts.nomock
 	rel := anago.NewRelease(options)
+
 	if submitJob {
+		// Perform a local check of the specified options
+		// before launching a Cloud Build job:
+		if err := options.Validate(&anago.State{}); err != nil {
+			return errors.Wrap(err, "prechecking release options")
+		}
 		return rel.Submit(stream)
 	}
 	return rel.Run()

pkg/anago/anago.go

@@ -99,6 +99,15 @@ func (o *Options) Validate(state *State) error {
 		return errors.Errorf("invalid release branch: %s", o.ReleaseBranch)
 	}
 
+	// Verify the build version is correct:
+	correct, err := release.IsValidReleaseBuild(o.BuildVersion)
+	if err != nil {
+		return errors.Wrap(err, "checking for a valid build version")
+	}
+	if !correct {
+		return errors.New("invalid BuildVersion specified")
+	}
+
 	semverBuildVersion, err := util.TagStringToSemver(o.BuildVersion)
 	if err != nil {
 		return errors.Wrapf(err, "invalid build version: %s", o.BuildVersion)

pkg/release/release.go

@@ -210,6 +210,10 @@ func ReadDockerizedVersion(workDir string) (string, error) {
 
 // IsValidReleaseBuild checks if build version is valid for release.
 func IsValidReleaseBuild(build string) (bool, error) {
+	// If the tag has a plus sign, then we force the versionBuildRe to match
+	if strings.Contains(build, "+") {
+		return regexp.MatchString("("+versionReleaseRE+`(\.`+versionBuildRE+")"+versionDirtyRE+"?)", build)
+	}
 	return regexp.MatchString("("+versionReleaseRE+`(\.`+versionBuildRE+")?"+versionDirtyRE+"?)", build)
 }
 

pkg/release/release_test.go

@@ -331,6 +331,23 @@ func TestIsValidReleaseBuild(t *testing.T) {
 				rErr: false,
 			},
 		},
+		"InvalidCopiedBuild": {
+			// This trimmed tag often gets copied when double clicking
+			// on the CloudBuild console:
+			build: "v1.22.0-alpha.0.787+e6",
+			want: want{
+				r:    false,
+				rErr: false,
+			},
+		},
+		"ValidCopiedBuild": {
+			// Full tag from previous test case:
+			build: "v1.22.0-alpha.0.787+e6b4fa381152d6",
+			want: want{
+				r:    true,
+				rErr: false,
+			},
+		},
 	}
 
 	for name, tc := range cases {