From 3b5aa4468260727974ea62d4e9e810a17649f5b7 Mon Sep 17 00:00:00 2001
From: Florian Weikert <fwe@google.com>
Date: Fri, 23 Oct 2020 12:32:13 +0200
Subject: [PATCH] Discard releases when reading candidates (#190)

This commit fixes two related problems: when version equaled "last_rc", Bazelisk-Go would not discard release versions, and it would return the "release" suffix as part of the version label.

Fixes #189
---
 bazelisk_version_test.go | 18 ++++++++++++++++++
 repositories/gcs.go      | 12 ++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/bazelisk_version_test.go b/bazelisk_version_test.go
index 2698780b..620aabe1 100644
--- a/bazelisk_version_test.go
+++ b/bazelisk_version_test.go
@@ -59,6 +59,24 @@ func TestResolveLatestRcVersion(t *testing.T) {
 	}
 }
 
+func TestResolveLatestRcVersion_WithFullRelease(t *testing.T) {
+	s := setUp(t)
+	s.AddVersion("4.0.0", true, 1, 2, 3)
+	s.Finish()
+
+	gcs := &repositories.GCSRepo{}
+	repos := core.CreateRepositories(nil, gcs, nil, nil, false)
+	version, _, err := repos.ResolveVersion(tmpDir, versions.BazelUpstream, "last_rc")
+
+	if err != nil {
+		t.Fatalf("Version resolution failed unexpectedly: %v", err)
+	}
+	expectedRC := "4.0.0rc3"
+	if version != expectedRC {
+		t.Fatalf("Expected version %s, but got %s", expectedRC, version)
+	}
+}
+
 func TestResolveLatestVersion_TwoLatestVersionsDoNotHaveAReleaseYet(t *testing.T) {
 	s := setUp(t)
 	s.AddVersion("4.0.0", true)
diff --git a/repositories/gcs.go b/repositories/gcs.go
index 75359f4a..57dc28f2 100644
--- a/repositories/gcs.go
+++ b/repositories/gcs.go
@@ -82,7 +82,8 @@ func listDirectoriesInReleaseBucket(prefix string) ([]string, bool, error) {
 func getVersionsFromGCSPrefixes(versions []string) []string {
 	result := make([]string, len(versions))
 	for i, v := range versions {
-		result[i] = strings.ReplaceAll(v, "/", "")
+		noSlashes := strings.ReplaceAll(v, "/", "")
+		result[i] =  strings.TrimSuffix(noSlashes, "release")
 	}
 	return result
 }
@@ -163,7 +164,14 @@ func (gcs *GCSRepo) GetCandidateVersions(bazeliskHome string) ([]string, error)
 		return []string{}, fmt.Errorf("could not list release candidates for latest release: %v", err)
 	}
 
-	return getVersionsFromGCSPrefixes(rcPrefixes), nil
+	rcs := make([]string, 0)
+	for _, v := range getVersionsFromGCSPrefixes(rcPrefixes) {
+		// Remove full releases
+		if strings.Contains(v, "rc") {
+			rcs = append(rcs, v)
+		}
+	}
+	return rcs, nil
 }
 
 // DownloadCandidate downloads the given release candidate into the specified location and returns the absolute path.