diff --git a/src/common/k8s-api/endpoints/helm-charts.api/list.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-charts.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-charts.api/list.injectable.ts rename to src/common/k8s-api/endpoints/helm-charts.api/request-charts.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-charts.api/get-readme.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-charts.api/get-readme.injectable.ts rename to src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-charts.api/get-values.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-charts.api/get-values.injectable.ts rename to src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-charts.api/get-versions.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-charts.api/get-versions.injectable.ts rename to src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api.ts b/src/common/k8s-api/endpoints/helm-releases.api.ts index 3806a81534..3460378e59 100644 --- a/src/common/k8s-api/endpoints/helm-releases.api.ts +++ b/src/common/k8s-api/endpoints/helm-releases.api.ts @@ -4,7 +4,7 @@ */ import type { ItemObject } from "../../item.store"; -import type { HelmReleaseDetails } from "./helm-releases.api/get-details.injectable"; +import type { HelmReleaseDetails } from "./helm-releases.api/request-details.injectable"; export interface HelmReleaseUpdateDetails { log: string; diff --git a/src/common/k8s-api/endpoints/helm-releases.api/get-configuration.global-override-for-injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts similarity index 81% rename from src/common/k8s-api/endpoints/helm-releases.api/get-configuration.global-override-for-injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts index 96742bd91b..18b3bd0ec0 100644 --- a/src/common/k8s-api/endpoints/helm-releases.api/get-configuration.global-override-for-injectable.ts +++ b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.global-override-for-injectable.ts @@ -4,7 +4,7 @@ */ import { getGlobalOverride } from "../../../test-utils/get-global-override"; -import requestHelmReleaseConfigurationInjectable from "./get-configuration.injectable"; +import requestHelmReleaseConfigurationInjectable from "./request-configuration.injectable"; export default getGlobalOverride(requestHelmReleaseConfigurationInjectable, () => () => { throw new Error("Tried to call requestHelmReleaseConfiguration with no override"); diff --git a/src/common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts similarity index 97% rename from src/common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts index 3dda676e2f..1bfe168b11 100644 --- a/src/common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable.ts +++ b/src/common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable.ts @@ -24,8 +24,6 @@ const requestHelmReleaseConfigurationInjectable = getInjectable({ apiBase.get(requestConfigurationEnpoint.compile({ name, namespace }, { all })) ); }, - - causesSideEffects: true, }); export default requestHelmReleaseConfigurationInjectable; diff --git a/src/common/k8s-api/endpoints/helm-releases.api/create.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-create.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/create.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-create.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/delete.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-delete.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/delete.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-delete.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/get-details.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-details.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/get-details.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-details.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/get-history.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-history.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/get-history.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-history.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/list.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-releases.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/list.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-releases.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/rollback.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/rollback.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/update.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-update.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/update.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-update.injectable.ts diff --git a/src/common/k8s-api/endpoints/helm-releases.api/get-values.injectable.ts b/src/common/k8s-api/endpoints/helm-releases.api/request-values.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/helm-releases.api/get-values.injectable.ts rename to src/common/k8s-api/endpoints/helm-releases.api/request-values.injectable.ts diff --git a/src/common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts similarity index 92% rename from src/common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts index 7ac6ebfde5..84268e3f6a 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; -import type { RequestMetricsParams } from "./get.injectable"; -import requestMetricsInjectable from "./get.injectable"; +import type { RequestMetricsParams } from "./request-metrics.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface ClusterMetricData { memoryUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-ingress-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts similarity index 94% rename from src/common/k8s-api/endpoints/metrics.api/get-ingress-metrics.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts index f7dabe6031..8167a6bef4 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-ingress-metrics.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface IngressMetricData { bytesSentSuccess: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-metrics-for-all-nodes.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts similarity index 94% rename from src/common/k8s-api/endpoints/metrics.api/get-metrics-for-all-nodes.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts index 25f56ba2e7..6789d6debc 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-metrics-for-all-nodes.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface NodeMetricData { memoryUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-metrics.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/metrics.api/get.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-metrics.injectable.ts diff --git a/src/common/k8s-api/endpoints/metrics.api/get-persistent-volume-claim-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts similarity index 94% rename from src/common/k8s-api/endpoints/metrics.api/get-persistent-volume-claim-metrics.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts index 857de0699d..5cafb5ade0 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-persistent-volume-claim-metrics.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; import type { PersistentVolumeClaim } from "../persistent-volume-claim.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface PersistentVolumeClaimMetricData { diskUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-daemon-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-daemon-sets.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts index 12c7ebd275..d5653574ff 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-daemon-sets.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { DaemonSet } from "../daemon-set.api"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface DaemonSetPodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-deployments.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-deployments.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts index c35345747c..ced8ccd7fe 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-deployments.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { Deployment } from "../deployment.api"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface DeploymentPodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-jobs.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-jobs.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts index 173aac6b1a..a812fae59c 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-jobs.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { Job } from "../job.api"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface JobPodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-replica-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-replica-sets.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts index bf0eb6a9ed..4186cba7b4 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-replica-sets.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; import type { ReplicaSet } from "../replica-set.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface ReplicaSetPodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-stateful-sets.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-stateful-sets.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts index 0cda8e9b09..227961bc02 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-stateful-sets.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; import type { StatefulSet } from "../stateful-set.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface StatefulSetPodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-in-namespace.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts similarity index 94% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-in-namespace.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts index 23fbeac1a9..872ffd740e 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics-in-namespace.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface PodMetricInNamespaceData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts similarity index 95% rename from src/common/k8s-api/endpoints/metrics.api/get-pod-metrics.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts index 6d844aba80..e14e5dc293 100644 --- a/src/common/k8s-api/endpoints/metrics.api/get-pod-metrics.injectable.ts +++ b/src/common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { MetricData } from "../metrics.api"; import type { Pod } from "../pod.api"; -import requestMetricsInjectable from "./get.injectable"; +import requestMetricsInjectable from "./request-metrics.injectable"; export interface PodMetricData { cpuUsage: MetricData; diff --git a/src/common/k8s-api/endpoints/metrics.api/get-providers.injectable.ts b/src/common/k8s-api/endpoints/metrics.api/request-providers.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/metrics.api/get-providers.injectable.ts rename to src/common/k8s-api/endpoints/metrics.api/request-providers.injectable.ts diff --git a/src/common/k8s-api/endpoints/resource-applier.api/patch.injectable.ts b/src/common/k8s-api/endpoints/resource-applier.api/request-patch.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/resource-applier.api/patch.injectable.ts rename to src/common/k8s-api/endpoints/resource-applier.api/request-patch.injectable.ts diff --git a/src/common/k8s-api/endpoints/resource-applier.api/update.injectable.ts b/src/common/k8s-api/endpoints/resource-applier.api/request-update.injectable.ts similarity index 100% rename from src/common/k8s-api/endpoints/resource-applier.api/update.injectable.ts rename to src/common/k8s-api/endpoints/resource-applier.api/request-update.injectable.ts diff --git a/src/common/k8s-api/kube-object.ts b/src/common/k8s-api/kube-object.ts index 02a231cf06..24e34eff4b 100644 --- a/src/common/k8s-api/kube-object.ts +++ b/src/common/k8s-api/kube-object.ts @@ -13,10 +13,10 @@ import type { Patch } from "rfc6902"; import assert from "assert"; import type { JsonObject } from "type-fest"; import { asLegacyGlobalFunctionForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; -import requestKubeObjectPatchInjectable from "./endpoints/resource-applier.api/patch.injectable"; +import requestKubeObjectPatchInjectable from "./endpoints/resource-applier.api/request-patch.injectable"; import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api"; import { apiKubeInjectionToken } from "./api-kube"; -import requestKubeObjectCreationInjectable from "./endpoints/resource-applier.api/update.injectable"; +import requestKubeObjectCreationInjectable from "./endpoints/resource-applier.api/request-update.injectable"; import { dump } from "js-yaml"; export type KubeJsonApiDataFor = K extends KubeObject diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts index 4adf0a65bf..6e1315ab94 100644 --- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts +++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts @@ -10,8 +10,8 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; import getRandomInstallChartTabIdInjectable from "../../../renderer/components/dock/install-chart/get-random-install-chart-tab-id.injectable"; -import type { RequestCreateHelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; -import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; +import type { RequestCreateHelmRelease } from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; +import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; import currentPathInjectable from "../../../renderer/routes/current-path.injectable"; import namespaceStoreInjectable from "../../../renderer/components/+namespaces/store.injectable"; import type { NamespaceStore } from "../../../renderer/components/+namespaces/store"; @@ -21,14 +21,14 @@ import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/h import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; -import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; -import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; +import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; +import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; describe("installing helm chart from new tab", () => { let builder: ApplicationBuilder; diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts index 669b73eca3..978e1635a7 100644 --- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts +++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts @@ -16,11 +16,11 @@ import directoryForLensLocalStorageInjectable from "../../../common/directory-fo import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; import { TabKind } from "../../../renderer/components/dock/dock/store"; import { controlWhenStoragesAreReady } from "../../../renderer/utils/create-storage/storages-are-ready"; -import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; -import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; -import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; +import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; +import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import type { RequestHelmChartValues } from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; +import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; describe("installing helm chart from previously opened tab", () => { let builder: ApplicationBuilder; diff --git a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts index a7f144cdd3..fa37f5d97f 100644 --- a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts +++ b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts @@ -10,18 +10,18 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; import getRandomInstallChartTabIdInjectable from "../../../renderer/components/dock/install-chart/get-random-install-chart-tab-id.injectable"; -import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; +import requestCreateHelmReleaseInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; import { flushPromises } from "../../../common/test-utils/flush-promises"; 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 dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; -import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; +import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import type { RequestHelmChartReadme } from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartReadmeInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import requestHelmChartValuesInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; describe("opening dock tab for installing helm chart", () => { let builder: ApplicationBuilder; diff --git a/src/features/helm-releases/showing-details-for-helm-release.test.ts b/src/features/helm-releases/showing-details-for-helm-release.test.ts index 9ce8024507..f906d2c5ce 100644 --- a/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -9,28 +9,28 @@ import type { RenderResult } from "@testing-library/react"; import { fireEvent } from "@testing-library/react"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { RequestHelmReleases } from "../../common/k8s-api/endpoints/helm-releases.api/list.injectable"; -import requestHelmReleasesInjectable from "../../common/k8s-api/endpoints/helm-releases.api/list.injectable"; +import type { RequestHelmReleases } from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; +import requestHelmReleasesInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; import namespaceStoreInjectable from "../../renderer/components/+namespaces/store.injectable"; import type { NamespaceStore } from "../../renderer/components/+namespaces/store"; -import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable"; -import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable"; -import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/update.injectable"; -import requestHelmReleaseUpdateInjectable from "../../common/k8s-api/endpoints/helm-releases.api/update.injectable"; +import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; +import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; +import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; +import requestHelmReleaseUpdateInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; import { useFakeTime } from "../../common/test-utils/use-fake-time"; import type { RequestDetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable"; import requestDetailedHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable"; import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; import showCheckedErrorInjectable from "../../renderer/components/notifications/show-checked-error.injectable"; import getRandomUpgradeChartTabIdInjectable from "../../renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable"; -import type { RequestHelmCharts } from "../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import type { RequestHelmChartVersions } from "../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import type { RequestHelmChartReadme } from "../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import type { RequestHelmChartValues } from "../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; -import requestHelmChartsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; -import requestHelmChartVersionsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import requestHelmChartReadmeInjectable from "../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; -import requestHelmChartValuesInjectable from "../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; +import type { RequestHelmCharts } from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import type { RequestHelmChartVersions } from "../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import type { RequestHelmChartReadme } from "../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import type { RequestHelmChartValues } from "../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; +import requestHelmChartsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import requestHelmChartVersionsInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartReadmeInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; +import requestHelmChartValuesInjectable from "../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; import { HelmChart } from "../../common/k8s-api/endpoints/helm-charts.api"; describe("showing details for helm release", () => { diff --git a/src/main/get-metrics.injectable.ts b/src/main/get-metrics.injectable.ts index 9e446ef9c5..0ceaf01735 100644 --- a/src/main/get-metrics.injectable.ts +++ b/src/main/get-metrics.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Cluster } from "../common/cluster/cluster"; -import type { RequestMetricsParams } from "../common/k8s-api/endpoints/metrics.api/get.injectable"; +import type { RequestMetricsParams } from "../common/k8s-api/endpoints/metrics.api/request-metrics.injectable"; import k8sRequestInjectable from "./k8s-request.injectable"; export type GetMetrics = (cluster: Cluster, prometheusPath: string, queryParams: RequestMetricsParams & { query: string }) => Promise; diff --git a/src/main/helm/helm-chart-manager.ts b/src/main/helm/helm-chart-manager.ts index 2eae449aea..a584d5db56 100644 --- a/src/main/helm/helm-chart-manager.ts +++ b/src/main/helm/helm-chart-manager.ts @@ -5,7 +5,6 @@ import fs from "fs"; import * as yaml from "js-yaml"; -import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api"; import { iter, put, sortCharts } from "../../common/utils"; import { execHelm } from "./exec"; import type { SetRequired } from "type-fest"; @@ -13,6 +12,7 @@ import { assert } from "console"; import type { HelmRepo } from "../../common/helm/helm-repo"; import type { HelmChartManagerCache } from "./helm-chart-manager-cache.injectable"; import type { Logger } from "../../common/logger"; +import type { RepoHelmChartList } from "../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; export interface HelmCacheFile { apiVersion: string; diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts index 2b19614bb6..6389009785 100644 --- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts +++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.injectable.ts @@ -12,7 +12,7 @@ import clusterApiInjectable from "../../../../common/k8s-api/endpoints/cluster.a import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-created.injectable"; import assert from "assert"; import nodeStoreInjectable from "../../+nodes/store.injectable"; -import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable"; +import requestClusterMetricsByNodeNamesInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; const clusterOverviewStoreInjectable = getInjectable({ id: "cluster-overview-store", diff --git a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts index 23eff55615..2669cb71a6 100644 --- a/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts +++ b/src/renderer/components/+cluster/cluster-overview-store/cluster-overview-store.ts @@ -9,8 +9,8 @@ import type { Cluster, ClusterApi } from "../../../../common/k8s-api/endpoints"; import type { StorageLayer } from "../../../utils"; import { autoBind } from "../../../utils"; import type { NodeStore } from "../../+nodes/store"; -import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../../common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable"; -import type { RequestMetricsParams } from "../../../../common/k8s-api/endpoints/metrics.api/get.injectable"; +import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; +import type { RequestMetricsParams } from "../../../../common/k8s-api/endpoints/metrics.api/request-metrics.injectable"; import { normalizeMetrics } from "../../../../common/k8s-api/endpoints/metrics.api"; export enum MetricType { diff --git a/src/renderer/components/+cluster/cluster-pie-charts.tsx b/src/renderer/components/+cluster/cluster-pie-charts.tsx index 108fd6a11f..fc18e26d18 100644 --- a/src/renderer/components/+cluster/cluster-pie-charts.tsx +++ b/src/renderer/components/+cluster/cluster-pie-charts.tsx @@ -23,7 +23,7 @@ import clusterOverviewStoreInjectable from "./cluster-overview-store/cluster-ove import nodeStoreInjectable from "../+nodes/store.injectable"; import type { IComputedValue } from "mobx"; import activeThemeInjectable from "../../themes/active.injectable"; -import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable"; +import type { ClusterMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; function createLabels(rawLabelData: [string, number | undefined][]): string[] { return rawLabelData.map(([key, value]) => `${key}: ${value?.toFixed(2) || "N/A"}`); diff --git a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts index f551c15966..9b639beca2 100644 --- a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts +++ b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; import helmChartDetailsVersionSelectionInjectable from "./versions/helm-chart-details-version-selection.injectable"; import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api"; -import requestHelmChartReadmeInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/get-readme.injectable"; +import requestHelmChartReadmeInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-readme.injectable"; const readmeOfSelectedHelmChartInjectable = getInjectable({ id: "readme-of-selected-helm-chart", diff --git a/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts b/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts index 2058d6bde5..290fc90b65 100644 --- a/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts +++ b/src/renderer/components/+helm-charts/details/versions-of-selected-helm-chart.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api"; -import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; +import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; const versionsOfSelectedHelmChartInjectable = getInjectable({ id: "versions-of-selected-helm-chart", diff --git a/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts index 389762f306..af9c02363d 100644 --- a/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts +++ b/src/renderer/components/+helm-charts/helm-charts/helm-charts.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; -import requestHelmChartsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/list.injectable"; +import requestHelmChartsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; const helmChartsInjectable = getInjectable({ id: "helm-charts", diff --git a/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts b/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts index 3cf987176f..2a195b6758 100644 --- a/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts +++ b/src/renderer/components/+helm-charts/helm-charts/versions.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; import { when } from "mobx"; import { coerce } from "semver"; -import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; +import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import { sortCompareChartVersions } from "../../../utils"; import helmChartsInjectable from "./helm-charts.injectable"; diff --git a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts index 793e564188..515895abec 100644 --- a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts +++ b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts @@ -5,8 +5,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import releasesInjectable from "../releases.injectable"; -import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; -import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; +import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; +import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; const createReleaseInjectable = getInjectable({ id: "create-release", diff --git a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts index 9b2328fb98..f84416b01a 100644 --- a/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts +++ b/src/renderer/components/+helm-releases/delete-release/delete-release.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import requestDeleteHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/delete.injectable"; +import requestDeleteHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-delete.injectable"; import releasesInjectable from "../releases.injectable"; const deleteReleaseInjectable = getInjectable({ diff --git a/src/renderer/components/+helm-releases/dialog/dialog.tsx b/src/renderer/components/+helm-releases/dialog/dialog.tsx index 2c9d87c1fc..9a7c3373d4 100644 --- a/src/renderer/components/+helm-releases/dialog/dialog.tsx +++ b/src/renderer/components/+helm-releases/dialog/dialog.tsx @@ -20,8 +20,8 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import releaseRollbackDialogStateInjectable from "./state.injectable"; import type { RollbackRelease } from "../rollback-release/rollback-release.injectable"; import rollbackReleaseInjectable from "../rollback-release/rollback-release.injectable"; -import type { HelmReleaseRevision, RequestHelmReleaseHistory } from "../../../../common/k8s-api/endpoints/helm-releases.api/get-history.injectable"; -import requestHelmReleaseHistoryInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/get-history.injectable"; +import type { HelmReleaseRevision, RequestHelmReleaseHistory } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-history.injectable"; +import requestHelmReleaseHistoryInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-history.injectable"; export interface ReleaseRollbackDialogProps extends DialogProps { } diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx index 13a8ad5e9b..66461ccd02 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx @@ -9,14 +9,14 @@ import type { TargetHelmRelease } from "../target-helm-release.injectable"; import type { RequestDetailedHelmRelease, DetailedHelmRelease } from "./request-detailed-helm-release.injectable"; import requestDetailedHelmReleaseInjectable from "./request-detailed-helm-release.injectable"; import type { LensTheme } from "../../../../themes/store"; -import type { RequestHelmReleaseConfiguration } from "../../../../../common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable"; -import requestHelmReleaseConfigurationInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable"; +import type { RequestHelmReleaseConfiguration } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; +import requestHelmReleaseConfigurationInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import { pipeline } from "@ogre-tools/fp"; import { groupBy, map } from "lodash/fp"; import type { KubeJsonApiData } from "../../../../../common/k8s-api/kube-json-api"; import type { GetResourceDetailsUrl } from "./get-resource-details-url.injectable"; import getResourceDetailsUrlInjectable from "./get-resource-details-url.injectable"; -import type { RequestHelmReleaseUpdate } from "../../../../../common/k8s-api/endpoints/helm-releases.api/update.injectable"; +import type { RequestHelmReleaseUpdate } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; import updateReleaseInjectable from "../../update-release/update-release.injectable"; import type { ShowCheckedErrorNotification } from "../../../notifications/show-checked-error.injectable"; import showCheckedErrorNotificationInjectable from "../../../notifications/show-checked-error.injectable"; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts index 1e946d08ab..6c7da31f97 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/request-detailed-helm-release.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { HelmReleaseDto } from "../../../../../common/k8s-api/endpoints/helm-releases.api"; -import requestHelmReleasesInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/list.injectable"; -import type { HelmReleaseDetails } from "../../../../../common/k8s-api/endpoints/helm-releases.api/get-details.injectable"; -import requestHelmReleaseDetailsInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/get-details.injectable"; +import requestHelmReleasesInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; +import type { HelmReleaseDetails } from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-details.injectable"; +import requestHelmReleaseDetailsInjectable from "../../../../../common/k8s-api/endpoints/helm-releases.api/request-details.injectable"; import type { AsyncResult } from "../../../../../common/utils/async-result"; export interface DetailedHelmRelease { diff --git a/src/renderer/components/+helm-releases/releases.injectable.ts b/src/renderer/components/+helm-releases/releases.injectable.ts index dcbb0296f6..63014d43b8 100644 --- a/src/renderer/components/+helm-releases/releases.injectable.ts +++ b/src/renderer/components/+helm-releases/releases.injectable.ts @@ -7,7 +7,7 @@ import { asyncComputed } from "@ogre-tools/injectable-react"; import namespaceStoreInjectable from "../+namespaces/store.injectable"; import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable"; import releaseSecretsInjectable from "./release-secrets.injectable"; -import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/list.injectable"; +import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; import toHelmReleaseInjectable from "./to-helm-release.injectable"; const releasesInjectable = getInjectable({ diff --git a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts b/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts index 8bc47de8da..fabac39316 100644 --- a/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts +++ b/src/renderer/components/+helm-releases/rollback-release/rollback-release.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import requestHelmReleaseRollbackInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/rollback.injectable"; +import requestHelmReleaseRollbackInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-rollback.injectable"; import releasesInjectable from "../releases.injectable"; export type RollbackRelease = (name: string, namespace: string, revision: number) => Promise; diff --git a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts index f12a50fbc6..8cdcbfafe1 100644 --- a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts +++ b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import releasesInjectable from "../releases.injectable"; -import type { RequestHelmReleaseUpdate } from "../../../../common/k8s-api/endpoints/helm-releases.api/update.injectable"; -import requestHelmReleaseUpdateInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/update.injectable"; +import type { RequestHelmReleaseUpdate } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; +import requestHelmReleaseUpdateInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; const updateReleaseInjectable = getInjectable({ id: "update-release", diff --git a/src/renderer/components/+namespaces/namespace-details.tsx b/src/renderer/components/+namespaces/namespace-details.tsx index 7043f98ea5..a11d7f26a5 100644 --- a/src/renderer/components/+namespaces/namespace-details.tsx +++ b/src/renderer/components/+namespaces/namespace-details.tsx @@ -31,8 +31,8 @@ import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-activ import getDetailsUrlInjectable from "../kube-detail-params/get-details-url.injectable"; import limitRangeStoreInjectable from "../+config-limit-ranges/store.injectable"; import resourceQuotaStoreInjectable from "../+config-resource-quotas/store.injectable"; -import type { PodMetricInNamespaceData, RequestPodMetricsInNamespace } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-in-namespace.injectable"; -import requestPodMetricsInNamespaceInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-in-namespace.injectable"; +import type { PodMetricInNamespaceData, RequestPodMetricsInNamespace } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable"; +import requestPodMetricsInNamespaceInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-in-namespace.injectable"; export interface NamespaceDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+network-ingresses/ingress-details.tsx b/src/renderer/components/+network-ingresses/ingress-details.tsx index 62e5e271cd..e8b916cac2 100644 --- a/src/renderer/components/+network-ingresses/ingress-details.tsx +++ b/src/renderer/components/+network-ingresses/ingress-details.tsx @@ -20,9 +20,9 @@ import { computeRuleDeclarations } from "../../../common/k8s-api/endpoints/ingre import { getActiveClusterEntity } from "../../api/catalog/entity/legacy-globals"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import logger from "../../../common/logger"; -import type { IngressMetricData, RequestIngressMetrics } from "../../../common/k8s-api/endpoints/metrics.api/get-ingress-metrics.injectable"; +import type { IngressMetricData, RequestIngressMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import requestIngressMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-ingress-metrics.injectable"; +import requestIngressMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-ingress-metrics.injectable"; export interface IngressDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+nodes/details.tsx b/src/renderer/components/+nodes/details.tsx index b9666e2ceb..f71d5bfa5f 100644 --- a/src/renderer/components/+nodes/details.tsx +++ b/src/renderer/components/+nodes/details.tsx @@ -29,8 +29,8 @@ import type { PodStore } from "../+workloads-pods/store"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable"; -import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-cluster-metrics-by-node-names.injectable"; +import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; +import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; export interface NodeDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+nodes/route.tsx b/src/renderer/components/+nodes/route.tsx index 4a2fc903e3..a868dda39b 100644 --- a/src/renderer/components/+nodes/route.tsx +++ b/src/renderer/components/+nodes/route.tsx @@ -20,11 +20,11 @@ import { KubeObjectStatusIcon } from "../kube-object-status-icon"; import { Badge } from "../badge/badge"; import { makeObservable, observable } from "mobx"; import { KubeObjectAge } from "../kube-object/age"; -import type { NodeMetricData, RequestAllNodeMetrics } from "../../../common/k8s-api/endpoints/metrics.api/get-metrics-for-all-nodes.injectable"; +import type { NodeMetricData, RequestAllNodeMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable"; import type { NodeStore } from "./store"; import { withInjectables } from "@ogre-tools/injectable-react"; import nodeStoreInjectable from "./store.injectable"; -import requestAllNodeMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-metrics-for-all-nodes.injectable"; +import requestAllNodeMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-metrics-for-all-nodes.injectable"; import eventStoreInjectable from "../+events/store.injectable"; import type { EventStore } from "../+events/store"; diff --git a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx index 36dbf76299..4cb013e5d6 100644 --- a/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx +++ b/src/renderer/components/+storage-volume-claims/volume-claim-details.tsx @@ -18,9 +18,9 @@ import { PersistentVolumeClaim } from "../../../common/k8s-api/endpoints"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { KubeObjectMeta } from "../kube-object-meta"; import logger from "../../../common/logger"; -import type { PersistentVolumeClaimMetricData, RequestPersistentVolumeClaimMetrics } from "../../../common/k8s-api/endpoints/metrics.api/get-persistent-volume-claim-metrics.injectable"; +import type { PersistentVolumeClaimMetricData, RequestPersistentVolumeClaimMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import requestPersistentVolumeClaimMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-persistent-volume-claim-metrics.injectable"; +import requestPersistentVolumeClaimMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-persistent-volume-claim-metrics.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import type { PodStore } from "../+workloads-pods/store"; diff --git a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx index 39c19ff3b9..40c6026659 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx +++ b/src/renderer/components/+workloads-daemonsets/daemonset-details.tsx @@ -30,8 +30,8 @@ import daemonSetStoreInjectable from "./store.injectable"; import podStoreInjectable from "../+workloads-pods/store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { DaemonSetPodMetricData, RequestPodMetricsForDaemonSets } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-daemon-sets.injectable"; -import requestPodMetricsForDaemonSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-daemon-sets.injectable"; +import type { DaemonSetPodMetricData, RequestPodMetricsForDaemonSets } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable"; +import requestPodMetricsForDaemonSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-daemon-sets.injectable"; export interface DaemonSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+workloads-deployments/deployment-details.tsx b/src/renderer/components/+workloads-deployments/deployment-details.tsx index 4a4a1b68d6..d21d7648d1 100644 --- a/src/renderer/components/+workloads-deployments/deployment-details.tsx +++ b/src/renderer/components/+workloads-deployments/deployment-details.tsx @@ -33,8 +33,8 @@ import replicaSetStoreInjectable from "../+workloads-replicasets/store.injectabl import deploymentStoreInjectable from "./store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { DeploymentPodMetricData, RequestPodMetricsForDeployments } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-deployments.injectable"; -import requestPodMetricsForDeploymentsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-deployments.injectable"; +import type { DeploymentPodMetricData, RequestPodMetricsForDeployments } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable"; +import requestPodMetricsForDeploymentsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-deployments.injectable"; export interface DeploymentDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+workloads-jobs/job-details.tsx b/src/renderer/components/+workloads-jobs/job-details.tsx index 106ad46ca3..fbfb272eab 100644 --- a/src/renderer/components/+workloads-jobs/job-details.tsx +++ b/src/renderer/components/+workloads-jobs/job-details.tsx @@ -31,8 +31,8 @@ import podStoreInjectable from "../+workloads-pods/store.injectable"; import jobStoreInjectable from "./store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { JobPodMetricData, RequestPodMetricsForJobs } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-jobs.injectable"; -import requestPodMetricsForJobsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-jobs.injectable"; +import type { JobPodMetricData, RequestPodMetricsForJobs } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable"; +import requestPodMetricsForJobsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-jobs.injectable"; export interface JobDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+workloads-pods/pod-details.tsx b/src/renderer/components/+workloads-pods/pod-details.tsx index 0e21f09c4a..081696bd12 100644 --- a/src/renderer/components/+workloads-pods/pod-details.tsx +++ b/src/renderer/components/+workloads-pods/pod-details.tsx @@ -27,9 +27,9 @@ import { KubeObjectMeta } from "../kube-object-meta"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import logger from "../../../common/logger"; import { PodVolumes } from "./details/volumes/view"; -import type { PodMetricData, RequestPodMetrics } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics.injectable"; +import type { PodMetricData, RequestPodMetrics } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import requestPodMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics.injectable"; +import requestPodMetricsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import type { GetDetailsUrl } from "../kube-detail-params/get-details-url.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; diff --git a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx index 08395330f3..cf92b7976c 100644 --- a/src/renderer/components/+workloads-replicasets/replicaset-details.tsx +++ b/src/renderer/components/+workloads-replicasets/replicaset-details.tsx @@ -29,8 +29,8 @@ import type { ReplicaSetStore } from "./store"; import replicaSetStoreInjectable from "./store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { ReplicaSetPodMetricData, RequestPodMetricsForReplicaSets } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-replica-sets.injectable"; -import requestPodMetricsForReplicaSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-replica-sets.injectable"; +import type { ReplicaSetPodMetricData, RequestPodMetricsForReplicaSets } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable"; +import requestPodMetricsForReplicaSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-replica-sets.injectable"; export interface ReplicaSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx index 1353470d17..83fb856619 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx +++ b/src/renderer/components/+workloads-statefulsets/statefulset-details.tsx @@ -30,8 +30,8 @@ import podStoreInjectable from "../+workloads-pods/store.injectable"; import statefulSetStoreInjectable from "./store.injectable"; import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; -import type { RequestPodMetricsForStatefulSets, StatefulSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-stateful-sets.injectable"; -import requestPodMetricsForStatefulSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/get-pod-metrics-for-stateful-sets.injectable"; +import type { RequestPodMetricsForStatefulSets, StatefulSetPodMetricData } from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable"; +import requestPodMetricsForStatefulSetsInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-pod-metrics-for-stateful-sets.injectable"; export interface StatefulSetDetailsProps extends KubeObjectDetailsProps { } diff --git a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx index aa25b2c1f1..0a07aa030a 100644 --- a/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-prometheus-setting.tsx @@ -12,9 +12,9 @@ import { Select } from "../../select"; import { Input } from "../../input"; import { observable, computed, autorun, makeObservable } from "mobx"; import { Spinner } from "../../spinner"; -import type { MetricProviderInfo, RequestMetricsProviders } from "../../../../common/k8s-api/endpoints/metrics.api/get-providers.injectable"; +import type { MetricProviderInfo, RequestMetricsProviders } from "../../../../common/k8s-api/endpoints/metrics.api/request-providers.injectable"; import { withInjectables } from "@ogre-tools/injectable-react"; -import requestMetricsProvidersInjectable from "../../../../common/k8s-api/endpoints/metrics.api/get-providers.injectable"; +import requestMetricsProvidersInjectable from "../../../../common/k8s-api/endpoints/metrics.api/request-providers.injectable"; import productNameInjectable from "../../../../common/vars/product-name.injectable"; export interface ClusterPrometheusSettingProps { diff --git a/src/renderer/components/dock/create-resource/view.tsx b/src/renderer/components/dock/create-resource/view.tsx index 525ca325ea..d84a823259 100644 --- a/src/renderer/components/dock/create-resource/view.tsx +++ b/src/renderer/components/dock/create-resource/view.tsx @@ -27,8 +27,8 @@ import type { GetDetailsUrl } from "../../kube-detail-params/get-details-url.inj import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable"; import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.injectable"; import navigateInjectable from "../../../navigation/navigate.injectable"; -import type { RequestKubeObjectCreation } from "../../../../common/k8s-api/endpoints/resource-applier.api/update.injectable"; -import requestKubeObjectCreationInjectable from "../../../../common/k8s-api/endpoints/resource-applier.api/update.injectable"; +import type { RequestKubeObjectCreation } from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable"; +import requestKubeObjectCreationInjectable from "../../../../common/k8s-api/endpoints/resource-applier.api/request-update.injectable"; export interface CreateResourceProps { tabId: string; diff --git a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx index fa001f1bbb..0db94fbd59 100644 --- a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx +++ b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx @@ -10,17 +10,17 @@ import type { HelmChart } from "../../../../common/k8s-api/endpoints/helm-charts import React from "react"; import { action, computed, observable, runInAction } from "mobx"; import assert from "assert"; -import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; -import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/create.injectable"; +import type { RequestCreateHelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; +import requestCreateHelmReleaseInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-create.injectable"; import type { HelmReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import dockStoreInjectable from "../dock/store.injectable"; import type { NavigateToHelmReleases } from "../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; import navigateToHelmReleasesInjectable from "../../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; import type { SingleValue } from "react-select"; -import type { RequestHelmChartValues } from "../../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; -import requestHelmChartValuesInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/get-values.injectable"; -import type { RequestHelmChartVersions } from "../../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; -import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/get-versions.injectable"; +import type { RequestHelmChartValues } from "../../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; +import requestHelmChartValuesInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-values.injectable"; +import type { RequestHelmChartVersions } from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartVersionsInjectable from "../../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; const installChartModelInjectable = getInjectable({ id: "install-chart-model", diff --git a/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts index ef971891f1..e7453a9d01 100644 --- a/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts @@ -12,7 +12,7 @@ import helmChartVersionsInjectable from "../../+helm-charts/helm-charts/versions import releasesInjectable from "../../+helm-releases/releases.injectable"; import updateReleaseInjectable from "../../+helm-releases/update-release/update-release.injectable"; import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import requestHelmReleaseConfigurationInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/get-configuration.injectable"; +import requestHelmReleaseConfigurationInjectable from "../../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import { waitUntilDefined } from "../../../utils"; import type { SelectOption } from "../../select"; import type { DockTab } from "../dock/store";