pkg/build: Consolidate build type / directory setting logic

Signed-off-by: Stephen Augustus <[email protected]>

Author: justaugustus

pkg/build/build.go

@@ -16,14 +16,23 @@ limitations under the License.
 
 package build
 
+import (
+	"path/filepath"
+
+	"github.com/sirupsen/logrus"
+)
+
 // Instance is the main structure for creating and pushing builds.
 type Instance struct {
 	opts *Options
 }
 
 // NewInstance can be used to create a new build `Instance`.
 func NewInstance(opts *Options) *Instance {
-	return &Instance{opts}
+	instance := &Instance{opts}
+	instance.setBuildType()
+
+	return instance
 }
 
 // Options are the main options to pass to `Instance`.
@@ -35,6 +44,10 @@ type Options struct {
 	// if not set.
 	BuildDir string
 
+	// Used to make determinations on where to push artifacts
+	// May be one of: 'devel', 'ci', 'release'
+	BuildType string
+
 	// If set, push docker images to specified registry/project.
 	DockerRegistry string
 
@@ -76,3 +89,31 @@ type Options struct {
 	// `$PATH`.
 	ValidateRemoteImageDigests bool
 }
+
+// TODO: Support "release" buildType
+func (bi *Instance) getGCSBuildPath(version string) string {
+	gcsDest := bi.opts.BuildType
+
+	if bi.opts.GCSSuffix != "" {
+		gcsDest += "-" + bi.opts.GCSSuffix
+	}
+
+	if bi.opts.Fast {
+		gcsDest = filepath.Join(gcsDest, "fast")
+	}
+	gcsDest = filepath.Join(gcsDest, version)
+	logrus.Infof("GCS destination is %s", gcsDest)
+
+	return gcsDest
+}
+
+func (bi *Instance) setBuildType() {
+	buildType := "devel"
+	if bi.opts.CI {
+		buildType = "ci"
+	}
+
+	bi.opts.BuildType = buildType
+
+	logrus.Infof("Build type is %s", bi.opts.BuildType)
+}

pkg/build/ci.go

@@ -34,6 +34,7 @@ import (
 func NewCIInstance(opts *Options) *Instance {
 	instance := NewInstance(opts)
 	instance.opts.CI = true
+	instance.setBuildType()
 
 	return instance
 }
@@ -127,20 +128,9 @@ func (bi *Instance) checkBuildExists() (bool, error) {
 		bucket = "kubernetes-release-dev"
 	}
 
-	mode := "ci"
-	if bi.opts.CI {
-		mode = "ci"
-	}
-
-	if bi.opts.Fast {
-		mode += "/fast"
-	}
-
-	if bi.opts.GCSSuffix != "" {
-		mode += bi.opts.GCSSuffix
-	}
+	gcsDest := bi.getGCSBuildPath(version)
 
-	gcsBuildRoot := filepath.Join(bucket, mode, version)
+	gcsBuildRoot := filepath.Join(bucket, gcsDest, version)
 	kubernetesTar := filepath.Join(gcsBuildRoot, release.KubernetesTar)
 	binPath := filepath.Join(gcsBuildRoot, "bin")
 

pkg/build/push.go

@@ -119,17 +119,7 @@ func (bi *Instance) Push() error {
 		return errors.Wrap(err, "push container images")
 	}
 
-	gcsDest := "devel"
-	if bi.opts.CI {
-		gcsDest = "ci"
-	}
-	gcsDest += bi.opts.GCSSuffix
-
-	if bi.opts.Fast {
-		gcsDest = filepath.Join(gcsDest, "fast")
-	}
-	gcsDest = filepath.Join(gcsDest, version)
-	logrus.Infof("GCS destination is %s", gcsDest)
+	gcsDest := bi.getGCSBuildPath(version)
 
 	if err := bi.PushReleaseArtifacts(
 		filepath.Join(bi.opts.BuildDir, release.GCSStagePath, version),
@@ -151,7 +141,7 @@ func (bi *Instance) Push() error {
 	// Publish release to GCS
 	versionMarkers := strings.Split(bi.opts.ExtraVersionMarkers, ",")
 	if err := release.NewPublisher().PublishVersion(
-		gcsDest, version, bi.opts.BuildDir, bi.opts.Bucket, versionMarkers,
+		bi.opts.BuildType, version, bi.opts.BuildDir, bi.opts.Bucket, versionMarkers,
 		bi.opts.PrivateBucket, bi.opts.Fast,
 	); err != nil {
 		return errors.Wrap(err, "publish release")

pkg/release/publish.go

@@ -101,7 +101,7 @@ func (p *Publisher) PublishVersion(
 	releasePath = gcs.GcsPrefix + filepath.Join(releasePath, version)
 
 	if err := p.client.GSUtil("ls", releasePath); err != nil {
-		return errors.Wrapf(err, "release files dont exist at %s", releasePath)
+		return errors.Wrapf(err, "release files don't exist at %s", releasePath)
 	}
 
 	sv, err := util.TagStringToSemver(version)