chore: Rename injectables to remove redundancy

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx

@@ -12,8 +12,8 @@ import createEditResourceTabInjectable from "../../../renderer/components/dock/e
 import getRandomIdForEditResourceTabInjectable from "../../../renderer/components/dock/edit-resource/get-random-id-for-edit-resource-tab.injectable";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { CallForPatchResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable";
+import type { RequestPatchKubeResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable";
-import callForPatchResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable";
+import requestPatchKubeResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable";
 import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable";
 import { Namespace } from "../../../common/k8s-api/endpoints";
 import showSuccessNotificationInjectable from "../../../renderer/components/notifications/show-success-notification.injectable";
@@ -21,13 +21,13 @@ import showErrorNotificationInjectable from "../../../renderer/components/notifi
 import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable";
 import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable";
-import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable";
+import type { RequestKubeResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable";
-import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable";
+import requestKubeResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable";
 
 describe("cluster/namespaces - edit namespace from new tab", () => {
   let builder: ApplicationBuilder;
-  let callForResourceMock: AsyncFnMock<CallForResource>;
+  let requestKubeResourceMock: AsyncFnMock<RequestKubeResource>;
-  let callForPatchResourceMock: AsyncFnMock<CallForPatchResource>;
+  let requestPatchKubeResourceMock: AsyncFnMock<RequestPatchKubeResource>;
   let showSuccessNotificationMock: jest.Mock;
   let showErrorNotificationMock: jest.Mock;
 
@@ -57,11 +57,11 @@ describe("cluster/namespaces - edit namespace from new tab", () => {
           .mockReturnValueOnce("some-second-tab-id"),
       );
 
-      callForResourceMock = asyncFn();
+      requestKubeResourceMock = asyncFn();
-      windowDi.override(callForResourceInjectable, () => callForResourceMock);
+      windowDi.override(requestKubeResourceInjectable, () => requestKubeResourceMock);
 
-      callForPatchResourceMock = asyncFn();
+      requestPatchKubeResourceMock = asyncFn();
-      windowDi.override(callForPatchResourceInjectable, () => callForPatchResourceMock);
+      windowDi.override(requestPatchKubeResourceInjectable, () => requestPatchKubeResourceMock);
     });
 
     builder.afterWindowStart(() => {
@@ -156,7 +156,7 @@ describe("cluster/namespaces - edit namespace from new tab", () => {
           });
 
           it("calls for namespace", () => {
-            expect(callForResourceMock).toHaveBeenCalledWith(
+            expect(requestKubeResourceMock).toHaveBeenCalledWith(
               "/apis/some-api-version/namespaces/some-uid",
             );
           });
@@ -179,7 +179,7 @@ describe("cluster/namespaces - edit namespace from new tab", () => {
                 },
               });
 
-              await callForResourceMock.resolve({
+              await requestKubeResourceMock.resolve({
                 callWasSuccessful: true,
                 response: someNamespace,
               });
@@ -226,7 +226,7 @@ metadata:
               });
 
               it("calls for save with just the adding version label", () => {
-                expect(callForPatchResourceMock).toHaveBeenCalledWith(
+                expect(requestPatchKubeResourceMock).toHaveBeenCalledWith(
                   someNamespace,
                   [{
                     op: "add",
@@ -262,7 +262,7 @@ metadata:
 
               describe("when saving resolves with success", () => {
                 beforeEach(async () => {
-                  await callForPatchResourceMock.resolve({
+                  await requestPatchKubeResourceMock.resolve({
                     callWasSuccessful: true,
                     response: { name: "some-name", kind: "Namespace" },
                   });
@@ -311,7 +311,7 @@ metadata:
 
               describe("when saving resolves with failure", () => {
                 beforeEach(async () => {
-                  await callForPatchResourceMock.resolve({
+                  await requestPatchKubeResourceMock.resolve({
                     callWasSuccessful: false,
                     error: "some-error",
                   });
@@ -380,7 +380,7 @@ metadata:
 
               describe("when saving resolves with success", () => {
                 beforeEach(async () => {
-                  await callForPatchResourceMock.resolve({
+                  await requestPatchKubeResourceMock.resolve({
                     callWasSuccessful: true,
                     response: { name: "some-name", kind: "Namespace" },
                   });
@@ -399,7 +399,7 @@ metadata:
 
               describe("when saving resolves with failure", () => {
                 beforeEach(async () => {
-                  await callForPatchResourceMock.resolve({
+                  await requestPatchKubeResourceMock.resolve({
                     callWasSuccessful: false,
                     error: "Some error",
                   });
@@ -526,7 +526,7 @@ metadata:
                 });
 
                 it("calls for save with changed configuration", () => {
-                  expect(callForPatchResourceMock).toHaveBeenCalledWith(
+                  expect(requestPatchKubeResourceMock).toHaveBeenCalledWith(
                     someNamespace,
                     [
                       {
@@ -555,7 +555,7 @@ metadata:
                 });
 
                 it("given save resolves and another change in configuration, when saving, calls for save with changed configuration", async () => {
-                  await callForPatchResourceMock.resolve({
+                  await requestPatchKubeResourceMock.resolve({
                     callWasSuccessful: true,
 
                     response: {
@@ -585,7 +585,7 @@ metadata:
                   });
 
 
-                  callForPatchResourceMock.mockClear();
+                  requestPatchKubeResourceMock.mockClear();
 
                   const saveButton = rendered.getByTestId(
                     "save-edit-resource-from-tab-for-some-first-tab-id",
@@ -593,7 +593,7 @@ metadata:
 
                   fireEvent.click(saveButton);
 
-                  expect(callForPatchResourceMock).toHaveBeenCalledWith(
+                  expect(requestPatchKubeResourceMock).toHaveBeenCalledWith(
                     someNamespace,
                     [
                       {
@@ -692,7 +692,7 @@ metadata:
 
             describe("given clicking the context menu for second namespace, when clicking to edit namespace", () => {
               beforeEach(() => {
-                callForResourceMock.mockClear();
+                requestKubeResourceMock.mockClear();
 
                 // TODO: Make implementation match the description
                 const namespaceStub = new Namespace(someOtherNamespaceDataStub);
@@ -725,7 +725,7 @@ metadata:
               });
 
               it("calls for second namespace", () => {
-                expect(callForResourceMock).toHaveBeenCalledWith(
+                expect(requestKubeResourceMock).toHaveBeenCalledWith(
                   "/apis/some-api-version/namespaces/some-other-uid",
                 );
               });
@@ -747,7 +747,7 @@ metadata:
                     },
                   });
 
-                  await callForResourceMock.resolve({
+                  await requestKubeResourceMock.resolve({
                     callWasSuccessful: true,
                     response: someOtherNamespace,
                   });
@@ -773,7 +773,7 @@ metadata:
                 });
 
                 it("when selecting to save, calls for save of second namespace with just the add edit version label", () => {
-                  callForPatchResourceMock.mockClear();
+                  requestPatchKubeResourceMock.mockClear();
 
                   const saveButton = rendered.getByTestId(
                     "save-edit-resource-from-tab-for-some-second-tab-id",
@@ -781,7 +781,7 @@ metadata:
 
                   fireEvent.click(saveButton);
 
-                  expect(callForPatchResourceMock).toHaveBeenCalledWith(
+                  expect(requestPatchKubeResourceMock).toHaveBeenCalledWith(
                     someOtherNamespace,
                     [{
                       op: "add",
@@ -795,7 +795,7 @@ metadata:
 
                 describe("when clicking dock tab for the first namespace", () => {
                   beforeEach(() => {
-                    callForResourceMock.mockClear();
+                    requestKubeResourceMock.mockClear();
 
                     const tab = rendered.getByTestId("dock-tab-for-some-first-tab-id");
 
@@ -825,7 +825,7 @@ metadata:
                   });
 
                   it("does not call for namespace", () => {
-                    expect(callForResourceMock).not.toHaveBeenCalledWith("/apis/some-api-version/namespaces/some-uid");
+                    expect(requestKubeResourceMock).not.toHaveBeenCalledWith("/apis/some-api-version/namespaces/some-uid");
                   });
 
                   it("has configuration in the editor", () => {
@@ -846,7 +846,7 @@ metadata:
                   });
 
                   it("when selecting to save, calls for save of first namespace with just the new edit version label", () => {
-                    callForPatchResourceMock.mockClear();
+                    requestPatchKubeResourceMock.mockClear();
 
                     const saveButton = rendered.getByTestId(
                       "save-edit-resource-from-tab-for-some-first-tab-id",
@@ -854,7 +854,7 @@ metadata:
 
                     fireEvent.click(saveButton);
 
-                    expect(callForPatchResourceMock).toHaveBeenCalledWith(
+                    expect(requestPatchKubeResourceMock).toHaveBeenCalledWith(
                       someNamespace,
                       [ {
                         op: "add",
@@ -872,7 +872,7 @@ metadata:
 
           describe("when call for namespace resolves without namespace", () => {
             beforeEach(async () => {
-              await callForResourceMock.resolve({
+              await requestKubeResourceMock.resolve({
                 callWasSuccessful: true,
                 response: undefined,
               });
@@ -901,7 +901,7 @@ metadata:
 
           describe("when call for namespace resolves with failure", () => {
             beforeEach(async () => {
-              await callForResourceMock.resolve({
+              await requestKubeResourceMock.resolve({
                 callWasSuccessful: false,
                 error: "some-error",
               });

packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx

@@ -8,8 +8,8 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
-import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable";
+import type { RequestKubeResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable";
-import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable";
+import requestKubeResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable";
 import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable";
 import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable";
 import { TabKind } from "../../../renderer/components/dock/dock/store";
@@ -17,14 +17,14 @@ import { Namespace } from "../../../common/k8s-api/endpoints";
 
 describe("cluster/namespaces - edit namespaces from previously opened tab", () => {
   let builder: ApplicationBuilder;
-  let callForNamespaceMock: AsyncFnMock<CallForResource>;
+  let requestKubeResourceMock: AsyncFnMock<RequestKubeResource>;
 
   beforeEach(() => {
     builder = getApplicationBuilder();
 
     builder.setEnvironmentToClusterFrame();
 
-    callForNamespaceMock = asyncFn();
+    requestKubeResourceMock = asyncFn();
 
     builder.beforeWindowStart(({ windowDi }) => {
       windowDi.override(
@@ -32,7 +32,7 @@ describe("cluster/namespaces - edit namespaces from previously opened tab", () =
         () => "/some-directory-for-lens-local-storage",
       );
 
-      windowDi.override(callForResourceInjectable, () => callForNamespaceMock);
+      windowDi.override(requestKubeResourceInjectable, () => requestKubeResourceMock);
     });
 
     builder.afterWindowStart(() => {
@@ -97,7 +97,7 @@ describe("cluster/namespaces - edit namespaces from previously opened tab", () =
     });
 
     it("calls for namespace", () => {
-      expect(callForNamespaceMock).toHaveBeenCalledWith(
+      expect(requestKubeResourceMock).toHaveBeenCalledWith(
         "/apis/some-api-version/namespaces/some-uid",
       );
     });
@@ -122,7 +122,7 @@ describe("cluster/namespaces - edit namespaces from previously opened tab", () =
 
         // TODO: Figure out why act is needed here. In CI it works without it.
         await act(async () => {
-          await callForNamespaceMock.resolve({
+          await requestKubeResourceMock.resolve({
             callWasSuccessful: true,
             response: someNamespace,
           });

packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx

@@ -3,8 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
-import type { CallForResource } from "./call-for-resource.injectable";
+import type { RequestKubeResource } from "./request-kube-resource.injectable";
-import callForResourceInjectable from "./call-for-resource.injectable";
+import requestKubeResourceInjectable from "./request-kube-resource.injectable";
 import { waitUntilDefined } from "@k8slens/utilities";
 import editResourceTabStoreInjectable from "../store.injectable";
 import type { EditingResource, EditResourceTabStore } from "../store";
@@ -12,8 +12,8 @@ import { action, computed, observable, runInAction } from "mobx";
 import type { KubeObject, RawKubeObject } from "../../../../../common/k8s-api/kube-object";
 import yaml from "js-yaml";
 import assert from "assert";
-import type { CallForPatchResource } from "./call-for-patch-resource.injectable";
+import type { RequestPatchKubeResource } from "./request-patch-kube-resource.injectable";
-import callForPatchResourceInjectable from "./call-for-patch-resource.injectable";
+import requestPatchKubeResourceInjectable from "./request-patch-kube-resource.injectable";
 import { createPatch } from "rfc6902";
 import type { ShowNotification } from "../../../notifications";
 import showSuccessNotificationInjectable from "../../../notifications/show-success-notification.injectable";
@@ -28,8 +28,8 @@ const editResourceModelInjectable = getInjectable({
     const store = di.inject(editResourceTabStoreInjectable);
 
     const model = new EditResourceModel({
-      callForResource: di.inject(callForResourceInjectable),
+      callForResource: di.inject(requestKubeResourceInjectable),
-      callForPatchResource: di.inject(callForPatchResourceInjectable),
+      callForPatchResource: di.inject(requestPatchKubeResourceInjectable),
       showSuccessNotification: di.inject(showSuccessNotificationInjectable),
       showErrorNotification: di.inject(showErrorNotificationInjectable),
       store,
@@ -50,8 +50,8 @@ const editResourceModelInjectable = getInjectable({
 export default editResourceModelInjectable;
 
 interface Dependencies {
-  callForResource: CallForResource;
+  callForResource: RequestKubeResource;
-  callForPatchResource: CallForPatchResource;
+  callForPatchResource: RequestPatchKubeResource;
   waitForEditingResource: () => Promise<EditingResource>;
   showSuccessNotification: ShowNotification;
   showErrorNotification: ShowNotification;

packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.global-override-for-injectable.ts

@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getGlobalOverride } from "@k8slens/test-utils";
-import callForResourceInjectable from "./call-for-resource.injectable";
+import requestKubeResourceInjectable from "./request-kube-resource.injectable";
 
-export default getGlobalOverride(callForResourceInjectable, () => () => {
+export default getGlobalOverride(requestKubeResourceInjectable, () => () => {
   throw new Error(
     "Tried to call for kube resource without explicit override.",
   );

packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable.ts

@@ -9,12 +9,12 @@ import type { AsyncResult } from "@k8slens/utilities";
 import { getErrorMessage } from "../../../../../common/utils/get-error-message";
 import apiKubeInjectable from "../../../../k8s/api-kube.injectable";
 
-export type CallForResource = (selfLink: string) => AsyncResult<KubeObject | undefined>;
+export type RequestKubeResource = (selfLink: string) => AsyncResult<KubeObject | undefined>;
 
-const callForResourceInjectable = getInjectable({
+const requestKubeResourceInjectable = getInjectable({
-  id: "call-for-resource",
+  id: "request-kube-resource",
 
-  instantiate: (di): CallForResource => {
+  instantiate: (di): RequestKubeResource => {
     const apiKube = di.inject(apiKubeInjectable);
 
     return async (apiPath: string) => {
@@ -38,4 +38,4 @@ const callForResourceInjectable = getInjectable({
   causesSideEffects: true,
 });
 
-export default callForResourceInjectable;
+export default requestKubeResourceInjectable;

packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.global-override-for-injectable.ts

@@ -3,9 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getGlobalOverride } from "@k8slens/test-utils";
-import callForPatchResourceInjectable from "./call-for-patch-resource.injectable";
+import requestPatchKubeResourceInjectable from "./request-patch-kube-resource.injectable";
 
-export default getGlobalOverride(callForPatchResourceInjectable, () => () => {
+export default getGlobalOverride(requestPatchKubeResourceInjectable, () => () => {
   throw new Error(
     "Tried to call patching of kube resource without explicit override.",
   );

packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable.ts

@@ -10,14 +10,14 @@ import type { KubeObject } from "../../../../../common/k8s-api/kube-object";
 import assert from "assert";
 import { getErrorMessage } from "../../../../../common/utils/get-error-message";
 
-export type CallForPatchResource = (
+export type RequestPatchKubeResource = (
   item: KubeObject,
   patch: JsonPatch
 ) => AsyncResult<{ name: string; kind: string }>;
 
-const callForPatchResourceInjectable = getInjectable({
+const requestPatchKubeResourceInjectable = getInjectable({
-  id: "call-for-patch-resource",
+  id: "request-patch-kube-resource",
-  instantiate: (di): CallForPatchResource => {
+  instantiate: (di): RequestPatchKubeResource => {
     const apiManager = di.inject(apiManagerInjectable);
 
     return async (item, patch) => {
@@ -46,4 +46,4 @@ const callForPatchResourceInjectable = getInjectable({
   causesSideEffects: true,
 });
 
-export default callForPatchResourceInjectable;
+export default requestPatchKubeResourceInjectable;