From edcf06510ae16d1423b8e9ba4b99f36ce92f747f Mon Sep 17 00:00:00 2001 From: Pierluigi Di Lorenzo Date: Tue, 17 Mar 2020 19:58:46 +0100 Subject: [PATCH 1/2] remove trailing slash on apihost #481 --- commands/property.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/commands/property.go b/commands/property.go index b87bd4605..99faf6af7 100644 --- a/commands/property.go +++ b/commands/property.go @@ -471,6 +471,10 @@ func loadProperties() error { } if apiHost, hasProp := props["APIHOST"]; hasProp { + if last := len(apiHost) - 1; last >= 0 && apiHost[last] == '/' { + apiHost = apiHost[:last] + } + Properties.APIHost = apiHost } From d5f24cd3da46ed1df46743aafc7d8ff105683303 Mon Sep 17 00:00:00 2001 From: Pierluigi Di Lorenzo Date: Thu, 18 Jun 2020 17:54:02 +0200 Subject: [PATCH 2/2] jiangpengcheng revision --- commands/property.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/commands/property.go b/commands/property.go index 99faf6af7..16c22a66d 100644 --- a/commands/property.go +++ b/commands/property.go @@ -21,6 +21,7 @@ import ( "errors" "fmt" "os" + "strings" "github.com/fatih/color" homedir "github.com/mitchellh/go-homedir" @@ -471,11 +472,7 @@ func loadProperties() error { } if apiHost, hasProp := props["APIHOST"]; hasProp { - if last := len(apiHost) - 1; last >= 0 && apiHost[last] == '/' { - apiHost = apiHost[:last] - } - - Properties.APIHost = apiHost + Properties.APIHost = strings.TrimRight(apiHost, "/") } if apiHost := os.Getenv("WHISK_APIHOST"); len(apiHost) > 0 {