@kumori/aurora-backend-handler 1.0.29 → 1.0.31

package/helpers/link-helper.ts

@@ -32,6 +32,7 @@ export const handleLinkEvent = ({
   const serverChannel = eventData.spec.server_channel;
   const linkServiceServer = `${eventData.spec.server_tenant}/${serverService}`;
   const linkServiceClient = `${eventData.spec.client_tenant}/${clientService}`;
+  const isBeeingDeleted : boolean = !!eventData.meta.deleted;
   const clientToServerLink: Link = {
     name: linkId,
     origin: clientService,
@@ -40,6 +41,7 @@ export const handleLinkEvent = ({
     targetChannel: serverChannel,
     client: clientChannel,
     server: serverChannel,
+    delete: isBeeingDeleted,
   };
 
   const serverToClientLink: Link = {
@@ -50,6 +52,7 @@ export const handleLinkEvent = ({
     targetChannel: serverChannel,
     client: clientChannel,
     server: serverChannel,
+    delete: isBeeingDeleted,
   };
   let updatedServerService: Service | null = null;
   let serverServiceFound = false;

package/helpers/revision-helper.ts

@@ -528,39 +528,52 @@ export const processRevisionData = (
   revisionData: any,
 ): Service => {
   const { solution } = revisionData;
+
+  const config = revisionData?.config?.config || {};
+  const parameters = extractParametersFromConfig(
+    config.parameter || {},
+  );
+  const resources = extractResources(config.resource || {});
+
   const deploymentName = solution.top || service.name;
   const deployment = solution.deployments[deploymentName];
 
   if (!deployment) {
-    console.warn(
-      `No deployment found with name ${deploymentName} in solution. Available deployments:`,
-      Object.keys(solution.deployments),
-    );
     const firstDeploymentKey = Object.keys(solution.deployments)[0];
     if (firstDeploymentKey) {
-      console.warn(`Using first available deployment: ${firstDeploymentKey}`);
       return processDeployment(
         service,
         solution.deployments[firstDeploymentKey],
         revisionData,
+        parameters,
+        resources,
       );
     }
-    return service;
+    return {
+      ...service,
+      parameters: parameters,
+      resources: resources,
+    };
   }
 
-  return processDeployment(service, deployment, revisionData);
+  return processDeployment(
+    service,
+    deployment,
+    revisionData,
+    parameters,
+    resources,
+  );
 };
+
 export const processDeployment = (
   service: Service,
   deployment: any,
   revisionData: any,
+  parameters: { [key: string]: string }[],
+  resources: Resource[],
 ): Service => {
   const artifact = deployment.artifact;
   const deploymentConfig = deployment.config || {};
-  const serviceResources = extractResources(deploymentConfig.resource || {});
-  const allServiceParameters = extractParametersFromConfig(
-    deploymentConfig.parameter || {},
-  );
 
   const rolesDefinition = artifact.description?.role || {};
   const hasRoles = Object.keys(rolesDefinition).length > 0;
@@ -569,19 +582,6 @@ export const processDeployment = (
   if (hasRoles) {
     Object.entries(rolesDefinition).forEach(
       ([roleName, roleData]: [string, any]) => {
-        const fileSystemParameters = extractParametersFromFilesystem(
-          roleData.artifact.description?.code?.[roleName]?.mapping
-            ?.filesystem || [],
-          allServiceParameters,
-        );
-        allServiceParameters.push(...fileSystemParameters);
-        const fileSystemResources = extractResourcesFromFilesystem(
-          roleData.artifact.description?.code?.[roleName]?.mapping
-            ?.filesystem || [],
-          serviceResources,
-        );
-        serviceResources.push(...fileSystemResources);
-        const roleResources = extractResources(roleData.config?.resource || {});
         const existingRole = service.role.find((r) => r.name === roleName);
         let hsize = 1;
         if (roleData.config?.scale?.hsize !== undefined) {
@@ -601,8 +601,8 @@ export const processDeployment = (
           logo: service.logo,
           description:
             roleData.artifact?.ref?.module || roleData.ref?.module || "",
-          resource: roleResources,
-          parameters: allServiceParameters,
+          resource: resources,
+          parameters: parameters,
           hsize: hsize,
           category: hasDuplex || hasVolumeResource ? "stateful" : "",
         };
@@ -612,17 +612,14 @@ export const processDeployment = (
         ) {
           role.scalling = processScalingConfig(deployment.meta);
         }
-
         updatedRoles.push(role);
       },
     );
   } else {
     let hsize = 1;
-
     if (deploymentConfig.scale?.hsize !== undefined) {
       hsize = deploymentConfig.scale.hsize;
     }
-
     if (deploymentConfig.scale?.detail?.[""]?.hsize !== undefined) {
       hsize = deploymentConfig.scale.detail[""].hsize;
     }
@@ -634,8 +631,8 @@ export const processDeployment = (
         description:
           artifact.ref?.module ||
           (artifact.description?.builtin ? "Builtin Service" : ""),
-        resource: serviceResources,
-        parameters: allServiceParameters,
+        resource: resources,
+        parameters: parameters,
         hsize: hsize,
         ...(deployment.meta?.scaling &&
           Object.keys(deployment.meta.scaling.simple || {}).length > 0 && {
@@ -647,8 +644,8 @@ export const processDeployment = (
 
   return {
     ...service,
-    resources: serviceResources,
-    parameters: allServiceParameters,
+    resources: resources,
+    parameters: parameters,
     role: updatedRoles,
   };
 };

package/package.json

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