Fix docs pull to accept full URLs (#357)

Author: robinaugh

internal/cli/service_docs_test.go

@@ -378,6 +378,28 @@ func TestService_DocsPull(t *testing.T) {
 		require.Empty(t, s.mockStdout.String())
 	})
 
+	t.Run("when a full URL is provided", func(t *testing.T) {
+		s := setupDocsServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			require.Equal(t, "/docs/rwx/guides/ci", r.URL.Path)
+			require.Equal(t, "text/markdown", r.Header.Get("Accept"))
+
+			fmt.Fprint(w, "# CI Guide\n\nWelcome to CI.")
+		}))
+
+		// Build a full URL using the test server's address
+		addr := s.config.DocsClient.Host
+		fullURL := fmt.Sprintf("http://%s/docs/rwx/guides/ci", addr)
+
+		result, err := s.service.DocsPull(cli.DocsPullConfig{
+			URL: fullURL,
+		})
+
+		require.NoError(t, err)
+		require.Equal(t, fullURL, result.URL)
+		require.Contains(t, s.mockStdout.String(), "# CI Guide")
+		require.Contains(t, s.mockStdout.String(), "Welcome to CI.")
+	})
+
 	t.Run("when the article API returns an error", func(t *testing.T) {
 		s := setupDocsServer(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.WriteHeader(http.StatusNotFound)

internal/docs/client.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 
 	"github.com/rwx-cloud/cli/cmd/rwx/config"
 )
@@ -81,8 +82,28 @@ func (c Client) Search(query string, limit int) (*SearchResponse, error) {
 	return &result, nil
 }
 
+// resolveURL converts a URL or path into a fully qualified request URL.
+// It accepts full URLs (with or without scheme), host-prefixed paths, and bare paths.
+func (c Client) resolveURL(urlOrPath string) string {
+	host := c.host()
+	hostWithoutWWW := strings.TrimPrefix(host, "www.")
+
+	// Full URL with scheme: https://www.rwx.com/docs/... or http://rwx.com/docs/...
+	if strings.HasPrefix(urlOrPath, "https://") || strings.HasPrefix(urlOrPath, "http://") {
+		return urlOrPath
+	}
+
+	// Host-prefixed without scheme: www.rwx.com/docs/... or rwx.com/docs/...
+	if strings.HasPrefix(urlOrPath, host) || strings.HasPrefix(urlOrPath, hostWithoutWWW) {
+		return fmt.Sprintf("%s://%s", c.scheme(), urlOrPath)
+	}
+
+	// Bare path: /docs/rwx/guides/ci
+	return fmt.Sprintf("%s://%s%s", c.scheme(), host, urlOrPath)
+}
+
 func (c Client) FetchArticle(urlOrPath string) (string, error) {
-	reqURL := fmt.Sprintf("%s://%s%s", c.scheme(), c.host(), urlOrPath)
+	reqURL := c.resolveURL(urlOrPath)
 
 	req, err := http.NewRequest("GET", reqURL, nil)
 	if err != nil {

internal/docs/client_test.go

@@ -0,0 +1,134 @@
+package docs
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestClient_resolveURL(t *testing.T) {
+	c := Client{Host: "www.rwx.com", Scheme: "https"}
+
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "bare path",
+			input:    "/docs/rwx/guides/ci",
+			expected: "https://www.rwx.com/docs/rwx/guides/ci",
+		},
+		{
+			name:     "full URL with https scheme",
+			input:    "https://www.rwx.com/docs/rwx/guides/ci",
+			expected: "https://www.rwx.com/docs/rwx/guides/ci",
+		},
+		{
+			name:     "full URL with http scheme",
+			input:    "http://www.rwx.com/docs/rwx/guides/ci",
+			expected: "http://www.rwx.com/docs/rwx/guides/ci",
+		},
+		{
+			name:     "host with www but no scheme",
+			input:    "www.rwx.com/docs/rwx/guides/ci",
+			expected: "https://www.rwx.com/docs/rwx/guides/ci",
+		},
+		{
+			name:     "host without www or scheme",
+			input:    "rwx.com/docs/rwx/guides/ci",
+			expected: "https://rwx.com/docs/rwx/guides/ci",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := c.resolveURL(tt.input)
+			require.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestClient_resolveURL_customHost(t *testing.T) {
+	c := Client{Host: "docs.example.com", Scheme: "http"}
+
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "bare path with custom host",
+			input:    "/some/article",
+			expected: "http://docs.example.com/some/article",
+		},
+		{
+			name:     "full URL ignores custom host",
+			input:    "https://other.com/some/article",
+			expected: "https://other.com/some/article",
+		},
+		{
+			name:     "custom host without scheme",
+			input:    "docs.example.com/some/article",
+			expected: "http://docs.example.com/some/article",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := c.resolveURL(tt.input)
+			require.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestClient_FetchArticle_withFullURL(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/docs/rwx/guides/ci", r.URL.Path)
+		require.Equal(t, "text/markdown", r.Header.Get("Accept"))
+		fmt.Fprint(w, "# CI Guide\n\nWelcome.")
+	}))
+	t.Cleanup(server.Close)
+
+	c := Client{Host: server.Listener.Addr().String(), Scheme: "http"}
+
+	// Pass a full URL pointing at the test server
+	fullURL := fmt.Sprintf("http://%s/docs/rwx/guides/ci", server.Listener.Addr().String())
+	body, err := c.FetchArticle(fullURL)
+	require.NoError(t, err)
+	require.Equal(t, "# CI Guide\n\nWelcome.", body)
+}
+
+func TestClient_FetchArticle_withPath(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/docs/rwx/guides/ci", r.URL.Path)
+		require.Equal(t, "text/markdown", r.Header.Get("Accept"))
+		fmt.Fprint(w, "# CI Guide\n\nWelcome.")
+	}))
+	t.Cleanup(server.Close)
+
+	c := Client{Host: server.Listener.Addr().String(), Scheme: "http"}
+
+	body, err := c.FetchArticle("/docs/rwx/guides/ci")
+	require.NoError(t, err)
+	require.Equal(t, "# CI Guide\n\nWelcome.", body)
+}
+
+func TestClient_FetchArticle_withHostNoScheme(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		require.Equal(t, "/docs/rwx/guides/ci", r.URL.Path)
+		fmt.Fprint(w, "# CI Guide\n\nWelcome.")
+	}))
+	t.Cleanup(server.Close)
+
+	c := Client{Host: server.Listener.Addr().String(), Scheme: "http"}
+
+	// Pass host-prefixed input (without scheme)
+	hostPrefixed := fmt.Sprintf("%s/docs/rwx/guides/ci", server.Listener.Addr().String())
+	body, err := c.FetchArticle(hostPrefixed)
+	require.NoError(t, err)
+	require.Equal(t, "# CI Guide\n\nWelcome.", body)
+}