Cr 13685 fix ingress host check (#524)

fixing invereted --skip-cluster-checks flag and bad ingress host validation

Author: roi-codefresh

Makefile

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

cmd/commands/common.go

@@ -59,6 +59,8 @@ var (
 	COLOR_RESET     = "\033[0m"
 	UNDERLINE_RESET = "\033[24m"
 	BOLD_RESET      = "\033[22m"
+
+	errUserCanceledInsecureInstall = fmt.Errorf("cancelled installation due to invalid ingress host certificate")
 )
 
 func postInitCommands(commands []*cobra.Command) {
@@ -473,12 +475,12 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 	log.G(ctx).Info("Retrieving ingress controller info from your cluster...\n")
 
 	cs := opts.KubeFactory.KubernetesClientSetOrDie()
-	ServicesList, err := cs.CoreV1().Services("").List(ctx, metav1.ListOptions{})
+	servicesList, err := cs.CoreV1().Services("").List(ctx, metav1.ListOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to get ingress controller info from your cluster: %w", err)
 	}
 
-	for _, s := range ServicesList.Items {
+	for _, s := range servicesList.Items {
 		if s.ObjectMeta.Name == opts.IngressController.Name() && s.Spec.Type == "LoadBalancer" {
 			if len(s.Status.LoadBalancer.Ingress) > 0 {
 				ingress := s.Status.LoadBalancer.Ingress[0]
@@ -498,25 +500,15 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}
 
 	if store.Get().Silent {
+		if foundIngressHost == "" {
+			return fmt.Errorf("please provide an ingress host via --ingress-host or installation wizard")
+		}
 		opts.IngressHost = foundIngressHost
 	} else {
 		opts.IngressHost, err = getIngressHostFromUserInput(foundIngressHost)
-		if err != nil {
-			return err
-		}
-		response, err := http.Get(opts.IngressHost)
-		if err != nil {
-			opts.IngressHost = ""
-			return err
-		}
-		response.Body.Close()
-	}
-
-	if opts.IngressHost == "" {
-		return fmt.Errorf("please provide an ingress host via --ingress-host or installation wizard")
 	}
 
-	return nil
+	return err
 }
 
 func getIngressHostFromUserInput(foundIngressHost string) (string, error) {
@@ -616,7 +608,7 @@ func askUserIfToProceedWithInsecure(ctx context.Context) error {
 	if result == "Yes" {
 		store.Get().InsecureIngressHost = true
 	} else {
-		return fmt.Errorf("cancelled installation due to invalid ingress host certificate")
+		return errUserCanceledInsecureInstall
 	}
 
 	return nil
@@ -635,7 +627,9 @@ func handleValidationFailsWithRepeat(callback Callback) {
 }
 
 func isValidationError(err error) bool {
-	return err != nil && err != promptui.ErrInterrupt
+	return err != nil &&
+		err != promptui.ErrInterrupt &&
+		err != errUserCanceledInsecureInstall
 }
 
 func getIscRepo(ctx context.Context) (string, error) {

cmd/commands/runtime_install.go

@@ -358,7 +358,7 @@ func getIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 		handleValidationFailsWithRepeat(func() error {
 			err = ensureIngressHost(ctx, opts)
 			if isValidationError(err) {
-				fmt.Println("Could not resolve the URL for ingress host; enter a valid URL")
+				fmt.Fprintf(os.Stderr, "Ingress host validation failed: %s; enter a valid URL\n", err.Error())
 				return err
 			}
 			return nil
@@ -404,7 +404,7 @@ func ensureIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	log.G(ctx).Infof("Using ingress host: %s", opts.IngressHost)
 
-	if !opts.SkipClusterChecks {
+	if opts.SkipClusterChecks {
 		return nil
 	}
 

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.0.468/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.469/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.0.468/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.469/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.1
-  version: 0.0.468
+  version: 0.0.469
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events