Add serverUrl property and refactor slice(0, -1) to it

Signed-off-by: Lin Wang <wonglam@amazon.com>
opensearch-project · Mar 21, 2023 · a846ba1 · a846ba1
1 parent 3d93282
commit a846ba1
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 28 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -39,15 +39,15 @@ 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 {
     return new Client({
       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
@@ -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
@@ -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
@@ -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
@@ -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'));
 }