@kumori/aurora-backend-handler 1.0.61 → 1.0.63

package/api/service-api-service.ts

@@ -16,13 +16,13 @@ let pendingLinks = new Map<string, Link[]>();
 export const deployService = async (data: Service, token: string) => {
   try {
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`,
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
     url.searchParams.append("wait", "30000");
     url.searchParams.append("validate", "true");
-    if(data.dsl){
+    if (data.dsl) {
       url.searchParams.append("dsl", "true");
     }
     if (data.serviceData) {
@@ -33,7 +33,7 @@ export const deployService = async (data: Service, token: string) => {
         JSON.stringify({
           targetAccount: data.account,
           targetEnvironment: data.environment,
-        })
+        }),
       );
       formData.append("labels", JSON.stringify({ project: data.project }));
       formData.append("comment", " ");
@@ -48,7 +48,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_"
+        (event: any) => event.content === "_timeout_",
       );
 
       if (isTimeout) {
@@ -81,7 +81,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_"
+        (event: any) => event.content === "_timeout_",
       );
 
       if (isTimeout) {
@@ -111,7 +111,7 @@ export const redeployService = async (data: Service) => {
   try {
     const formData = await deployServiceHelper(data);
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`,
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
@@ -130,7 +130,7 @@ export const redeployService = async (data: Service) => {
     const jsonResponse = await response.json();
 
     const isTimeout = jsonResponse?.events?.some(
-      (event: any) => event.content === "_timeout_"
+      (event: any) => event.content === "_timeout_",
     );
 
     if (isTimeout) {
@@ -163,7 +163,7 @@ export const deleteService = async (data: Service, security: string) => {
       deleteBody,
       30000,
       "DELETE",
-      data.name
+      data.name,
     );
     return response;
   } catch (err) {
@@ -188,7 +188,7 @@ export const restartService = async (data: Service, security: string) => {
       restartBody,
       30000,
       "RESTART",
-      data.name
+      data.name,
     );
 
     const updatedService: Service = {
@@ -319,7 +319,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name
+            service.name,
           );
 
           const notification: Notification = {
@@ -353,7 +353,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -375,7 +375,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
       "GET_REVISION",
       service.name,
       "service",
-      service
+      service,
     );
     return response;
   } catch (err) {
@@ -623,7 +623,7 @@ export const updateService = async (
 };
 export const unlinkServices = async (service: Service, token: string) => {
   const deleteLinks: Link[] = service.links.filter(
-    (link) => link.delete === true
+    (link) => link.delete === true,
   );
   if (deleteLinks.length > 0) {
     await Promise.all(
@@ -638,7 +638,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             unlinkBody,
             30000,
             "UNLINK",
-            service.name
+            service.name,
           );
 
           const unlinkNotification: Notification = {
@@ -674,7 +674,7 @@ export const unlinkServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      })
+      }),
     );
   }
 };
@@ -699,7 +699,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "UNLINK",
-        link.origin
+        link.origin,
       );
 
       // const unlinkNotification: Notification = {
@@ -745,7 +745,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "LINK",
-        link.origin
+        link.origin,
       );
 
       const notification: Notification = {
@@ -801,7 +801,7 @@ export const changeRevision = async (data: Service, token: string) => {
       revisionBody,
       30000,
       "UPDATE_REVISION",
-      data.name
+      data.name,
     );
     const notification: Notification = {
       type: "success",
@@ -886,4 +886,4 @@ export async function restartInstance(service: Service, roleId: string, instance
     };
     eventHelper.notification.publish.creation(notification);
   }
-}
+}

package/helpers/revision-helper.ts

