diff --git a/packages/osd-opensearch-archiver/src/cli.ts b/packages/osd-opensearch-archiver/src/cli.ts index 6a021015410e..002e3e287587 100644 --- a/packages/osd-opensearch-archiver/src/cli.ts +++ b/packages/osd-opensearch-archiver/src/cli.ts @@ -71,7 +71,7 @@ export function runCli() { throw createFlagError('--opensearch-url must be a string'); } if (!opensearchUrl && config) { - opensearchUrl = config.get('servers.opensearch').fullURL.toString().slice(0, -1); + opensearchUrl = config.get('servers.opensearch.serverUrl'); } if (!opensearchUrl) { throw createFlagError('--opensearch-url or --config must be defined'); @@ -82,10 +82,7 @@ export function runCli() { throw createFlagError('--opensearch-dashboards-url must be a string'); } if (!opensearchDashboardsUrl && config) { - opensearchDashboardsUrl = config - .get('servers.opensearchDashboards') - .fullURL.toString() - .slice(0, -1) as string; + opensearchDashboardsUrl = config.get('servers.opensearchDashboards.serverUrl') as string; } if (!opensearchDashboardsUrl) { throw createFlagError('---url or --config must be defined'); diff --git a/packages/osd-test/src/functional_test_runner/lib/config/schema.ts b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts index e127edca95f7..720bd0940f87 100644 --- a/packages/osd-test/src/functional_test_runner/lib/config/schema.ts +++ b/packages/osd-test/src/functional_test_runner/lib/config/schema.ts @@ -51,6 +51,7 @@ const urlPartsSchema = () => hash: Joi.string().regex(/^\//, 'start with a /'), certificateAuthorities: Joi.array().items(Joi.binary()).optional(), fullURL: Joi.object().type(URL), + serverUrl: Joi.string(), }) .default(); diff --git a/packages/osd-test/src/legacy_opensearch/opensearch_test_config.js b/packages/osd-test/src/legacy_opensearch/opensearch_test_config.js index 97c4a6654e83..22bb858411fd 100644 --- a/packages/osd-test/src/legacy_opensearch/opensearch_test_config.js +++ b/packages/osd-test/src/legacy_opensearch/opensearch_test_config.js @@ -41,7 +41,7 @@ export const opensearchTestConfig = new (class OpenSearchTestConfig { } getUrl() { - return this.getUrlParts().fullURL.toString().slice(0, -1); + return this.getUrlParts().serverUrl; } getBuildFrom() { @@ -66,6 +66,7 @@ export const opensearchTestConfig = new (class OpenSearchTestConfig { password: testOpenSearchUrl.password, auth: `${testOpenSearchUrl.username}:${testOpenSearchUrl.password}`, fullURL: testOpenSearchUrl, + serverUrl: testOpenSearchUrl.toString().slice(0, -1), }; } @@ -86,6 +87,7 @@ export const opensearchTestConfig = new (class OpenSearchTestConfig { username: username, password: password, fullURL, + serverUrl: fullURL.toString().slice(0, -1), }; } })(); diff --git a/packages/osd-test/src/osd/osd_test_config.ts b/packages/osd-test/src/osd/osd_test_config.ts index 6f1512cb5a77..b5fc179b7a97 100644 --- a/packages/osd-test/src/osd/osd_test_config.ts +++ b/packages/osd-test/src/osd/osd_test_config.ts @@ -38,6 +38,7 @@ interface UrlParts { username?: string; password?: string; fullURL: URL; + serverUrl: string; } export const osdTestConfig = new (class OsdTestConfig { @@ -63,6 +64,7 @@ export const osdTestConfig = new (class OsdTestConfig { username: testOpenSearchDashboardsUrl.username ?? undefined, password: testOpenSearchDashboardsUrl.password ?? undefined, fullURL: testOpenSearchDashboardsUrl, + serverUrl: testOpenSearchDashboardsUrl.toString().slice(0, -1), }; } @@ -85,6 +87,7 @@ export const osdTestConfig = new (class OsdTestConfig { username, password, fullURL, + serverUrl: fullURL.toString().slice(0, -1), }; } })(); diff --git a/test/api_integration/services/supertest.ts b/test/api_integration/services/supertest.ts index f9adb00b447e..4eaf2a2531da 100644 --- a/test/api_integration/services/supertest.ts +++ b/test/api_integration/services/supertest.ts @@ -34,15 +34,12 @@ import supertestAsPromised from 'supertest-as-promised'; export function OpenSearchDashboardsSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const opensearchDashboardsServerUrl = config - .get('servers.opensearchDashboards') - .fullURL.toString() - .slice(0, -1); + const opensearchDashboardsServerUrl = config.get('servers.opensearchDashboards.serverUrl'); return supertestAsPromised(opensearchDashboardsServerUrl); } export function OpenSearchSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const elasticSearchServerUrl = config.get('servers.opensearch').fullURL.toString().slice(0, -1); + const elasticSearchServerUrl = config.get('servers.opensearch.serverUrl'); return supertestAsPromised(elasticSearchServerUrl); } diff --git a/test/common/config.js b/test/common/config.js index 68c3119fa6e7..cff91302899d 100644 --- a/test/common/config.js +++ b/test/common/config.js @@ -54,7 +54,7 @@ export default function () { '--logging.json=false', `--server.port=${osdTestConfig.getPort()}`, '--status.allowAnonymous=true', - `--opensearch.hosts=${servers.opensearch.fullURL.toString().slice(0, -1)}`, + `--opensearch.hosts=${servers.opensearch.serverUrl}`, `--opensearch.username=${opensearchDashboardsServerTestUser.username}`, `--opensearch.password=${opensearchDashboardsServerTestUser.password}`, `--home.disableWelcomeScreen=false`, diff --git a/test/common/services/legacy_opensearch.ts b/test/common/services/legacy_opensearch.ts index 23a31fd15a8c..1293171a28ff 100644 --- a/test/common/services/legacy_opensearch.ts +++ b/test/common/services/legacy_opensearch.ts @@ -40,7 +40,7 @@ export function LegacyOpenSearchProvider({ return new legacyOpenSearch.Client({ apiVersion: DEFAULT_API_VERSION, - host: config.get('servers.opensearch.fullURL').toString().slice(0, -1), + host: config.get('servers.opensearch.serverUrl'), requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } diff --git a/test/common/services/opensearch.ts b/test/common/services/opensearch.ts index d1ab8b1d2fab..1c1543174c43 100644 --- a/test/common/services/opensearch.ts +++ b/test/common/services/opensearch.ts @@ -39,7 +39,7 @@ export function OpenSearchProvider({ getService }: FtrProviderContext) { if (process.env.TEST_CLOUD) { return new Client({ - nodes: [config.get('servers.opensearch.fullURL').toString().slice(0, -1)], + nodes: [config.get('servers.opensearch.serverUrl')], requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } else { @@ -47,7 +47,7 @@ export function OpenSearchProvider({ getService }: FtrProviderContext) { ssl: { ca: fs.readFileSync(CA_CERT_PATH, 'utf-8'), }, - nodes: [config.get('servers.opensearch.fullURL').toString().slice(0, -1)], + nodes: [config.get('servers.opensearch.serverUrl')], requestTimeout: config.get('timeouts.opensearchRequestTimeout'), }); } diff --git a/test/common/services/opensearch_archiver.ts b/test/common/services/opensearch_archiver.ts index 939ca094fb52..3985c7aaf466 100644 --- a/test/common/services/opensearch_archiver.ts +++ b/test/common/services/opensearch_archiver.ts @@ -54,10 +54,7 @@ export function OpenSearchArchiverProvider({ client, dataDir, log, - opensearchDashboardsUrl: config - .get('servers.opensearchDashboards.fullURL') - .toString() - .slice(0, -1), + opensearchDashboardsUrl: config.get('servers.opensearchDashboards.serverUrl'), }); if (hasService('opensearchDashboardsServer')) { diff --git a/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts b/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts index 33344404b5c7..31e75db89a01 100644 --- a/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts +++ b/test/common/services/opensearch_dashboards_server/opensearch_dashboards_server.ts @@ -36,7 +36,7 @@ export function OpenSearchDashboardsServerProvider({ getService }: FtrProviderCo const log = getService('log'); const config = getService('config'); const lifecycle = getService('lifecycle'); - const url = config.get('servers.opensearchDashboards.fullURL').toString().slice(0, -1); + const url = config.get('servers.opensearchDashboards.serverUrl'); const defaults = config.get('uiSettings.defaults'); const osd = new OsdClient({ log, diff --git a/test/functional/services/supertest.ts b/test/functional/services/supertest.ts index 778e94c1212a..c84ff6c0a8fd 100644 --- a/test/functional/services/supertest.ts +++ b/test/functional/services/supertest.ts @@ -34,9 +34,6 @@ import supertestAsPromised from 'supertest-as-promised'; export function OpenSearchDashboardsSupertestProvider({ getService }: FtrProviderContext) { const config = getService('config'); - const opensearchDashboardsServerUrl = config - .get('servers.opensearchDashboards.fullURL') - .toString() - .slice(0, -1); + const opensearchDashboardsServerUrl = config.get('servers.opensearchDashboards.serverUrl'); return supertestAsPromised(opensearchDashboardsServerUrl); } diff --git a/test/server_integration/services/supertest.js b/test/server_integration/services/supertest.js index b75620c93e56..91ab7bcdc54f 100644 --- a/test/server_integration/services/supertest.js +++ b/test/server_integration/services/supertest.js @@ -37,8 +37,7 @@ export function createOpenSearchDashboardsSupertestProvider({ return function ({ getService }) { const config = getService('config'); opensearchDashboardsUrl = - opensearchDashboardsUrl ?? - config.get('servers.opensearchDashboards.fullURL').toString().slice(0, -1); + opensearchDashboardsUrl ?? config.get('servers.opensearchDashboards.serverUrl'); return certificateAuthorities ? supertestAsPromised.agent(opensearchDashboardsUrl, { ca: certificateAuthorities }) @@ -57,6 +56,5 @@ export function OpenSearchDashboardsSupertestWithoutAuthProvider({ getService }) export function OpenSearchSupertestProvider({ getService }) { const config = getService('config'); - const opensearchServerURL = config.get('servers.opensearch.fullURL'); - return supertestAsPromised(opensearchServerURL.toString().slice(0, -1)); + return supertestAsPromised(config.get('servers.opensearch.serverUrl')); }