refactor(test): getServerUrl to handle different base URL formats

Signed-off-by: Martin Szuc <[email protected]>
eclipse-che · Nov 8, 2024 · f6af61e · f6af61e
1 parent c875c46
commit f6af61e
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts b/tests/e2e/utils/KubernetesCommandLineToolsExecutor.ts
@@ -202,8 +202,20 @@ export class KubernetesCommandLineToolsExecutor implements IKubernetesCommandLin
 
 	getServerUrl(): string {
 		Logger.debug(`${this.kubernetesCommandLineTool} - get server api url.`);
+		const baseUrl = new URL(BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL);
+		let apiHostname: string;
 
-		return BASE_TEST_CONSTANTS.TS_SELENIUM_BASE_URL.replace('devspaces.apps', 'api') + ':6443';
+		if (baseUrl.hostname.includes('devspaces.apps')) {
+			apiHostname = baseUrl.hostname.replace('devspaces.apps', 'api');
+		} else if (baseUrl.hostname.includes('console-openshift-console.apps')) {
+			apiHostname = baseUrl.hostname.replace('console-openshift-console.apps', 'api');
+		} else {
+			throw new Error(`Unexpected base URL hostname format: ${baseUrl.hostname}`);
+		}
+
+		const apiUrl = `https://${apiHostname}:6443`;
+		Logger.debug(`Generated API server URL: ${apiUrl}`);
+		return apiUrl;
 	}
 }