EPMDEDP-16652: fix: Normalize portal-url by trimming trailing slashes

Portal URLs with trailing slashes were breaking URL construction in
multiple places, requiring scattered TrimSuffix calls to work around
the issue. Normalize the PortalURL once in config.Resolve() by trimming
trailing slashes, making it the single source of truth.

Signed-off-by: Sergiy Kulanov <sergiy_kulanov@epam.com>

Author: SergK

internal/config/config.go

@@ -81,6 +81,7 @@ func Resolve() (*Config, error) {
 		return nil, fmt.Errorf("parsing config: %w", err)
 	}
 
+	cfg.PortalURL = strings.TrimRight(cfg.PortalURL, "/")
 	cfg.ConfigDir = configDir
 	cfg.TokenPath = filepath.Join(configDir, "tokens.enc")
 	cfg.KeyringService = "krci"
@@ -109,7 +110,7 @@ func Save(cfg *Config) error {
 		existing.Set("client-id", cfg.ClientID)
 	}
 	if cfg.PortalURL != "" {
-		existing.Set("portal-url", cfg.PortalURL)
+		existing.Set("portal-url", strings.TrimRight(cfg.PortalURL, "/"))
 	}
 	if cfg.ClusterName != "" {
 		existing.Set("cluster-name", cfg.ClusterName)

internal/config/config_test.go

@@ -68,6 +68,48 @@ func TestSaveAndLoad(t *testing.T) {
 	assert.Equal(t, cfg.PortalURL, viper.GetString("portal-url"))
 }
 
+func TestResolveTrimsPortalURLTrailingSlashes(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		want  string
+	}{
+		{"no trailing slash", "https://portal.example.com", "https://portal.example.com"},
+		{"single trailing slash", "https://portal.example.com/", "https://portal.example.com"},
+		{"multiple trailing slashes", "https://portal.example.com///", "https://portal.example.com"},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			viper.Reset()
+			t.Setenv("KRCI_PORTAL_URL", tt.input)
+			Init()
+
+			cfg, err := Resolve()
+			require.NoError(t, err)
+
+			assert.Equal(t, tt.want, cfg.PortalURL)
+		})
+	}
+}
+
+func TestSaveTrimsPortalURLTrailingSlash(t *testing.T) {
+	dir := t.TempDir()
+
+	cfg := &Config{
+		PortalURL: "https://portal.example.com/",
+		ConfigDir: dir,
+	}
+
+	require.NoError(t, Save(cfg))
+
+	configPath := filepath.Join(dir, "config.yaml")
+	viper.Reset()
+	viper.SetConfigFile(configPath)
+	require.NoError(t, viper.ReadInConfig())
+
+	assert.Equal(t, "https://portal.example.com", viper.GetString("portal-url"))
+}
+
 func TestSaveSkipsDefaults(t *testing.T) {
 	dir := t.TempDir()
 

internal/portal/config.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 )
 
@@ -114,5 +113,5 @@ func validatePortalURL(portalURL string) error {
 }
 
 func restURL(portalURL, path string) string {
-	return strings.TrimSuffix(portalURL, "/") + "/rest" + path
+	return portalURL + "/rest" + path
 }

internal/portal/config_test.go

@@ -180,5 +180,5 @@ func TestRestURL(t *testing.T) {
 	assert.Equal(t, "https://portal.example.com/rest/v1/config/oidc",
 		restURL("https://portal.example.com", "/v1/config/oidc"))
 	assert.Equal(t, "https://portal.example.com/rest/v1/config",
-		restURL("https://portal.example.com/", "/v1/config"))
+		restURL("https://portal.example.com", "/v1/config"))
 }

internal/portal/pipelinerun.go

@@ -30,7 +30,7 @@ func NewPipelineRunService(
 ) *PipelineRunService {
 	return &PipelineRunService{
 		client:      client,
-		portalURL:   strings.TrimSuffix(portalURL, "/"),
+		portalURL:   portalURL,
 		clusterName: clusterName,
 		namespace:   namespace,
 	}