distinguish between host and ip in ingressHost (#259)

* - removed trailing slash from hostName
- distinguish between ip and host

* small fix

* bump

* defVersion bump

* bump defVersion

Author: rotem-codefresh

Makefile

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

cmd/commands/common.go

@@ -462,7 +462,6 @@ func getIngressHostFromUserInput(ctx context.Context, opts *RuntimeInstallOption
 	}
 
 	opts.IngressHost = ingressHostInput
-	opts.HostName = util.ParseHostNameFromIngressHost(ingressHostInput)
 
 	return nil
 }
@@ -511,7 +510,6 @@ func setIngressHost(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	if store.Get().Silent {
 		log.G(ctx).Warnf("Using ingress host %s", foundIngressHost)
-		opts.HostName = foundHostName
 		opts.IngressHost = foundIngressHost
 	} else {
 		err = getIngressHostFromUserInput(ctx, opts, foundIngressHost)

cmd/commands/runtime.go

@@ -20,6 +20,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -394,6 +395,20 @@ func ensureIngressHost(cmd *cobra.Command, opts *RuntimeInstallOptions) error {
 		}
 	}
 
+	parsed, err := url.Parse(opts.IngressHost)
+	if err != nil {
+		return err
+	}
+
+	isIP, err := util.IsIP(parsed.Host)
+	if err != nil {
+		return err
+	}
+
+	if !isIP {
+		opts.HostName = parsed.Host
+	}
+
 	log.G(cmd.Context()).Infof("Using ingress host: %s", opts.IngressHost)
 
 	log.G(cmd.Context()).Info("Validating ingress host")

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.237/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.238/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.237/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.238/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -4,8 +4,8 @@ metadata:
   name: "{{ name }}"
   namespace: "{{ namespace }}"
 spec:
-  defVersion: 1.0.0
-  version: 0.0.237
+  defVersion: 1.0.1
+  version: 0.0.238
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/store/store.go

@@ -30,7 +30,7 @@ var (
 	buildDate       = ""
 	gitCommit       = ""
 	segmentWriteKey = ""
-	maxDefVersion   = "1.0.0"
+	maxDefVersion   = "1.0.1"
 	RuntimeDefURL   = "manifests/runtime.yaml"
 	ArgoAgentURL    = "manifests/argo-agent/agent.yaml"
 )

pkg/util/util.go

@@ -187,11 +187,6 @@ func DecorateErrorWithDocsLink(err error, link ...string) error {
 	return fmt.Errorf("%s\nfor more information: %s", err.Error(), link[0])
 }
 
-func ParseHostNameFromIngressHost(ingressHost string) string {
-	split := strings.Split(ingressHost, "//")
-	return split[1]
-}
-
 func reportCancel(status reporter.CliStepStatus) {
 	reporter.G().ReportStep(reporter.CliStepData{
 		Step:        reporter.SIGNAL_TERMINATION,
@@ -201,6 +196,10 @@ func reportCancel(status reporter.CliStepStatus) {
 	})
 }
 
+func IsIP(s string) (bool, error) {
+	return regexp.MatchString(`^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$`, s)
+}
+
 func RunNetworkTest(ctx context.Context, kubeFactory kube.Factory, urls ...string) error {
 	const networkTestsTimeout = 120 * time.Second
 	var testerPodName string
@@ -232,14 +231,14 @@ func RunNetworkTest(ctx context.Context, kubeFactory kube.Factory, urls ...strin
 	defer func() {
 		deferErr := client.BatchV1().Jobs(store.Get().DefaultNamespace).Delete(ctx, store.Get().NetworkTesterName, metav1.DeleteOptions{})
 		if deferErr != nil {
-			log.G(ctx).Error("fail to delete job resource '%s': %s", store.Get().NetworkTesterName, deferErr.Error())
+			log.G(ctx).Errorf("fail to delete job resource '%s': %s", store.Get().NetworkTesterName, deferErr.Error())
 		}
 	}()
 
 	defer func(name *string) {
 		deferErr := client.CoreV1().Pods(store.Get().DefaultNamespace).Delete(ctx, *name, metav1.DeleteOptions{})
 		if deferErr != nil {
-			log.G(ctx).Error("fail to delete tester pod '%s': %s", testerPodName, deferErr.Error())
+			log.G(ctx).Errorf("fail to delete tester pod '%s': %s", testerPodName, deferErr.Error())
 		}
 	}(&testerPodName)