sample install always true bug (#151)

* fixed bug
removed deprecated lines
added clarification to ingress host prompt string

* bump version

Author: rotem-codefresh

Makefile

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

cmd/commands/common.go

@@ -110,27 +110,25 @@ func ensureRepo(cmd *cobra.Command, runtimeName string, cloneOpts *git.CloneOpti
 				return fmt.Errorf("failed getting runtime repo information: %w", err)
 			}
 			if runtimeData.Repo != nil {
-				cloneOpts.Repo = *runtimeData.Repo
 				die(cmd.Flags().Set("repo", *runtimeData.Repo))
 				return nil
 			}
 		}
 		if !store.Get().Silent {
-			return getRepoFromUserInput(cmd, cloneOpts)
+			return getRepoFromUserInput(cmd)
 		}
 	}
 	return nil
 }
 
-func getRepoFromUserInput(cmd *cobra.Command, cloneOpts *git.CloneOptions) error {
+func getRepoFromUserInput(cmd *cobra.Command) error {
 	repoPrompt := promptui.Prompt{
 		Label: "Repository URL",
 	}
 	repoInput, err := repoPrompt.Run()
 	if err != nil {
 		return fmt.Errorf("Prompt error: %w", err)
 	}
-	cloneOpts.Repo = repoInput
 	die(cmd.Flags().Set("repo", repoInput))
 	return nil
 }
@@ -205,20 +203,19 @@ func getRuntimeNameFromUserSelect(ctx context.Context, runtimeName *string) erro
 
 func ensureGitToken(cmd *cobra.Command, cloneOpts *git.CloneOptions) error {
 	if cloneOpts.Auth.Password == "" && !store.Get().Silent {
-		return getGitTokenFromUserInput(cmd, cloneOpts)
+		return getGitTokenFromUserInput(cmd)
 	}
 	return nil
 }
 
-func getGitTokenFromUserInput(cmd *cobra.Command, cloneOpts *git.CloneOptions) error {
+func getGitTokenFromUserInput(cmd *cobra.Command) error {
 	gitTokenPrompt := promptui.Prompt{
 		Label: "Git provider api token",
 	}
 	gitTokenInput, err := gitTokenPrompt.Run()
 	if err != nil {
 		return fmt.Errorf("Prompt error: %w", err)
 	}
-	cloneOpts.Auth.Password = gitTokenInput
 	die(cmd.Flags().Set("git-token", gitTokenInput))
 	return nil
 }
@@ -323,7 +320,7 @@ func getIngressHostFromUserInput(cmd *cobra.Command, ingressHost *string) error
 	}
 
 	ingressHostPrompt := promptui.Prompt{
-		Label: "Ingress host",
+		Label: "Ingress host (leave blank to skip)",
 	}
 
 	ingressHostInput, err := ingressHostPrompt.Run()

cmd/commands/runtime.go

@@ -165,7 +165,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 				log.G(ctx).Fatal("must enter a runtime name")
 			}
 
-			err = runtimeInstallCommandPreRunHandler(cmd, installationOpts)
+			err = runtimeInstallCommandPreRunHandler(cmd, &installationOpts)
 			if err != nil {
 				return fmt.Errorf("Pre installation error: %w", err)
 			}
@@ -236,7 +236,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	return cmd
 }
 
-func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, installationOpts RuntimeInstallOptions) error {
+func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, installationOpts *RuntimeInstallOptions) error {
 	err := ensureRepo(cmd, installationOpts.RuntimeName, installationOpts.InsCloneOpts, false)
 	if err != nil {
 		return err

docs/releases/release_notes.md

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

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.141
+  version: 0.0.142
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events