Merge pull request #545 from MusicDin/fix/url-port

provider-config: Append port to hostname instead of the URL

internal/provider-config/config.go

@@ -569,10 +569,10 @@ func DetermineLXDAddress(protocol string, address string) (string, error) {
 				port = "443"
 			}
 
-			address = fmt.Sprintf("%s:%s", address, port)
+			url.Host = fmt.Sprintf("%s:%s", url.Hostname(), port)
 		}
 
-		return address, nil
+		return url.String(), nil
 	default:
 		return "", fmt.Errorf("Invalid scheme %q: Value must be one of: [unix, https]", scheme)
 	}

internal/provider-config/config_test.go

@@ -52,6 +52,18 @@ func TestDetermineLXDAddress(t *testing.T) {
 			Address: "https://localhost:1234",
 			Expect:  "https://localhost:1234",
 		},
+		{
+			Name:     "Scheme, hostname, port | URL path",
+			Protocol: "simplestreams",
+			Address:  "https://example.com/cloud-images/releases",
+			Expect:   "https://example.com:443/cloud-images/releases",
+		},
+		{
+			Name:     "Scheme, hostname, port | URL path with preconfigured port",
+			Protocol: "simplestreams",
+			Address:  "https://example.com:1234/cloud-images/releases",
+			Expect:   "https://example.com:1234/cloud-images/releases",
+		},
 		// Expected errors.
 		{
 			Name:      "Unsupported simplestreams scheme",