fix: Handle remote url with trailing slash (#74)

Author: jsirianni

internal/client/client.go

@@ -6,6 +6,8 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"net/url"
+	"strings"
 	"time"
 
 	"github.com/observiq/bindplane-op-action/internal/client/config"
@@ -29,6 +31,18 @@ type BindPlane struct {
 	client *resty.Client
 }
 
+func buildBaseURL(remoteURL string) (string, error) {
+	parsedURL, err := url.Parse(remoteURL)
+	if err != nil {
+		return "", fmt.Errorf("failed to parse remote URL: %w", err)
+	}
+
+	// Ensure the path doesn't end with a slash
+	parsedURL.Path = strings.TrimRight(parsedURL.Path, "/")
+
+	return parsedURL.String(), nil
+}
+
 // NewBindPlane takes a config and logger and returns a configured BindPlane client
 func NewBindPlane(config *config.Config, logger *zap.Logger) (*BindPlane, error) {
 	restryClient := resty.New()
@@ -43,7 +57,11 @@ func NewBindPlane(config *config.Config, logger *zap.Logger) (*BindPlane, error)
 		restryClient.SetHeader(KeyHeader, config.Auth.APIKey)
 	}
 
-	restryClient.SetBaseURL(fmt.Sprintf("%s/v1", config.Network.RemoteURL))
+	baseURL, err := buildBaseURL(config.Network.RemoteURL)
+	if err != nil {
+		return nil, fmt.Errorf("failed to build base URL: %w", err)
+	}
+	restryClient.SetBaseURL(fmt.Sprintf("%s/v1", baseURL))
 
 	userAgent := DefaultUserAgent
 	if config.Network.UserAgent != "" {

internal/client/client_test.go

@@ -0,0 +1,108 @@
+package client
+
+import (
+	"testing"
+)
+
+func TestBuildBaseURL(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+		wantErr  bool
+	}{
+		{
+			name:     "URL without trailing slash",
+			input:    "https://example.com",
+			expected: "https://example.com",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with trailing slash",
+			input:    "https://example.com/",
+			expected: "https://example.com",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with multiple trailing slashes",
+			input:    "https://example.com///",
+			expected: "https://example.com",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with path and trailing slash",
+			input:    "https://example.com/api/",
+			expected: "https://example.com/api",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with path without trailing slash",
+			input:    "https://example.com/api",
+			expected: "https://example.com/api",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with query parameters",
+			input:    "https://example.com/api/?param=value",
+			expected: "https://example.com/api?param=value",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with fragment",
+			input:    "https://example.com/api/#section",
+			expected: "https://example.com/api#section",
+			wantErr:  false,
+		},
+		{
+			name:     "URL with port",
+			input:    "https://example.com:8080/",
+			expected: "https://example.com:8080",
+			wantErr:  false,
+		},
+		{
+			name:     "HTTP URL",
+			input:    "http://localhost:3000/",
+			expected: "http://localhost:3000",
+			wantErr:  false,
+		},
+		{
+			name:     "Invalid URL (treated as relative path)",
+			input:    "not-a-valid-url",
+			expected: "not-a-valid-url",
+			wantErr:  false,
+		},
+		{
+			name:     "Empty string (treated as relative path)",
+			input:    "",
+			expected: "",
+			wantErr:  false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result, err := buildBaseURL(tt.input)
+
+			if tt.wantErr {
+				if err == nil {
+					t.Errorf("buildBaseURL() expected error but got none")
+				}
+				return
+			}
+
+			if err != nil {
+				t.Errorf("buildBaseURL() unexpected error: %v", err)
+				return
+			}
+
+			if result != tt.expected {
+				t.Errorf("buildBaseURL() = %v, want %v", result, tt.expected)
+			}
+
+			// Additional check: ensure result doesn't end with trailing slash
+			if len(result) > 0 && result[len(result)-1] == '/' {
+				t.Errorf("buildBaseURL() result ends with trailing slash: %v", result)
+			}
+		})
+	}
+}