@kumori/aurora-backend-handler 1.1.58 → 1.1.60

package/helpers/environment-helper.ts

@@ -56,7 +56,8 @@ export const handleEnvironmentEvent = ({
 }: HandleEnvironmentEventParams): HandleEnvironmentEventResult => {
   const tenantId = parentParts.tenant;
   const accountId = parentParts.account;
-  const relatedAccount = accountsMap.get(accountId);
+  const accountKey = tenantId ? `${tenantId}/${accountId}` : accountId;
+  const relatedAccount = accountsMap.get(accountKey);
   let cloudProviderName = relatedAccount?.cloudProvider?.name || "";
 
   let pendingCloudProviderUpdate: { environmentId: string; accountId: string } | null = null;
@@ -68,7 +69,8 @@ export const handleEnvironmentEvent = ({
     };
   }
 
-  const existingEnvironment = environmentsMap.get(entityId);
+  const envKey = tenantId && accountId ? `${tenantId}/${accountId}/${entityId}` : entityId;
+  const existingEnvironment = environmentsMap.get(envKey);
 
   const newEnvironment: Environment = {
     id: entityId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.58",
+  "version": "1.1.60",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {

package/websocket-manager.ts

@@ -569,7 +569,7 @@ const rebuildHierarchy = () => {
   tenantsMap.forEach((tenant) => {
     tenant.accounts = Array.from(accountsMap.values()).filter((account) => {
       account.environments = Array.from(environmentsMap.values())
-        .filter((env) => env.account === account.id)
+        .filter((env) => env.account === account.id && env.tenant === account.tenant)
         .map((env) => env.name);
       return account.tenant === tenant.id;
     });
@@ -676,7 +676,8 @@ const handleEvent = async (message: WSMessage) => {
             envEventResult.pendingCloudProviderUpdate,
           );
         }
-        environmentsMap.set(entityId, envEventResult.environment);
+        const envSetKey = parentParts.tenant && parentParts.account ? `${parentParts.tenant}/${parentParts.account}/${entityId}` : entityId;
+        environmentsMap.set(envSetKey, envEventResult.environment);
         const envTenant = tenantsMap.get(envEventResult.tenantId);
         if (!envTenant) {
           pendingEnvironments.push({
@@ -710,8 +711,10 @@ const handleEvent = async (message: WSMessage) => {
         }
         if (revisionResult.updatedEnvironment) {
           const envId = revisionResult.updatedService?.environment;
-          if (envId)
-            environmentsMap.set(envId, revisionResult.updatedEnvironment);
+          const envRevTenant = revisionResult.updatedEnvironment.tenant;
+          const envRevAccount = revisionResult.updatedEnvironment.account;
+          const envRevKey = envRevTenant && envRevAccount && envId ? `${envRevTenant}/${envRevAccount}/${envId}` : envId;
+          if (envRevKey) environmentsMap.set(envRevKey, revisionResult.updatedEnvironment);
         }
         if (revisionResult.updatedAccount) {
           const accId = revisionResult.updatedService?.account;
@@ -812,7 +815,7 @@ const handleEvent = async (message: WSMessage) => {
         if (!message.payload.deleted) {
           const accountKey = parentParts.tenant ? `${parentParts.tenant}/${entityId}` : entityId;
           accountsMap.set(accountKey, accountResult.account);
-          updateEnvironmentsCloudProvider(entityId, eventData.spec.api);
+          updateEnvironmentsCloudProvider(entityId, eventData.spec.api, parentParts.tenant);
         }
         break;
 
@@ -1428,10 +1431,12 @@ const handleOperationSuccess = (operation: PendingOperation, response: any) => {
         originalData: originalData as Environment,
       });
 
+      const envOrigData = originalData as Environment;
+      const envSuccessKey = envOrigData?.tenant && envOrigData?.account ? `${envOrigData.tenant}/${envOrigData.account}/${entityName}` : entityName;
       if (envSuccessResult.shouldDelete) {
-        environmentsMap.delete(entityName);
+        environmentsMap.delete(envSuccessKey);
       } else if (envSuccessResult.updatedEnvironment) {
-        environmentsMap.set(entityName, envSuccessResult.updatedEnvironment);
+        environmentsMap.set(envSuccessKey, envSuccessResult.updatedEnvironment);
         if (envSuccessResult.notification) {
           eventHelper.notification.publish.creation(
             envSuccessResult.notification,
@@ -1564,7 +1569,9 @@ const handleOperationError = (operation: PendingOperation, error: any) => {
         eventHelper.environment.publish.deletionError(originalData);
       }
       eventHelper.notification.publish.creation(envErrorResult.notification);
-      environmentsMap.set(entityName, envErrorResult.updatedEnvironment);
+      const envErrOrigData = originalData as Environment;
+      const envErrorKey = envErrOrigData?.tenant && envErrOrigData?.account ? `${envErrOrigData.tenant}/${envErrOrigData.account}/${entityName}` : entityName;
+      environmentsMap.set(envErrorKey, envErrorResult.updatedEnvironment);
       break;
   }
   setTimeout(async () => {
@@ -1595,7 +1602,8 @@ const handleDeleteEvent = async (message: WSMessage) => {
   }
   if (keyParts.environment && !keyParts.service) {
     const environmentName = keyParts.environment;
-    const deletedEnv = environmentsMap.get(environmentName)!;
+    const envDeleteKey = tenantName && keyParts.account ? `${tenantName}/${keyParts.account}/${environmentName}` : environmentName;
+    const deletedEnv = environmentsMap.get(envDeleteKey)!;
     eventHelper.environment.publish.deleted(deletedEnv);
     const envNotification: Notification = {
       type: "success",
@@ -1610,7 +1618,7 @@ const handleDeleteEvent = async (message: WSMessage) => {
       },
     };
     eventHelper.notification.publish.creation(envNotification);
-    environmentsMap.delete(environmentName);
+    environmentsMap.delete(envDeleteKey);
   }
   if (keyParts.account && !keyParts.environment) {
     const accountName = keyParts.account;
@@ -1889,9 +1897,10 @@ const getChannelsInfo = async (
 const updateEnvironmentsCloudProvider = (
   accountId: string,
   cloudProviderName: string,
+  tenantId?: string,
 ) => {
   environmentsMap.forEach((environment, envId) => {
-    if (environment.account === accountId) {
+    if (environment.account === accountId && (!tenantId || environment.tenant === tenantId)) {
       environment.cloudProvider = cloudProviderName;
       environmentsMap.set(envId, environment);
     }
@@ -1909,7 +1918,8 @@ const loadReportingForEnvironment = async (environment: Environment) => {
       reportingData !== null &&
       Array.isArray(reportingData)
     ) {
-      const updatedEnvironment = environmentsMap.get(environment.id);
+      const envReportKey = environment.tenant && environment.account ? `${environment.tenant}/${environment.account}/${environment.id}` : environment.id;
+      const updatedEnvironment = environmentsMap.get(envReportKey);
 
       if (!updatedEnvironment) {
         console.warn(`Environment ${environment.id} not found in map`);
@@ -1940,7 +1950,7 @@ const loadReportingForEnvironment = async (environment: Environment) => {
           );
       }
 
-      environmentsMap.set(environment.id, updatedEnvironment);
+      environmentsMap.set(envReportKey, updatedEnvironment);
     }
   } catch (error) {
     console.error(