@kumori/aurora-backend-handler 1.0.53 → 1.0.55

package/helpers/revision-helper.ts

@@ -110,7 +110,7 @@ const processRolesAndInstances = (
 
       const instance: Instance = {
         id: instanceId,
-        name: `${roleName}::${instanceId}`,
+        name: `${instanceId}`,
         status: instanceData.status.status,
         usage: {
           current: {
@@ -520,31 +520,9 @@ export const extractStructuredSchema = (
   | {} => {
   const configSchema = revisionData?.configSchema;
   if (!configSchema) return {};
-
-  const deploymentName = revisionData?.solution?.top;
-  const deployment = deploymentName
-    ? revisionData?.solution?.deployments?.[deploymentName]
-    : Object.values(revisionData?.solution?.deployments ?? {})[0];
-  const rolesDefinition: Record<string, any> =
-    (deployment as any)?.artifact?.description?.role ?? {};
-
-  const mergedParameterValues: Record<string, any> = {};
-  const mergedResourceValues: Record<string, any> = {};
-
-  Object.values(rolesDefinition).forEach((roleData: any) => {
-    const roleConfig = roleData?.artifact?.description?.config ?? {};
-    Object.assign(mergedParameterValues, roleConfig.parameter ?? {});
-    Object.assign(mergedResourceValues, roleConfig.resource ?? {});
-  });
-  const topLevelConfig = (deployment as any)?.config ?? {};
-  const parameterValues: Record<string, any> = {
-    ...topLevelConfig.parameter ?? {},
-    ...mergedParameterValues,
-  };
-  const configResourceValues: Record<string, any> = {
-    ...topLevelConfig.resource ?? {},
-    ...mergedResourceValues,
-  };
+  const deployedConfig = revisionData?.config?.config ?? {};
+  const parameterValues: Record<string, any> = deployedConfig.parameter ?? {};
+  const configResourceValues: Record<string, any> = deployedConfig.resource ?? {};
 
   const requiredParams: string[] =
     configSchema?.properties?.config?.required ?? [];
@@ -573,6 +551,20 @@ 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 (configValue.volume) {
+      const vol = configValue.volume;
+      return convertToGigabytes(vol.size, vol.unit)?.toString() ?? String(vol.size ?? "");
+    }
+    return "";
+  };
+
   const resolveResourceType = (
     configValue: any,
   ): { type: string; kind?: string } | null => {
@@ -621,12 +613,15 @@ export const extractStructuredSchema = (
         type: string;
         kind?: string;
         required: boolean;
+        value?: string;
       } = {
         name,
         type: resolved.type,
         required: requiredResources.includes(name),
       };
       if (resolved.kind) entry.kind = resolved.kind;
+      const value = resolveResourceValue(configValue);
+      if (value) entry.value = value;
       return entry;
     })
     .filter(Boolean) as {
@@ -634,6 +629,7 @@ export const extractStructuredSchema = (
     type: string;
     kind?: string;
     required: boolean;
+    value?: string;
   }[];
 
   return { parameters, resources };
@@ -715,13 +711,33 @@ export const processRevisionData = (
 
   const applySchemaToService = (svc: Service): Service => {
     if (!revisionData.revision || !("parameters" in schema)) return svc;
-    const revisionId: string = revisionData.revision;
-    return {
-      ...svc,
-      revisions: svc.revisions.map((rev) =>
-        rev.id === revisionId ? { ...rev, schema } : rev,
-      ),
-    };
+    const revisionId: string = String(revisionData.revision);
+    const found = svc.revisions.some((rev) => String(rev.id) === revisionId);
+    const updatedRevisions = found
+      ? svc.revisions.map((rev) =>
+          String(rev.id) === revisionId ? { ...rev, schema } : rev,
+        )
+      : [
+          ...svc.revisions,
+          {
+            id: revisionId,
+            schema,
+            usage: svc.usage || {
+              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 },
+              },
+              cost: 0,
+            },
+            status: { code: "", message: "", timestamp: "", args: [] },
+            errorCode: "",
+            errorMsg: "",
+            createdAt: "",
+          },
+        ];
+    return { ...svc, revisions: updatedRevisions, currentRevision: revisionId };
   };
 
   if (!deployment) {

package/package.json

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