fix: Version fetching code and test (#2097)

hermanschaaf · web-flow · commit f174f30822d3 · 2022-09-28T11:12:05.000Z
This re-instates the test for `GetLatestCLIRelease` and ensures it also works on pre-release versions.
diff --git a/cli/internal/plugins/versions.go b/cli/internal/plugins/versions.go
@@ -44,7 +44,8 @@ func GetLatestCLIRelease(ctx context.Context) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("unmarshaling manifest response: %w", err)
 	}
-	return extractVersionFromTag(mr.Latest), nil
+	tag := strings.TrimPrefix(mr.Latest, "cli-")
+	return tag, nil
 }
 
 func getLatestCQPluginRelease(ctx context.Context, name string, typ PluginType) (string, error) {
@@ -58,14 +59,8 @@ func getLatestCQPluginRelease(ctx context.Context, name string, typ PluginType)
 	if err != nil {
 		return "", fmt.Errorf("unmarshaling manifest response: %w", err)
 	}
-	return extractVersionFromTag(mr.Latest), nil
-}
-
-// extractVersionFromTag takes a tag of the form "plugins-source-test-v0.1.21" and returns
-// the version, i.e. "v0.1.21"
-func extractVersionFromTag(tag string) string {
-	parts := strings.Split(tag, "-")
-	return parts[len(parts)-1]
+	version := strings.TrimPrefix(mr.Latest, fmt.Sprintf("plugins-%s-%s-", string(typ), name))
+	return version, nil
 }
 
 func getLatestCommunityPluginRelease(ctx context.Context, org, name string, typ PluginType) (string, error) {
diff --git a/cli/internal/plugins/versions_test.go b/cli/internal/plugins/versions_test.go
@@ -28,13 +28,13 @@ func TestGetLatestCommunityPluginRelease(t *testing.T) {
 	}
 }
 
-// func TestGetLatestCLIRelease(t *testing.T) {
-// 	version, err := GetLatestCLIRelease(context.Background())
-// 	if err != nil {
-// 		t.Fatalf("error calling GetLatestCLIRelease: %v", err)
-// 	}
+func TestGetLatestCLIRelease(t *testing.T) {
+	version, err := GetLatestCLIRelease(context.Background())
+	if err != nil {
+		t.Fatalf("error calling GetLatestCLIRelease: %v", err)
+	}
 
-// 	if !strings.HasPrefix(version, "v") {
-// 		t.Errorf("got version = %q, want a version starting with 'v'", version)
-// 	}
-// }
+	if !strings.HasPrefix(version, "v") {
+		t.Errorf("got version = %q, want a version starting with 'v'", version)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ func GetLatestCLIRelease(ctx context.Context) (string, error) {`
`44`	`44`	`if err != nil {`
`45`	`45`	`return "", fmt.Errorf("unmarshaling manifest response: %w", err)`
`46`	`46`	`}`
`47`		`- return extractVersionFromTag(mr.Latest), nil`
	`47`	`+ tag := strings.TrimPrefix(mr.Latest, "cli-")`
	`48`	`+ return tag, nil`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`func getLatestCQPluginRelease(ctx context.Context, name string, typ PluginType) (string, error) {`
`@@ -58,14 +59,8 @@ func getLatestCQPluginRelease(ctx context.Context, name string, typ PluginType)`
`58`	`59`	`if err != nil {`
`59`	`60`	`return "", fmt.Errorf("unmarshaling manifest response: %w", err)`
`60`	`61`	`}`
`61`		`- return extractVersionFromTag(mr.Latest), nil`
`62`		`-}`
`63`		`-`
`64`		`-// extractVersionFromTag takes a tag of the form "plugins-source-test-v0.1.21" and returns`
`65`		`-// the version, i.e. "v0.1.21"`
`66`		`-func extractVersionFromTag(tag string) string {`
`67`		`- parts := strings.Split(tag, "-")`
`68`		`- return parts[len(parts)-1]`
	`62`	`+ version := strings.TrimPrefix(mr.Latest, fmt.Sprintf("plugins-%s-%s-", string(typ), name))`
	`63`	`+ return version, nil`
`69`	`64`	`}`
`70`	`65`
`71`	`66`	`func getLatestCommunityPluginRelease(ctx context.Context, org, name string, typ PluginType) (string, error) {`