[TOOLSET] Kiali: Allow kiali url with path (#477)

* Allow kiali url with path

Signed-off-by: josunect <jcordoba@redhat.com>

* Update pkg/kiali/kiali.go

Co-authored-by: Calum Murray <cmurray@redhat.com>
Signed-off-by: josunect <jcordoba@redhat.com>

---------

Signed-off-by: josunect <jcordoba@redhat.com>
Co-authored-by: Calum Murray <cmurray@redhat.com>

Author: josunect

pkg/kiali/kiali.go

@@ -53,11 +53,23 @@ func (k *Kiali) validateAndGetURL(endpoint string) (string, error) {
 	if endpoint == "" {
 		return baseURL.String(), nil
 	}
-	ref, err := url.Parse(endpoint)
+	// Parse the endpoint to extract path, query, and fragment
+	endpoint = strings.TrimSpace(endpoint)
+	endpointURL, err := url.Parse(endpoint)
+
 	if err != nil {
 		return "", fmt.Errorf("invalid endpoint path: %w", err)
 	}
-	return baseURL.ResolveReference(ref).String(), nil
+	resultURL, err := url.JoinPath(baseURL.String(), endpointURL.Path)
+	if err != nil {
+		return "", fmt.Errorf("failed to join kiali base URL with endpoint path: %w", err)
+	}
+
+	u, _ := url.Parse(resultURL)
+	u.RawQuery = endpointURL.RawQuery
+	u.Fragment = endpointURL.Fragment
+
+	return u.String(), nil
 }
 
 func (k *Kiali) createHTTPClient() *http.Client {

pkg/kiali/kiali_test.go

@@ -98,6 +98,36 @@ func (s *KialiSuite) TestValidateAndGetURL() {
 			s.Equal("2", u.Query().Get("y"), "Unexpected query parameter y")
 		})
 	})
+
+	s.Run("With base URL containing path", func() {
+		s.Config = test.Must(config.ReadToml([]byte(`
+			[toolset_configs.kiali]
+			url = "http://kiali-istio-system.apps-crc.testing/kiali"
+			insecure = true
+		`)))
+		k := NewKiali(s.Config, s.MockServer.Config())
+
+		s.Run("concatenates base path with endpoint", func() {
+			full, err := k.validateAndGetURL("/api/namespaces")
+			s.Require().NoError(err, "Expected no error validating URL")
+			s.Equal("http://kiali-istio-system.apps-crc.testing/kiali/api/namespaces", full, "Unexpected full URL")
+		})
+
+		s.Run("handles endpoint without leading slash", func() {
+			full, err := k.validateAndGetURL("api/namespaces")
+			s.Require().NoError(err, "Expected no error validating URL")
+			s.Equal("http://kiali-istio-system.apps-crc.testing/kiali/api/namespaces", full, "Unexpected full URL")
+		})
+
+		s.Run("preserves query parameters with base path", func() {
+			full, err := k.validateAndGetURL("/api/namespaces?health=true")
+			s.Require().NoError(err, "Expected no error validating URL")
+			u, err := url.Parse(full)
+			s.Require().NoError(err, "Expected to parse full URL")
+			s.Equal("/kiali/api/namespaces", u.Path, "Unexpected path in parsed URL")
+			s.Equal("true", u.Query().Get("health"), "Unexpected query parameter health")
+		})
+	})
 }
 
 // CurrentAuthorizationHeader behavior is now implicit via executeRequest using Manager.BearerToken