From 1be71adbebc3eab712f52386f416401a4f8fbffd Mon Sep 17 00:00:00 2001 From: Joshua Rich Date: Mon, 3 Jul 2023 11:29:46 +0000 Subject: [PATCH] fix(agent): add a config upgrade action to remove trailing slash from host --- internal/agent/config.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/internal/agent/config.go b/internal/agent/config.go index cddf3cf4a..48b7b7675 100644 --- a/internal/agent/config.go +++ b/internal/agent/config.go @@ -10,6 +10,7 @@ import ( "fmt" "net/url" "reflect" + "strings" "time" "fyne.io/fyne/v2" @@ -135,8 +136,9 @@ func (c *agentConfig) Upgrade() error { if err != nil { return err } + switch { // * Upgrade host to include scheme for versions < v.1.4.0 - if semver.Compare(configVersion.(string), "v1.4.0") < 0 { + case semver.Compare(configVersion.(string), "v1.4.0") < 0: host, err := c.Get("host") if err != nil { return err @@ -157,6 +159,16 @@ func (c *agentConfig) Upgrade() error { newHost = "http://" + host.(string) } c.Set("Host", newHost) + fallthrough + // * Trim trailing slash from host for versions < v1.4.3 + case semver.Compare(configVersion.(string), "v1.4.3") < 0: + host, err := c.Get("host") + if err != nil { + return err + } + var newHost string + newHost = strings.TrimSuffix(host.(string), "/") + c.Set("Host", newHost) } c.Set("Version", Version)