Consolidate naming for running setups

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/common/__tests__/cluster-store.test.ts

@@ -24,7 +24,7 @@ import directoryForUserDataInjectable from "../app-paths/directory-for-user-data
 import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
 import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable";
-import { runSetupables } from "../setupable-injection-token/run-setupables";
+import { runSetups } from "../setupable-injection-token/run-setups";
 
 console = new Console(stdout, stderr);
 
@@ -83,7 +83,7 @@ describe("cluster-store", () => {
   beforeEach(async () => {
     mainDi = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    await runSetupables(mainDi);
+    await runSetups(mainDi);
 
     mockFs();
 

src/common/__tests__/hotbar-store.test.ts

@@ -14,7 +14,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import hotbarStoreInjectable from "../hotbar-store.injectable";
 import { HotbarStore } from "../hotbar-store";
 import catalogCatalogEntityInjectable from "../catalog-entities/general-catalog-entities/implementations/catalog-catalog-entity.injectable";
-import { runSetupables } from "../setupable-injection-token/run-setupables";
+import { runSetups } from "../setupable-injection-token/run-setups";
 
 jest.mock("../../main/catalog/catalog-entity-registry", () => ({
   catalogEntityRegistry: {
@@ -151,7 +151,7 @@ describe("HotbarStore", () => {
     beforeEach(async () => {
       mockFs();
 
-      await runSetupables(di);
+      await runSetups(di);
 
       hotbarStore = di.inject(hotbarStoreInjectable);
     });
@@ -382,7 +382,7 @@ describe("HotbarStore", () => {
 
       mockFs(configurationToBeMigrated);
 
-      await runSetupables(di);
+      await runSetups(di);
 
       hotbarStore = di.inject(hotbarStoreInjectable);
     });

src/common/setupable-injection-token/run-setups.ts

@@ -5,10 +5,10 @@
 import type { DiContainer } from "@ogre-tools/injectable";
 import { setupableInjectionToken } from "./setupable-injection-token";
 
-export const runSetupables = async (di: DiContainer) => {
+export const runSetups = async (di: DiContainer) => {
   await Promise.all(
     di
       .injectMany(setupableInjectionToken)
-      .map((setupable) => setupable.doSetup()),
+      .map((setupable) => setupable.runSetup()),
   );
 };

src/common/setupable-injection-token/setupable-injection-token.ts

@@ -5,7 +5,7 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 
 export interface Setupable {
-  doSetup: () => Promise<void> | void;
+  runSetup: () => Promise<void> | void;
 }
 
 export const setupableInjectionToken = getInjectionToken<Setupable>({

src/main/__test__/cluster.test.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { runSetupables } from "../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../common/setupable-injection-token/run-setups";
 
 const logger = {
   silly: jest.fn(),
@@ -86,7 +86,7 @@ describe("create clusters", () => {
       throw new Error("you should never come here");
     });
 
-    await runSetupables(di);
+    await runSetups(di);
 
     createCluster = di.inject(createClusterInjectionToken);
 

src/main/__test__/kube-auth-proxy.test.ts

@@ -57,7 +57,7 @@ import path from "path";
 import spawnInjectable from "../child-process/spawn.injectable";
 import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable";
-import { runSetupables } from "../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../common/setupable-injection-token/run-setups";
 
 console = new Console(stdout, stderr);
 
@@ -107,7 +107,7 @@ describe("kube auth proxy tests", () => {
 
     mockFs(mockMinikubeConfig);
 
-    await runSetupables(di);
+    await runSetups(di);
 
     createCluster = di.inject(createClusterInjectionToken);
 

src/main/__test__/kubeconfig-manager.test.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { runSetupables } from "../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../common/setupable-injection-token/run-setups";
 
 const logger = {
   silly: jest.fn(),
@@ -86,7 +86,7 @@ describe("kubeconfig manager tests", () => {
       throw new Error("you should never come here");
     });
 
-    await runSetupables(di);
+    await runSetups(di);
 
     const createCluster = di.inject(createClusterInjectionToken);
 

src/main/app-paths/setup-app-paths.injectable.ts

@@ -31,7 +31,7 @@ const setupAppPathsInjectable = getInjectable({
     const joinPaths = di.inject(joinPathsInjectable);
 
     return {
-      doSetup: () => {
+      runSetup: () => {
         if (directoryForIntegrationTesting) {
           setElectronAppPath("appData", directoryForIntegrationTesting);
         }

src/main/catalog-sources/__test__/kubeconfig-sync.test.ts

@@ -18,7 +18,7 @@ import directoryForKubeConfigsInjectable from "../../../common/app-paths/directo
 import { ClusterStore } from "../../../common/cluster-store/cluster-store";
 import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable";
-import { runSetupables } from "../../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../../common/setupable-injection-token/run-setups";
 
 jest.mock("electron", () => ({
   app: {
@@ -48,7 +48,7 @@ describe("kubeconfig-sync.source tests", () => {
       ClusterStore.createInstance({ createCluster: () => null }),
     );
 
-    await runSetupables(di);
+    await runSetups(di);
 
     computeDiff = computeDiffFor({
       directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable),

src/main/protocol-handler/__test__/router.test.ts

@@ -18,7 +18,7 @@ import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens-
 import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable";
 import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable";
-import { runSetupables } from "../../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../../common/setupable-injection-token/run-setups";
 
 jest.mock("../../../common/ipc");
 
@@ -47,7 +47,7 @@ describe("protocol router tests", () => {
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(appVersionInjectable);
 
-    await runSetupables(di);
+    await runSetups(di);
 
     extensionLoader = di.inject(extensionLoaderInjectable);
 

src/main/router/router.test.ts

@@ -14,7 +14,7 @@ import asyncFn from "@async-fn/jest";
 import parseRequestInjectable from "./parse-request.injectable";
 import { contentTypes } from "./router-content-types";
 import mockFs from "mock-fs";
-import { runSetupables } from "../../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../../common/setupable-injection-token/run-setups";
 
 describe("router", () => {
   let router: Router;
@@ -43,7 +43,7 @@ describe("router", () => {
 
     di.register(injectable);
 
-    await runSetupables(di);
+    await runSetups(di);
 
     router = di.inject(routerInjectable);
   });

src/renderer/app-paths/setup-app-paths.injectable.ts

@@ -14,7 +14,7 @@ const setupAppPathsInjectable = getInjectable({
   id: "setup-app-paths",
 
   instantiate: (di) => ({
-    doSetup: async () => {
+    runSetup: async () => {
       const getValueFromRegisteredChannel = di.inject(
         getValueFromRegisteredChannelInjectable,
       );

src/renderer/ipc-channel-listeners/register-ipc-channel-listeners.injectable.ts

@@ -11,7 +11,7 @@ const registerIpcChannelListenersInjectable = getInjectable({
   id: "register-ipc-channel-listeners",
 
   instantiate: di => ({
-    doSetup: async () => {
+    runSetup: async () => {
       const registerIpcChannelListener = di.inject(registerIpcChannelListenerInjectable);
 
       const listeners = di.injectMany(ipcChannelListenerInjectionToken);

src/test-utils/get-dis-for-unit-testing.ts

@@ -5,7 +5,7 @@
 import { getDiForUnitTesting as getRendererDi } from "../renderer/getDiForUnitTesting";
 import { getDiForUnitTesting as getMainDi } from "../main/getDiForUnitTesting";
 import { overrideIpcBridge } from "./override-ipc-bridge";
-import { runSetupables } from "../common/setupable-injection-token/run-setupables";
+import { runSetups } from "../common/setupable-injection-token/run-setups";
 
 export const getDisForUnitTesting = (
   { doGeneralOverrides } = { doGeneralOverrides: false },
@@ -20,6 +20,6 @@ export const getDisForUnitTesting = (
     mainDi,
 
     runSetups: () =>
-      Promise.all([runSetupables(rendererDi), runSetupables(mainDi)]),
+      Promise.all([runSetups(rendererDi), runSetups(mainDi)]),
   };
 };