From e41da788155bc1dbb090423488720e32390de3d6 Mon Sep 17 00:00:00 2001
From: Mike Danese <mikedanese@google.com>
Date: Tue, 24 Mar 2020 11:50:25 -0700
Subject: [PATCH] look for version in bazel-bin

bazel-bin and bazel-genfiles have pointed to the same location since
0.25. -genfiles is deprecated.

This was test running:

../release/push-build.sh --release-type=devel \
  --bucket=kubernetes-release-mikedanese --private-bucket --nomock \
  --version-suffix=mikedanese

With bazel version 2.2.0 and 0.23.2.

Issue: bazelbuild/bazel#8651
---
 pkg/release/release.go      |  9 ++++++-
 pkg/release/release_test.go | 51 ++++++++++++++++++++++---------------
 push-build.sh               |  9 ++++++-
 3 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/pkg/release/release.go b/pkg/release/release.go
index a6eb47e4b28..c400011f7e3 100644
--- a/pkg/release/release.go
+++ b/pkg/release/release.go
@@ -19,6 +19,7 @@ package release
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -47,7 +48,7 @@ const (
 	versionDirtyRE    = `(-dirty)`
 	dockerBuildPath   = "_output/release-tars"
 	bazelBuildPath    = "bazel-bin/build/release-tars"
-	bazelVersionPath  = "bazel-genfiles/version"
+	bazelVersionPath  = "bazel-bin/version"
 	dockerVersionPath = "kubernetes/version"
 	kubernetesTar     = "kubernetes.tar.gz"
 
@@ -131,6 +132,12 @@ func BuiltWithBazel(workDir string) (bool, error) {
 // ReadBazelVersion reads the version from a Bazel build.
 func ReadBazelVersion(workDir string) (string, error) {
 	version, err := ioutil.ReadFile(filepath.Join(workDir, bazelVersionPath))
+	if os.IsNotExist(err) {
+		// The check for version in bazel-genfiles can be removed once everyone is
+		// off of versions before 0.25.0.
+		// https://github.com/bazelbuild/bazel/issues/8651
+		version, err = ioutil.ReadFile(filepath.Join(workDir, "bazel-genfiles/version"))
+	}
 	return string(version), err
 }
 
diff --git a/pkg/release/release_test.go b/pkg/release/release_test.go
index 295a797f649..d59eddd1b8f 100644
--- a/pkg/release/release_test.go
+++ b/pkg/release/release_test.go
@@ -204,40 +204,33 @@ func TestBuiltWithBazel(t *testing.T) {
 }
 
 func TestReadBazelVersion(t *testing.T) {
-	baseTmpDir, err := ioutil.TempDir("", "")
-	require.Nil(t, err)
-
-	version := "1.1.1"
-
-	// Build directories.
-	require.Nil(t, os.MkdirAll(filepath.Join(baseTmpDir, "bazel-genfiles"), os.ModePerm))
-
-	bazelVersionFile := filepath.Join(baseTmpDir, bazelVersionPath)
-	require.Nil(t, ioutil.WriteFile(
-		bazelVersionFile,
-		[]byte(version),
-		os.FileMode(0644),
-	))
-
-	defer cleanupTmps(t, baseTmpDir)
+	const version = "1.1.1"
 
 	type want struct {
 		r    string
 		rErr bool
 	}
+
 	cases := map[string]struct {
-		path string
-		want want
+		outdir string
+		want   want
 	}{
+		"ReadLegacyVersion": {
+			outdir: "bazel-genfiles",
+			want: want{
+				r:    version,
+				rErr: false,
+			},
+		},
 		"ReadVersion": {
-			path: baseTmpDir,
+			outdir: "bazel-bin",
 			want: want{
 				r:    version,
 				rErr: false,
 			},
 		},
 		"ReadVersionError": {
-			path: "notadir",
+			outdir: "bazel-random",
 			want: want{
 				rErr: true,
 			},
@@ -246,7 +239,23 @@ func TestReadBazelVersion(t *testing.T) {
 
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
-			res, err := ReadBazelVersion(tc.path)
+			baseTmpDir, err := ioutil.TempDir("", "")
+			if err != nil {
+				t.Fatalf("unable to create temp dir: %v", err)
+			}
+			defer cleanupTmps(t, baseTmpDir)
+
+			// Build directories.
+			require.Nil(t, os.MkdirAll(filepath.Join(baseTmpDir, tc.outdir), os.ModePerm))
+
+			bazelVersionFile := filepath.Join(baseTmpDir, tc.outdir, "version")
+			require.Nil(t, ioutil.WriteFile(
+				bazelVersionFile,
+				[]byte(version),
+				os.FileMode(0644),
+			))
+
+			res, err := ReadBazelVersion(baseTmpDir)
 			require.Equal(t, tc.want.rErr, err != nil)
 			require.Equal(t, tc.want.r, res)
 		})
diff --git a/push-build.sh b/push-build.sh
index 63ec0d549c5..c057a1311a2 100755
--- a/push-build.sh
+++ b/push-build.sh
@@ -127,7 +127,14 @@ KUBE_ROOT=$(pwd -P)
 USE_BAZEL=false
 if release::was_built_with_bazel $KUBE_ROOT $FLAGS_release_kind; then
   USE_BAZEL=true
-  LATEST=$(cat $KUBE_ROOT/bazel-genfiles/version)
+  # The check for version in bazel-genfiles can be removed once everyone is off
+  # of versions before 0.25.0.
+  # https://github.com/bazelbuild/bazel/issues/8651
+  if [[ -r  "$KUBE_ROOT/bazel-genfiles/version" ]]; then
+    LATEST=$(cat $KUBE_ROOT/bazel-genfiles/version)
+  else
+    LATEST=$(cat $KUBE_ROOT/bazel-bin/version)
+  fi
 else
   LATEST=$(tar -O -xzf $KUBE_ROOT/_output/release-tars/$FLAGS_release_kind.tar.gz $FLAGS_release_kind/version)
 fi