@kumori/aurora-backend-handler 1.1.73 → 1.1.75

package/helpers/revision-helper.ts

@@ -686,9 +686,10 @@ export const processRevisionData = (
   const schemaResult = revisionData.revision
     ? extractStructuredSchema(revisionData)
     : {};
+  console.log("DEBUG schemaResult", schemaResult);
   const schema =
     schemaResult && "parameters" in schemaResult ? schemaResult : {};
-
+  console.log("DEBUG schema", schema);
   if (
     revisionsMap &&
     serviceId &&
@@ -696,10 +697,13 @@ export const processRevisionData = (
     "parameters" in schema
   ) {
     const revisionId: string = revisionData.revision;
-    const revisionKey = `${serviceId}-${revisionId}`;
+    const [tenantId, serviceName] = serviceId.split('/');
+    const revisionKey = `/tenant/${tenantId}/service/${serviceName}/revision/${revisionId}`;
     const existing = revisionsMap.get(revisionKey);
     if (existing) {
+      console.log("DEBUG: Updating existing revision in revisionsMap", revisionKey, existing);
       revisionsMap.set(revisionKey, { ...existing, schema });
+      console.log("DEBUG: Updated revision in revisionsMap", revisionKey, revisionsMap.get(revisionKey));
     } else {
       revisionsMap.set(revisionKey, {
         id: revisionId,
@@ -740,6 +744,7 @@ export const processRevisionData = (
         errorMsg: "",
         createdAt: "",
       });
+      console.log("DEBUG: Added new revision to revisionsMap", revisionKey, revisionsMap.get(revisionKey));
     }
   }
 
@@ -808,6 +813,11 @@ export const processRevisionData = (
         ),
       );
     }
+    console.log("DEBUG: No deployment found in revisionData, applying schema to service with top-level parameters and resources.", service, topLevelParameters, topLevelResources, applySchemaToService({
+      ...service,
+      parameters: topLevelParameters,
+      resources: topLevelResources,
+    }));
     return applySchemaToService({
       ...service,
       parameters: topLevelParameters,

package/helpers/service-helper.ts

@@ -188,7 +188,7 @@ export const handleServiceEvent = ({
 }: HandleServiceEventParams): HandleServiceEventResult => {
   const serviceFullKey = `${parentParts.tenant}/${entityId}`;
   const serviceTenantId = parentParts.tenant;
-  const currentRevisionKey = `${eventData.id.parent.name}/service/${entityId}/revision/${eventData.status.revision}`;
+  const currentRevisionKey = `${eventData.id.parent.name}/service/${entityId}/revision/${eventData.spec.ctstamp || eventData.status.revision}`;
   const currentRevision = revisionsMap.get(currentRevisionKey);
 
   const projectLabel = eventData.meta?.labels?.project;

package/package.json

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