separate ref and runtime version (#642)

Author: danielm-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.1.7
+VERSION=v0.1.8
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime_install.go

@@ -2132,26 +2132,20 @@ func (opts *RuntimeInstallOptions) IsCustomInstall() bool {
 	return opts.runtimeDef != store.RuntimeDefURL && opts.runtimeDef != store.OldRuntimeDefURL
 }
 
-func getRuntimeDef(runtimeDef, versionStr string) string {
+func getRuntimeDef(runtimeDef, version string) string {
 	if !strings.HasPrefix(runtimeDef, "http") {
 		// runtimeDef is some local file
 		return runtimeDef
 	}
 
-	if versionStr == "" {
+	if version == "" {
 		// no specific version string
 		return runtimeDef
 	}
 
-	version, err := semver.NewVersion(versionStr)
-	if err != nil {
-		// should not arrive here, since we check for validateVersionIfExists earlier
-		return runtimeDef
-	}
-
 	// specific version means the runtimeDef is the default value in cli-v2/csdp-official repo
 	if strings.Contains(runtimeDef, "cli-v2") {
-		return strings.Replace(runtimeDef, "/releases/latest/download", "/releases/download/v"+version.String(), 1)
+		return strings.Replace(runtimeDef, "/releases/latest/download", "/releases/download/v"+version, 1)
 	}
-	return strings.Replace(runtimeDef, "stable", version.String(), 1)
+	return strings.Replace(runtimeDef, "stable", version, 1)
 }

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.7/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.8/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.7/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.8/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

pkg/runtime/runtime.go

@@ -65,6 +65,7 @@ type (
 		DefVersion          *semver.Version      `json:"defVersion"`
 		RequiredCLIVersion  string               `json:"requiredCLIVersion"`
 		Version             *semver.Version      `json:"version"`
+		Ref                 string               `json:"ref"`
 		BootstrapSpecifier  string               `json:"bootstrapSpecifier"`
 		Components          []AppDef             `json:"components"`
 		Cluster             string               `json:"cluster"`
@@ -300,11 +301,19 @@ func (a *RuntimeSpec) component(name string) *AppDef {
 
 func (r *RuntimeSpec) FullSpecifier() string {
 	url := r.BootstrapSpecifier
-	return buildFullURL(url, r.Version.String())
+	ref := r.Version.String()
+	if r.Ref != "" {
+		ref = r.Ref
+	}
+	return buildFullURL(url, ref)
 }
 
 func (r *RuntimeSpec) fullURL(url string) string {
-	return buildFullURL(url, r.Version.String())
+	ref := r.Version.String()
+	if r.Ref != "" {
+		ref = r.Ref
+	}
+	return buildFullURL(url, ref)
 }
 
 // A component with no "Feature" value (or "") will always be installed