Fix IPv6 Docker remote source URLs

internal/glance/widget-docker-containers.go

@@ -288,35 +288,18 @@ func fetchDockerContainersFromSource(
 	runningOnly bool,
 	labelOverrides map[string]map[string]string,
 ) ([]dockerContainerJsonResponse, error) {
-	var hostname string
-	var scheme string
+	var requestBaseURL string
 
 	var client *http.Client
 	if strings.HasPrefix(source, "tcp://") || strings.HasPrefix(source, "http://") || strings.HasPrefix(source, "https://") {
 		client = &http.Client{}
-		parsed, err := url.Parse(source)
+		var err error
+		requestBaseURL, err = dockerContainersRemoteSourceURL(source)
 		if err != nil {
-			return nil, fmt.Errorf("parsing URL: %w", err)
+			return nil, err
 		}
-
-		scheme = parsed.Scheme
-		if scheme == "tcp" {
-			scheme = "http"
-		}
-
-		port := parsed.Port()
-		if port == "" {
-			if scheme == "https" {
-				port = "443"
-			} else {
-				port = "80"
-			}
-		}
-
-		hostname = parsed.Hostname() + ":" + port
 	} else {
-		scheme = "http"
-		hostname = "docker"
+		requestBaseURL = "http://docker"
 		client = &http.Client{
 			Transport: &http.Transport{
 				DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
@@ -330,7 +313,7 @@ func fetchDockerContainersFromSource(
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	request, err := http.NewRequestWithContext(ctx, "GET", scheme+"://"+hostname+"/containers/json?all="+fetchAll, nil)
+	request, err := http.NewRequestWithContext(ctx, "GET", requestBaseURL+"/containers/json?all="+fetchAll, nil)
 	if err != nil {
 		return nil, fmt.Errorf("creating request: %w", err)
 	}
@@ -390,3 +373,26 @@ func fetchDockerContainersFromSource(
 
 	return containers, nil
 }
+
+func dockerContainersRemoteSourceURL(source string) (string, error) {
+	parsed, err := url.Parse(source)
+	if err != nil {
+		return "", fmt.Errorf("parsing URL: %w", err)
+	}
+
+	scheme := parsed.Scheme
+	if scheme == "tcp" {
+		scheme = "http"
+	}
+
+	port := parsed.Port()
+	if port == "" {
+		if scheme == "https" {
+			port = "443"
+		} else {
+			port = "80"
+		}
+	}
+
+	return scheme + "://" + net.JoinHostPort(parsed.Hostname(), port), nil
+}

internal/glance/widget-docker-containers_test.go

@@ -0,0 +1,40 @@
+package glance
+
+import "testing"
+
+func TestDockerContainersRemoteSourceURL(t *testing.T) {
+	tests := []struct {
+		name   string
+		source string
+		want   string
+	}{
+		{
+			name:   "IPv4 address",
+			source: "tcp://127.0.0.1:2375",
+			want:   "http://127.0.0.1:2375",
+		},
+		{
+			name:   "hostname",
+			source: "tcp://docker.example.com:2375",
+			want:   "http://docker.example.com:2375",
+		},
+		{
+			name:   "IPv6 address",
+			source: "tcp://[::1]:2375",
+			want:   "http://[::1]:2375",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := dockerContainersRemoteSourceURL(tt.source)
+			if err != nil {
+				t.Fatalf("dockerContainersRemoteSourceURL() returned an error: %v", err)
+			}
+
+			if got != tt.want {
+				t.Errorf("dockerContainersRemoteSourceURL() = %q, want %q", got, tt.want)
+			}
+		})
+	}
+}