Merge pull request #259 from pasinskim/1.3

MEN-1620 Remove trailing slash from server URL configuration.
mendersoftware · Dec 5, 2017 · def00f1 · def00f1
2 parents d3360e0 + 2d17e60
commit def00f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/config.go b/config.go
@@ -16,6 +16,7 @@ package main
 import (
 	"encoding/json"
 	"io/ioutil"
+	"strings"
 
 	"github.com/mendersoftware/log"
 	"github.com/mendersoftware/mender/client"
@@ -56,6 +57,10 @@ func LoadConfig(configFile string) (*menderConfig, error) {
 		return nil, err
 	}
 
+	if strings.HasSuffix(confFromFile.ServerURL, "/") {
+		confFromFile.ServerURL = strings.TrimSuffix(confFromFile.ServerURL, "/")
+	}
+
 	return &confFromFile, nil
 }
 

diff --git a/config_test.go b/config_test.go
@@ -105,3 +105,14 @@ func Test_loadConfig_correctConfFile_returnsConfiguration(t *testing.T) {
 
 	validateConfiguration(t, config)
 }
+
+func TestServerURLConfig(t *testing.T) {
+	configFile, _ := os.Create("mender.config")
+	defer os.Remove("mender.config")
+
+	configFile.WriteString(`{"ServerURL": "https://mender.io/"}`)
+
+	config, err := LoadConfig("mender.config")
+	assert.NoError(t, err)
+	assert.Equal(t, "https://mender.io", config.ServerURL)
+}