fix: cli client on default scheme (#362)

Author: browdues

internal/api/client.go

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 	"syscall"
 	"time"
 
@@ -36,11 +37,22 @@ func NewClient(cfg pkgmodel.APIConfig, auth http.Header, net *http.Client) *Clie
 	}
 
 	return &Client{
-		endpoint: fmt.Sprintf("%s:%d", cfg.URL, cfg.Port),
+		endpoint: formatEndpoint(cfg.URL, cfg.Port),
 		resty:    client,
 	}
 }
 
+// formatEndpoint builds the API endpoint string. It omits the port when it
+// matches the scheme default (443 for HTTPS, 80 for HTTP) so that Go's HTTP
+// client does not include a redundant port in the Host header.
+func formatEndpoint(url string, port int) string {
+	if (port == 443 && strings.HasPrefix(url, "https://")) ||
+		(port == 80 && strings.HasPrefix(url, "http://")) {
+		return url
+	}
+	return fmt.Sprintf("%s:%d", url, port)
+}
+
 func (c *Client) Stats() (*apimodel.Stats, error) {
 	resp, err := c.resty.R().
 		Get(c.endpoint + "/api/v1/stats")

internal/api/client_test.go

@@ -0,0 +1,53 @@
+// © 2025 Platform Engineering Labs Inc.
+//
+// SPDX-License-Identifier: FSL-1.1-ALv2
+
+package api
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFormatEndpointStandardPort(t *testing.T) {
+	want := "http://localhost:49684"
+	got := formatEndpoint("http://localhost", 49684)
+
+	assert.Equal(t, want, got)
+}
+
+func TestFormatEndpointHTTPSDefault(t *testing.T) {
+	want := "https://example.awsapprunner.com"
+	got := formatEndpoint("https://example.awsapprunner.com", 443)
+
+	assert.Equal(t, want, got)
+}
+
+func TestFormatEndpointHTTPDefault(t *testing.T) {
+	want := "http://example.com"
+	got := formatEndpoint("http://example.com", 80)
+
+	assert.Equal(t, want, got)
+}
+
+func TestFormatEndpointHTTPSNonDefault(t *testing.T) {
+	want := "https://example.com:8443"
+	got := formatEndpoint("https://example.com", 8443)
+
+	assert.Equal(t, want, got)
+}
+
+func TestFormatEndpointHTTPWith443(t *testing.T) {
+	want := "http://example.com:443"
+	got := formatEndpoint("http://example.com", 443)
+
+	assert.Equal(t, want, got)
+}
+
+func TestFormatEndpointHTTPSWith80(t *testing.T) {
+	want := "https://example.com:80"
+	got := formatEndpoint("https://example.com", 80)
+
+	assert.Equal(t, want, got)
+}