[Non-Inclusive Language] Replace isDevClusterMaster with isDevCluster…

…Manager Signed-off-by: manasvis <manasvis@amazon.com>
opensearch-project · Jun 13, 2022 · 3b9461b · 3b9461b
1 parent 3ff99cf
commit 3b9461b
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/packages/osd-config/src/__mocks__/env.ts b/packages/osd-config/src/__mocks__/env.ts
@@ -52,7 +52,7 @@ export function getEnvOptions(options: DeepPartial<EnvOptions> = {}): EnvOptions
       runExamples: false,
       ...(options.cliArgs || {}),
     },
-    isDevClusterMaster:
-      options.isDevClusterMaster !== undefined ? options.isDevClusterMaster : false,
+    isDevClusterManager:
+      options.isDevClusterManager !== undefined ? options.isDevClusterManager : false,
   };
 }
diff --git a/packages/osd-config/src/__snapshots__/env.test.ts.snap b/packages/osd-config/src/__snapshots__/env.test.ts.snap
diff --git a/packages/osd-config/src/env.test.ts b/packages/osd-config/src/env.test.ts
@@ -58,7 +58,7 @@ test('correctly creates default environment in dev mode.', () => {
     REPO_ROOT,
     getEnvOptions({
       configs: ['/test/cwd/config/opensearch_dashboards.yml'],
-      isDevClusterMaster: true,
+      isDevClusterManager: true,
     })
   );
 

diff --git a/packages/osd-config/src/env.ts b/packages/osd-config/src/env.ts
@@ -36,7 +36,7 @@ import { PackageInfo, EnvironmentMode } from './types';
 export interface EnvOptions {
   configs: string[];
   cliArgs: CliArgs;
-  isDevClusterMaster: boolean;
+  isDevClusterManager: boolean;
 }
 
 /** @internal */
@@ -113,7 +113,7 @@ export class Env {
    * Indicates that this OpenSearch Dashboards  instance is run as development Node Cluster master.
    * @internal
    */
-  public readonly isDevClusterMaster: boolean;
+  public readonly isDevClusterManager: boolean;
 
   /**
    * @internal
@@ -137,7 +137,7 @@ export class Env {
 
     this.cliArgs = Object.freeze(options.cliArgs);
     this.configs = Object.freeze(options.configs);
-    this.isDevClusterMaster = options.isDevClusterMaster;
+    this.isDevClusterManager = options.isDevClusterManager;
 
     const isDevMode = this.cliArgs.dev || this.cliArgs.envName === 'development';
     this.mode = Object.freeze<EnvironmentMode>({

diff --git a/src/core/server/bootstrap.ts b/src/core/server/bootstrap.ts
@@ -82,7 +82,7 @@ export async function bootstrap({
   const env = Env.createDefault(REPO_ROOT, {
     configs,
     cliArgs,
-    isDevClusterMaster: isMaster && cliArgs.dev && features.isClusterModeSupported,
+    isDevClusterManager: isMaster && cliArgs.dev && features.isClusterModeSupported,
   });
 
   const rawConfigService = new RawConfigService(env.configs, applyConfigOverrides);

diff --git a/src/core/server/http/http_service.test.ts b/src/core/server/http/http_service.test.ts
@@ -275,7 +275,7 @@ test('does not start http server if process is dev cluster master', async () =>
   const service = new HttpService({
     coreId,
     configService,
-    env: Env.createDefault(REPO_ROOT, getEnvOptions({ isDevClusterMaster: true })),
+    env: Env.createDefault(REPO_ROOT, getEnvOptions({ isDevClusterManager: true })),
     logger,
   });
 

diff --git a/src/core/server/http/http_service.ts b/src/core/server/http/http_service.ts
@@ -169,7 +169,7 @@ export class HttpService
    * @internal
    * */
   private shouldListen(config: HttpConfig) {
-    return !this.coreContext.env.isDevClusterMaster && config.autoListen;
+    return !this.coreContext.env.isDevClusterManager && config.autoListen;
   }
 
   public async stop() {

diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
@@ -373,7 +373,7 @@ describe('once LegacyService is set up in `devClusterMaster` mode', () => {
         REPO_ROOT,
         getEnvOptions({
           cliArgs: { silent: true, basePath: false },
-          isDevClusterMaster: true,
+          isDevClusterManager: true,
         })
       ),
       logger,
@@ -402,7 +402,7 @@ describe('once LegacyService is set up in `devClusterMaster` mode', () => {
         REPO_ROOT,
         getEnvOptions({
           cliArgs: { quiet: true, basePath: true },
-          isDevClusterMaster: true,
+          isDevClusterManager: true,
         })
       ),
       logger,

diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
@@ -155,7 +155,7 @@ export class LegacyService implements CoreService {
     this.log.debug('starting legacy service');
 
     // Receive initial config and create osdServer/ClusterManager.
-    if (this.coreContext.env.isDevClusterMaster) {
+    if (this.coreContext.env.isDevClusterManager) {
       await this.createClusterManager(this.legacyRawConfig!);
     } else {
       this.osdServer = await this.createOsdServer(

diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
@@ -137,7 +137,7 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
     const config = await this.config$.pipe(first()).toPromise();
 
     let contracts = new Map<PluginName, unknown>();
-    const initialize = config.initialize && !this.coreContext.env.isDevClusterMaster;
+    const initialize = config.initialize && !this.coreContext.env.isDevClusterManager;
     if (initialize) {
       contracts = await this.pluginsSystem.setupPlugins(deps);
       this.registerPluginStaticDirs(deps);

diff --git a/src/core/test_helpers/osd_server.ts b/src/core/test_helpers/osd_server.ts
@@ -90,7 +90,7 @@ export function createRootWithSettings(
       dist: false,
       ...cliArgs,
     },
-    isDevClusterMaster: false,
+    isDevClusterManager: false,
   });
 
   return new Root(