@kumori/aurora-backend-handler 1.0.38 → 1.0.40

package/helpers/revision-helper.ts

@@ -482,7 +482,7 @@ const collectNamedTypes = (schema: any): string[] => {
 
 const namedTypeToResourceKind = (
   namedTypes: string[],
-): { type: string; kind?: string } => {
+): { type: string; kind?: string } | null => {
   for (const name of namedTypes) {
     switch (name) {
       case "Secret":
@@ -507,21 +507,30 @@ const namedTypeToResourceKind = (
         return { type: "volume" };
     }
   }
-  return { type: "secret" };
+  return null;
 };
 
 export const extractStructuredSchema = (
   revisionData: any,
-): {
-  parameters: {
-    name: string;
-    type: string;
-    required: boolean;
-    defaultValue?: any;
-  }[];
-  resources: { name: string; type: string; kind?: string; required: boolean }[];
-} => {
+):
+  | {
+      parameters: {
+        name: string;
+        type: string;
+        required: boolean;
+        defaultValue?: any;
+      }[];
+      resources: {
+        name: string;
+        type: string;
+        kind?: string;
+        required: boolean;
+      }[];
+    }
+  | {} => {
   const configSchema = revisionData?.configSchema;
+  if (!configSchema) return {};
+
   const deploymentName = revisionData?.solution?.top;
   const deployment = deploymentName
     ? revisionData?.solution?.deployments?.[deploymentName]
@@ -529,14 +538,15 @@ export const extractStructuredSchema = (
 
   const parameterValues: Record<string, any> =
     (deployment as any)?.config?.parameter ?? {};
+  const configResourceValues: Record<string, any> =
+    (deployment as any)?.config?.resource ?? {};
+
   const requiredParams: string[] =
     configSchema?.properties?.config?.required ?? [];
   const requiredResources: string[] =
     configSchema?.properties?.resource?.required ?? [];
   const schemaConfigProps: Record<string, any> =
     configSchema?.properties?.config?.properties ?? {};
-  const schemaResourceProps: Record<string, any> =
-    configSchema?.properties?.resource?.properties ?? {};
 
   const parameters = Object.entries(schemaConfigProps).map(
     ([name, propSchema]) => {
@@ -558,10 +568,49 @@ export const extractStructuredSchema = (
     },
   );
 
-  const resources = Object.entries(schemaResourceProps).map(
-    ([name, propSchema]) => {
-      const namedTypes = collectNamedTypes(propSchema);
-      const resolved = namedTypeToResourceKind(namedTypes);
+  const resolveResourceType = (
+    configValue: any,
+  ): { type: string; kind?: string } | null => {
+    if (!configValue || typeof configValue !== "object") return null;
+    if ("secret" in configValue) return { type: "secret" };
+    if ("domain" in configValue) return { type: "domain" };
+    if ("port" in configValue) return { type: "port" };
+    if ("certificate" in configValue) return { type: "certificate" };
+    if ("ca" in configValue) return { type: "ca" };
+    if ("volume" in configValue) {
+      const volType = configValue.volume?.type;
+      if (volType === "persistent" || volType === "Persisted")
+        return { type: "volume", kind: "persistent" };
+      if (volType === "nonReplicated" || volType === "NonReplicated")
+        return { type: "volume", kind: "nonReplicated" };
+      if (
+        volType === "volatile" ||
+        volType === "Volatile" ||
+        volType === "ephemeral" ||
+        volType === "Ephemeral"
+      )
+        return { type: "volume", kind: "volatile" };
+      return { type: "volume" };
+    }
+    return null;
+  };
+
+  const allResourceNames = new Set<string>([
+    ...Object.keys(configResourceValues),
+    ...Object.keys(configSchema?.properties?.resource?.properties ?? {}),
+  ]);
+
+  const resources = Array.from(allResourceNames)
+    .map((name) => {
+      const configValue = configResourceValues[name];
+      const fromConfig = resolveResourceType(configValue);
+      const schemaProps =
+        configSchema?.properties?.resource?.properties?.[name];
+      const fromSchema = schemaProps
+        ? namedTypeToResourceKind(collectNamedTypes(schemaProps))
+        : null;
+      const resolved = fromConfig ?? fromSchema;
+      if (!resolved) return null;
       const entry: {
         name: string;
         type: string;
@@ -574,8 +623,13 @@ export const extractStructuredSchema = (
       };
       if (resolved.kind) entry.kind = resolved.kind;
       return entry;
-    },
-  );
+    })
+    .filter(Boolean) as {
+    name: string;
+    type: string;
+    kind?: string;
+    required: boolean;
+  }[];
 
   return { parameters, resources };
 };
@@ -592,10 +646,20 @@ export const processRevisionData = (
   const parameters = extractParametersFromConfig(config.parameter || {});
   const resources = extractResources(config.resource || {});
 
-  if (revisionsMap && serviceId && revisionData.revision) {
+  const schemaResult = revisionData.revision
+    ? extractStructuredSchema(revisionData)
+    : {};
+  const schema =
+    schemaResult && "parameters" in schemaResult ? schemaResult : {};
+
+  if (
+    revisionsMap &&
+    serviceId &&
+    revisionData.revision &&
+    "parameters" in schema
+  ) {
     const revisionId: string = revisionData.revision;
     const revisionKey = `${serviceId}-${revisionId}`;
-    const schema = extractStructuredSchema(revisionData);
     const existing = revisionsMap.get(revisionKey);
     if (existing) {
       revisionsMap.set(revisionKey, { ...existing, schema });
@@ -645,26 +709,35 @@ export const processRevisionData = (
   const deploymentName = solution.top || service.name;
   const deployment = solution.deployments[deploymentName];
 
+  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,
+      ),
+    };
+  };
+
   if (!deployment) {
     const firstDeploymentKey = Object.keys(solution.deployments)[0];
     if (firstDeploymentKey) {
-      return processDeployment(
-        service,
-        solution.deployments[firstDeploymentKey],
-        revisionData,
-        parameters,
-        resources,
+      return applySchemaToService(
+        processDeployment(
+          service,
+          solution.deployments[firstDeploymentKey],
+          revisionData,
+          parameters,
+          resources,
+        ),
       );
     }
-    return { ...service, parameters, resources };
+    return applySchemaToService({ ...service, parameters, resources });
   }
 
-  return processDeployment(
-    service,
-    deployment,
-    revisionData,
-    parameters,
-    resources,
+  return applySchemaToService(
+    processDeployment(service, deployment, revisionData, parameters, resources),
   );
 };
 

package/package.json

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