@kumori/aurora-backend-handler 1.1.105 → 1.1.106

package/api/account-api-service.ts

@@ -1,4 +1,4 @@
-import { Account, errors, Notification } from "@kumori/aurora-interfaces";
+import { Account, getWuiErrorCode, Notification } from "@kumori/aurora-interfaces";
 import {
   initializeGlobalWebSocketClient,
   getWebSocketStatus,
@@ -637,14 +637,14 @@ export const createAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: errors.account.creationError.subtype,
+      subtype: getWuiErrorCode("account", "createAccount", code) ?? "account-creation-error",
       info_content: {
         code,
         message,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,
@@ -736,10 +736,10 @@ export const deleteAccount = async (account: Account, security: Security) => {
 
     const accountNotification: Notification = {
       type: "success",
-      subtype: errors.account.deleting.subtype,
+      subtype: "account-deleting",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,
@@ -754,14 +754,14 @@ export const deleteAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: errors.account.deletionError.subtype,
+      subtype: getWuiErrorCode("account", "deleteAccount", code) ?? "account-deletion-error",
       date: Date.now().toString(),
       info_content: {
         code,
         message,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,
@@ -797,10 +797,10 @@ export const clearAccount = async (account: Account, security: Security) => {
     eventHelper.account.publish.cleaned(updatedAccount);
     const accountNotification: Notification = {
       type: "success",
-      subtype: errors.account.cleaned.subtype,
+      subtype: "account-cleaned",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,
@@ -815,14 +815,14 @@ export const clearAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: errors.account.cleanError.subtype,
+      subtype: getWuiErrorCode("account", "deleteAccount", code) ?? "account-clean-error",
       date: Date.now().toString(),
       info_content: {
         code,
         message,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,
@@ -1433,14 +1433,14 @@ export const updateAccount = async (account: Account, security: Security) => {
 
     const accountErrorNotification: Notification = {
       type: "error",
-      subtype: errors.account.updateError.subtype,
+      subtype: getWuiErrorCode("account", "updateAccount", code) ?? "account-update-error",
       date: Date.now().toString(),
       info_content: {
         code,
         message,
       },
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         account: account.name,
         tenant: account.tenant,

package/api/deploy-service-helper.ts

@@ -227,21 +227,13 @@ interface Port<VARIANT> {
 interface Certificate<VARIANT> {
   certificate: VARIANT;
 }
-type ComponentFilesystemDto =
-  | FilesystemVolumeDto
-  | FilesystemSecretDto
-  | FilesystemFileDto;
+type ComponentFilesystemDto = FilesystemVolumeDto | FilesystemFileDto;
 
 interface FilesystemVolumeDto {
   path: string;
   resourceVolume: string;
 }
 
-interface FilesystemSecretDto {
-  path: string;
-  resourceSecret: string;
-}
-
 interface FilesystemFileDto {
   path: string;
   param?: string;
@@ -420,17 +412,10 @@ export function handleParametersToGenerateData(
     switch (resource.type) {
       case "secret":
         resourcesResult.push({ secret: { name: resource.name } });
-        if (resource.key) {
-          fileSystemResult.push({
-            path: resource.key,
-            resourceSecret: resource.name,
-          });
-        } else {
-          environmentResult.push({
-            varName: resource.name,
-            secret: resource.name as string,
-          });
-        }
+        environmentResult.push({
+          varName: resource.name,
+          secret: resource.name as string,
+        });
         break;
       case "volume":
         resourcesResult.push({ volume: { name: resource.name } });
@@ -518,20 +503,12 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
       })),
     },
     environment: [service.environment],
-    fileSystem: [
-      ...service.resources
-        .filter((resource) => resource.type === "volume")
-        .map((resource) => ({
-          path: resource.key,
-          resourceVolume: resource.name,
-        })),
-      ...service.resources
-        .filter((resource) => resource.type === "secret" && resource.key)
-        .map((resource) => ({
-          path: resource.key,
-          resourceSecret: resource.name,
-        })),
-    ],
+    fileSystem: service.resources
+      .filter((resource) => resource.type === "volume")
+      .map((resource) => ({
+        path: resource.key,
+        resourceVolume: resource.name,
+      })),
     scaling: service.role[0].scalling,
     hsize: service.role[0].hsize
   };

package/api/environment-api-service.ts

@@ -1,5 +1,5 @@
 
-import { Environment, errors, Notification } from "@kumori/aurora-interfaces";
+import { Environment, getWuiErrorCode, Notification } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 import {
   initializeGlobalWebSocketClient,
@@ -132,14 +132,14 @@ export const createEnvironment = async (
     }
     const envErrorNotification: Notification = {
       type: "error",
-      subtype: errors.environment.creationError.subtype,
+      subtype: getWuiErrorCode("environment", "createEnvironment", contentMessage) ?? "environment-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -182,10 +182,10 @@ export const deleteEnvironment = async (
     // eventHelper.environment.publish.deleted(updatedEnv);
     const envNotification: Notification = {
       type: "success",
-      subtype: errors.environment.deleting.subtype,
+      subtype: "environment-deleting",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -222,14 +222,14 @@ export const deleteEnvironment = async (
     }
     const envErrorNotification: Notification = {
       type: "error",
-      subtype: errors.environment.deletionError.subtype,
+      subtype: getWuiErrorCode("environment", "deleteEnvironment", contentMessage) ?? "environment-deletion-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -249,10 +249,10 @@ export const clearEnvironment = async (
   try {
     const envNotification: Notification = {
       type: "info",
-      subtype: errors.environment.purging.subtype,
+      subtype: "environment-cleaning",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -314,14 +314,14 @@ export const clearEnvironment = async (
     }
     const envErrorNotification: Notification = {
       type: "error",
-      subtype: errors.environment.purgeError.subtype,
+      subtype: getWuiErrorCode("environment", "deleteEnvironment", contentMessage) ?? "environment-cleaning-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -412,10 +412,10 @@ export const updateEnvironment = async (
     eventHelper.environment.publish.updated(updatedEnv);
     const envNotification: Notification = {
       type: "success",
-      subtype: errors.environment.updated.subtype,
+      subtype: "environment-updated",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -452,14 +452,14 @@ export const updateEnvironment = async (
     }
     const envErrorNotification: Notification = {
       type: "error",
-      subtype: errors.environment.updateError.subtype,
+      subtype: getWuiErrorCode("environment", "updateEnvironment", contentMessage) ?? "environment-update-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -497,10 +497,10 @@ export const scaleEnvironment = async (
     eventHelper.environment.publish.scaled(env);
     const envNotification: Notification = {
       type: "success",
-      subtype: errors.environment.scaled.subtype,
+      subtype: "environment-scaled",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,
@@ -531,14 +531,14 @@ export const scaleEnvironment = async (
     }
     const envErrorNotification: Notification = {
       type: "error",
-      subtype: errors.environment.scaleError.subtype,
+      subtype: getWuiErrorCode("environment", "scaleEnvironment", contentMessage) ?? "environment-scale-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         environment: env.name,
         account: env.account,

package/api/marketplace-api-service.ts

@@ -1,5 +1,5 @@
 import {
-  errors,
+  getWuiErrorCode,
   Link,
   MarketplaceItem,
   MarketplaceService,
@@ -939,10 +939,10 @@ const linkPendingServices = async (service: Service, token: string) => {
 
           const notification: Notification = {
             type: "success",
-            subtype: errors.service.linked.subtype,
+            subtype: "service-linked",
             date: Date.now().toString(),
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,
@@ -954,14 +954,14 @@ const linkPendingServices = async (service: Service, token: string) => {
         } catch (linkErr) {
           const notification: Notification = {
             type: "error",
-            subtype: errors.service.linkError.subtype,
+            subtype: getWuiErrorCode("service", "linkService", (linkErr as any).error.code) ?? "error-service-link",
             date: Date.now().toString(),
             info_content: {
               code: (linkErr as any).error.code,
               message: (linkErr as any).error.content,
             },
             status: "unread",
-            callToAction: false,
+            notificationType: "regular",
             data: {
               service: service.name,
               tenant: service.tenant,

package/api/resources-api-service.ts

@@ -1,4 +1,4 @@
-import { errors, Notification, Resource } from "@kumori/aurora-interfaces";
+import { getWuiErrorCode, Notification, Resource } from "@kumori/aurora-interfaces";
 import { eventHelper } from "../backend-handler";
 
 import {
@@ -50,10 +50,10 @@ export const createDomain = async (
     // eventHelper.resource.publish.created(domain);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: domain.name,
         tenant: tenant
@@ -87,14 +87,14 @@ export const createDomain = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: domain.name,
         tenant: tenant
@@ -130,10 +130,10 @@ export const createPort = async (
     eventHelper.resource.publish.created(port);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: port.name,
         tenant: tenant
@@ -167,14 +167,14 @@ export const createPort = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: port.name,
         tenant: tenant
@@ -210,10 +210,10 @@ export const createCA = async (
     eventHelper.resource.publish.created(ca);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: ca.name,
         tenant: tenant
@@ -247,14 +247,14 @@ export const createCA = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: ca.name,
         tenant: tenant
@@ -303,10 +303,10 @@ export const createCertificate = async (
     eventHelper.resource.publish.created(certificate);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: certificate.name,
         tenant: tenant
@@ -340,14 +340,14 @@ export const createCertificate = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: certificate.name,
         tenant: tenant
@@ -383,10 +383,10 @@ export const createSecret = async (
     eventHelper.resource.publish.created(secret);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: secret.name,
         tenant: tenant
@@ -420,14 +420,14 @@ export const createSecret = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: secret.name,
         tenant: tenant
@@ -483,10 +483,10 @@ export const createVolume = async (
     eventHelper.resource.publish.created(volume);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.created.subtype,
+      subtype: "resource-created",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: volume.name,
         tenant: tenant
@@ -520,14 +520,14 @@ export const createVolume = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.creationError.subtype,
+      subtype: getWuiErrorCode("resource", "createResource", contentMessage) ?? "resource-creation-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: volume.name,
         tenant: tenant
@@ -593,10 +593,10 @@ const deleteResourceBase = async (
     //eventHelper.resource.publish.deleted(resource);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.deleting.subtype,
+      subtype: "resource-deleting",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -626,14 +626,14 @@ const deleteResourceBase = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.deletionError.subtype,
+      subtype: getWuiErrorCode("resource", "deleteResource", contentMessage) ?? "resource-deletion-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -688,10 +688,10 @@ const updateResourceBase = async (
     // eventHelper.resource.publish.updated(resource);
     const resourceNotification: Notification = {
       type: "success",
-      subtype: errors.resource.updated.subtype,
+      subtype: "resource-updated",
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,
@@ -721,14 +721,14 @@ const updateResourceBase = async (
     }
     const resourceErrorNotification: Notification = {
       type: "error",
-      subtype: errors.resource.updateError.subtype,
+      subtype: getWuiErrorCode("resource", "updateResource", contentMessage) ?? "resource-update-error",
       info_content: {
         code: contentMessage,
         message: errorContent,
       },
       date: Date.now().toString(),
       status: "unread",
-      callToAction: false,
+      notificationType: "regular",
       data: {
         resource: resource.name,
         type: resource.type,