Fix allowed resources checks on GKE (#6657)

* Add check for incomplete SelfSubjectRulesReview to fix GKE Signed-off-by: Sebastian Malton <sebastian@malton.name> * Adding namespaced for KubeApiResource Signed-off-by: Sebastian Malton <sebastian@malton.name> * Refactoring of AuthorizationNamespaceReview Signed-off-by: Sebastian Malton <sebastian@malton.name> * Removing dead code Signed-off-by: Sebastian Malton <sebastian@malton.name> * Refactoring ListApiResources Signed-off-by: Sebastian Malton <sebastian@malton.name> * Extract ClusterContext into deps for KubeObjectStore to fix circular import Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix remaining type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crash in frame by consolidating setup into runnables Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type errors and remove dead code Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix core resources not showing up Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix namespaces not being shown Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify ClusterContext to remove something only NamespaceStore needs Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make sure the public API doesn't change Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fixing namespace-select-filter tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix other tests requiring overrides Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix kludge in cluster-frame tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix remaining test failures Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix integration test due to incorrect casting Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix integration test and kube watches not working at all Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix secret details test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix non-ApplicationBuilder tests by adding overrides Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crash due to trying to read hostedCluster too soon Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix crash due to timing issues - Make injectable phases more explicit for renderer Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2022-12-20 17:20:27 +02:00
1 parent e36f3d2d70
commit 443081493b
@@ -13,8 +13,8 @@ import { observer } from "mobx-react";
 import type { CreateResourceTabStore } from "./store";
 import { EditorPanel } from "../editor-panel";
 import { InfoPanel } from "../info-panel";
-import { Notifications } from "../../notifications";
-import logger from "../../../../common/logger";
+import type { ShowNotification } from "../../notifications";
+import type { Logger } from "../../../../common/logger";
 import type { ApiManager } from "../../../../common/k8s-api/api-manager";
 import { isObject, prevDefault } from "../../../utils";
 import { withInjectables } from "@ogre-tools/injectable-react";
@@ -29,6 +29,10 @@ import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.in
 import navigateInjectable from "../../../navigation/navigate.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";
+import loggerInjectable from "../../../../common/logger.injectable";
+import type { ShowCheckedErrorNotification } from "../../notifications/show-checked-error.injectable";
+import showSuccessNotificationInjectable from "../../notifications/show-success-notification.injectable";
+import showCheckedErrorNotificationInjectable from "../../notifications/show-checked-error.injectable";

 export interface CreateResourceProps {
  tabId: string;
@@ -38,9 +42,12 @@ interface Dependencies {
  createResourceTemplates: IComputedValue<GroupBase<{ label: string; value: string }>[]>;
  createResourceTabStore: CreateResourceTabStore;
  apiManager: ApiManager;
+  logger: Logger;
  navigate: Navigate;
  getDetailsUrl: GetDetailsUrl;
  requestKubeObjectCreation: RequestKubeObjectCreation;
+  showSuccessNotification: ShowNotification;
+  showCheckedErrorNotification: ShowCheckedErrorNotification;
 }

@observer
@@ -81,34 +88,38 @@ class NonInjectedCreateResource extends React.Component<CreateResourceProps & De
    const resources = yaml.loadAll(this.data).filter(isObject);

    if (resources.length === 0) {
-      return void logger.info("Nothing to create");
+      return this.props.logger.info("Nothing to create");
    }

    const creatingResources = resources.map(async (resource) => {
-      try {
-        const data = await requestKubeObjectCreation(dump(resource));
-        const { kind, apiVersion, metadata: { name, namespace }} = data;
+      const result = await requestKubeObjectCreation(dump(resource));

-        const showDetails = () => {
-          const resourceLink = apiManager.lookupApiLink({ kind, apiVersion, name, namespace });
+      if (!result.callWasSuccessful) {
+        this.props.logger.warn("Failed to create resource", { resource }, result.error);
+        this.props.showCheckedErrorNotification(result.error, "Unknown error occured while creating resources");

-          navigate(getDetailsUrl(resourceLink));
-          close();
-        };
-
-        const close = Notifications.ok(
-          <p>
-            {kind}
-            {" "}
-            <a onClick={prevDefault(showDetails)}>
-              {name}
-            </a>
-            {" successfully created."}
-          </p>,
-        );
-      } catch (error) {
-        Notifications.checkedError(error, "Unknown error occured while creating resources");
+        return;
      }
+
+      const { kind, apiVersion, metadata: { name, namespace }} = result.response;
+
+      const close = this.props.showSuccessNotification((
+        <p>
+          {kind}
+          {" "}
+          <a
+            onClick={prevDefault(() => {
+              const resourceLink = apiManager.lookupApiLink({ kind, apiVersion, name, namespace });
+
+              navigate(getDetailsUrl(resourceLink));
+              close();
+            })}
+          >
+            {name}
+          </a>
+          {" successfully created."}
+        </p>
+      ));
    });

    await Promise.allSettled(creatingResources);
@@ -168,8 +179,11 @@ export const CreateResource = withInjectables<Dependencies, CreateResourceProps>
    createResourceTabStore: di.inject(createResourceTabStoreInjectable),
    createResourceTemplates: await di.inject(createResourceTemplatesInjectable),
    apiManager: di.inject(apiManagerInjectable),
+    logger: di.inject(loggerInjectable),
    getDetailsUrl: di.inject(getDetailsUrlInjectable),
    navigate: di.inject(navigateInjectable),
    requestKubeObjectCreation: di.inject(requestKubeObjectCreationInjectable),
+    showSuccessNotification: di.inject(showSuccessNotificationInjectable),
+    showCheckedErrorNotification: di.inject(showCheckedErrorNotificationInjectable),
  }),
 });