@@ -217,12 +217,16 @@ const updateServiceWithRevision = (
   const existingRevisionIndex = existingService.revisions.findIndex(
     (rev) => String(rev.id) === String(entityId),
   );
-  const existingRevision = existingRevisionIndex !== -1
-    ? existingService.revisions[existingRevisionIndex]
-    : null;
-  const hasExistingSchema = existingRevision?.schema &&
-    ("parameters" in existingRevision.schema || "resources" in existingRevision.schema);
-  const hasNewSchema = newRevision.schema &&
+  const existingRevision =
+    existingRevisionIndex !== -1
+      ? existingService.revisions[existingRevisionIndex]
+      : null;
+  const hasExistingSchema =
+    existingRevision?.schema &&
+    ("parameters" in existingRevision.schema ||
+      "resources" in existingRevision.schema);
+  const hasNewSchema =
+    newRevision.schema &&
     ("parameters" in newRevision.schema || "resources" in newRevision.schema);
   if (hasExistingSchema && !hasNewSchema) {
     newRevision.schema = existingRevision!.schema;
@@ -238,9 +242,10 @@ const updateServiceWithRevision = (
   const updatedService: Service = {
     ...existingService,
     revisions: updatedRevisions,
-    currentRevision: Number(entityId) >= Number(existingService.currentRevision ?? 0)
-      ? entityId
-      : existingService.currentRevision,
+    currentRevision:
+      Number(entityId) >= Number(existingService.currentRevision ?? 0)
+        ? entityId
+        : existingService.currentRevision,
     role: roles.length > 0 ? roles : existingService.role,
     usage: newRevision.usage,
     startedAt: newRevision.createdAt || existingService.startedAt,
@@ -276,10 +281,14 @@ const updateServiceWithRevision = (
       deploymentErrorEvent = updatedService;
     }
   }
+  const incomingRevisionId = Number(entityId);
+  const currentRevisionId = Number(existingService.currentRevision ?? 0);
+  if (incomingRevisionId >= currentRevisionId && !eventData.status.error) {
+    updatedService.error = undefined;
+  }
 
   return { updatedService, deploymentErrorEvent };
 };
-
 const updateEnvironmentConsumption = (
   environment: Environment,
   servicesMap: Map<string, Service>,
@@ -535,7 +544,8 @@ export const extractStructuredSchema = (
   if (!configSchema) return {};
   const deployedConfig = revisionData?.config?.config ?? {};
   const parameterValues: Record<string, any> = deployedConfig.parameter ?? {};
-  const configResourceValues: Record<string, any> = deployedConfig.resource ?? {};
+  const configResourceValues: Record<string, any> =
+    deployedConfig.resource ?? {};
 
   const requiredParams: string[] =
     configSchema?.properties?.config?.required ?? [];
@@ -566,14 +576,22 @@ export const extractStructuredSchema = (
 
   const resolveResourceValue = (configValue: any): string => {
     if (!configValue || typeof configValue !== "object") return "";
-    if (typeof configValue.secret === "string") return extractResourceName(configValue.secret);
-    if (typeof configValue.domain === "string") return extractResourceName(configValue.domain);
-    if (typeof configValue.port === "string") return extractResourceName(configValue.port);
-    if (typeof configValue.certificate === "string") return extractResourceName(configValue.certificate);
-    if (typeof configValue.ca === "string") return extractResourceName(configValue.ca);
+    if (typeof configValue.secret === "string")
+      return extractResourceName(configValue.secret);
+    if (typeof configValue.domain === "string")
+      return extractResourceName(configValue.domain);
+    if (typeof configValue.port === "string")
+      return extractResourceName(configValue.port);
+    if (typeof configValue.certificate === "string")
+      return extractResourceName(configValue.certificate);
+    if (typeof configValue.ca === "string")
+      return extractResourceName(configValue.ca);
     if (configValue.volume) {
       const vol = configValue.volume;
-      return convertToGigabytes(vol.size, vol.unit)?.toString() ?? String(vol.size ?? "");
+      return (
+        convertToGigabytes(vol.size, vol.unit)?.toString() ??
+        String(vol.size ?? "")
+      );
     }
     return "";
   };
@@ -656,7 +674,9 @@ export const processRevisionData = (
 ): Service => {
   const { solution } = revisionData;
   const topLevelConfig = revisionData?.config?.config ?? {};
-  const topLevelParameters = extractParametersFromConfig(topLevelConfig.parameter || {});
+  const topLevelParameters = extractParametersFromConfig(
+    topLevelConfig.parameter || {},
+  );
   const topLevelResources = extractResources(topLevelConfig.resource || {});
 
   const schemaResult = revisionData.revision
@@ -736,11 +756,21 @@ export const processRevisionData = (
             id: revisionId,
             schema,
             usage: svc.usage || {
-              current: { cpu: 0, memory: 0, storage: 0, volatileStorage: 0, nonReplicatedStorage: 0, persistentStorage: 0 },
+              current: {
+                cpu: 0,
+                memory: 0,
+                storage: 0,
+                volatileStorage: 0,
+                nonReplicatedStorage: 0,
+                persistentStorage: 0,
+              },
               limit: {
-                cpu: { max: 0, min: 0 }, memory: { max: 0, min: 0 },
-                storage: { max: 0, min: 0 }, volatileStorage: { max: 0, min: 0 },
-                nonReplicatedStorage: { max: 0, min: 0 }, persistentStorage: { max: 0, min: 0 },
+                cpu: { max: 0, min: 0 },
+                memory: { max: 0, min: 0 },
+                storage: { max: 0, min: 0 },
+                volatileStorage: { max: 0, min: 0 },
+                nonReplicatedStorage: { max: 0, min: 0 },
+                persistentStorage: { max: 0, min: 0 },
               },
               cost: 0,
             },
@@ -754,7 +784,10 @@ export const processRevisionData = (
     return {
       ...svc,
       revisions: updatedRevisions,
-      currentRevision: Number(revisionId) >= Number(currentRevId) ? revisionId : svc.currentRevision,
+      currentRevision:
+        Number(revisionId) >= Number(currentRevId)
+          ? revisionId
+          : svc.currentRevision,
     };
   };
 
@@ -771,11 +804,21 @@ export const processRevisionData = (
         ),
       );
     }
-    return applySchemaToService({ ...service, parameters: topLevelParameters, resources: topLevelResources });
+    return applySchemaToService({
+      ...service,
+      parameters: topLevelParameters,
+      resources: topLevelResources,
+    });
   }
 
   return applySchemaToService(
-    processDeployment(service, deployment, revisionData, topLevelParameters, topLevelResources),
+    processDeployment(
+      service,
+      deployment,
+      revisionData,
+      topLevelParameters,
+      topLevelResources,
+    ),
   );
 };
 
@@ -796,13 +839,14 @@ export const processDeployment = (
     Object.entries(rolesDefinition).forEach(
       ([roleName, roleData]: [string, any]) => {
         const existingRole = service.role.find((r) => r.name === roleName);
-        const roleArtifactConfig = roleData?.artifact?.description?.config ?? {};
+        const roleArtifactConfig =
+          roleData?.artifact?.description?.config ?? {};
 
         const roleParameters = extractParametersFromConfig(
-          roleArtifactConfig.parameter ?? {}
+          roleArtifactConfig.parameter ?? {},
         );
         const roleResources = extractResources(
-          roleArtifactConfig.resource ?? {}
+          roleArtifactConfig.resource ?? {},
         );
         const parameters = roleParameters;
         const resources = roleResources;
@@ -819,8 +863,7 @@ export const processDeployment = (
           roleArtifactConfig.resource || {},
         ).some((resourceData: any) => resourceData.volume);
 
-        const artifactName: string =
-          roleData.artifact?.ref?.name || "";
+        const artifactName: string = roleData.artifact?.ref?.name || "";
         const role: Role = {
           name: roleName,
           artifactName: artifactName || undefined,
@@ -868,7 +911,12 @@ export const processDeployment = (
       },
     ];
   }
-  return { ...service, resources: fallbackResources, parameters: fallbackParameters, role: updatedRoles };
+  return {
+    ...service,
+    resources: fallbackResources,
+    parameters: fallbackParameters,
+    role: updatedRoles,
+  };
 };
 
 export const extractParametersFromConfig = (
@@ -1081,4 +1129,4 @@ const extractResourceName = (resourcePath: string): string => {
     return parts[1];
   }
   return resourcePath;
-};
+};

package/package.json

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