@kumori/aurora-backend-handler 1.0.97 → 1.0.98

package/api/deploy-service-helper.ts

@@ -1,6 +1,4 @@
-import {
-  ComponentSpec,
-} from "@kumori/kumori-module-generator";
+import { ComponentSpec } from "@kumori/kumori-module-generator";
 import { Parameter } from "@kumori/kumori-module-generator/dist/types";
 import { getReferenceDomain } from "../websocket-manager";
 
@@ -10,14 +8,19 @@ import {
   ComponentSpec as ComponentSpecDSL,
   ServiceSpec as ServiceSpecDSL,
 } from "@kumori/kumori-dsl-generator";
-import { MarketplaceService, Resource, Service } from "@kumori/aurora-interfaces";
+import {
+  MarketplaceService,
+  Resource,
+  Service,
+} from "@kumori/aurora-interfaces";
 
 export type ResourceBundle =
   | { secret: { name: string; configResource: string } }
   | { volume: { name: string; configResource: string } }
   | { certificate: { name: string; configResource: string } }
   | { domain: { name: string; configResource: string } }
-  | { port: { name: string; configResource: string } };
+  | { port: { name: string; configResource: string } }
+  | { ca: { name: string; configResource: string } };
 
 export interface Role {
   name: string;
@@ -90,6 +93,11 @@ export interface ServiceSpecForm {
     protocol: "HTTPS" | "TCP";
     publicPort?: string;
     domain?: string;
+    certificate?: string;
+    ca?: string;
+    certificateResource?: string;
+    withMtls?: boolean;
+    caResource?: string;
   }>;
   clientChannelsExtra?: Array<{ name: string }>;
   defaultExecutable: { cmd?: string; entryPoint?: string };
@@ -236,7 +244,7 @@ interface ServiceSpecDSLWithLocalComponent extends ServiceSpecDSL {
  */
 export function withDefaultValue<T>(
   value: T | null | undefined,
-  defaultValue: T
+  defaultValue: T,
 ): T {
   return value != null ? value : defaultValue;
 }
@@ -261,7 +269,7 @@ export function handleParametersToGenerateData(
     content?: string;
     kind?: string;
     key?: string;
-  }>
+  }>,
 ): {
   parameters: any[];
   environment: any[];
@@ -285,25 +293,25 @@ export function handleParametersToGenerateData(
 
       case "file":
         parametersResult.push({
-          name: 'CONFIG_FILE_'+index,
+          name: "CONFIG_FILE_" + index,
           type: "string",
           defaultValue: (parameter.value as string) || "",
         });
         fileSystemResult.push({
           path: `${parameter.name}`,
-          param: 'CONFIG_FILE_'+index,
+          param: "CONFIG_FILE_" + index,
         });
         break;
 
       case "fileContent":
         parametersResult.push({
-          name: 'CONFIG_FILE_'+index,
+          name: "CONFIG_FILE_" + index,
           type: "string",
           defaultValue: parameter.content || (parameter.value as string) || "",
         });
         fileSystemResult.push({
           path: (parameter.value as string) || `${parameter.name}`,
-          param: 'CONFIG_FILE_'+index,
+          param: "CONFIG_FILE_" + index,
         });
         break;
 
@@ -396,9 +404,9 @@ export function handleParametersToGenerateData(
       case "volume":
         resourcesResult.push({ volume: { name: resource.name } });
         fileSystemResult.push({
-            path: resource.key || '',
-            resourceVolume: resource.name,
-          });
+          path: resource.key || "",
+          resourceVolume: resource.name,
+        });
         break;
       // case "certificate":
       //   resourcesResult.push({ certificate: { name: resource.name } });
@@ -428,6 +436,7 @@ export function handleParametersToGenerateData(
  * @returns A ServiceSpecForm object with the data of the service.
  */
 export function transformServiceToForm(service: Service): ServiceSpecForm {
+  console.log('--- TRANSFORM SERVICE TO FORM ---', service.name);
   return {
     tenantId: service.tenant,
     accountId: service.account,
@@ -446,10 +455,13 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
         ch.protocol === "http"
           ? "HTTPS"
           : ch.protocol === "tcp"
-          ? "TCP"
-          : "TCP",
+            ? "TCP"
+            : "TCP",
       publicPort: ch.portNum?.toString() || "",
       domain: ch.portNum?.toString() || "",
+      certificateResource: ch.certificateResource,
+      withMtls: ch.withMtls,
+      caResource: ch.caResource,
     })),
     clientChannelsExtra: service.duplexChannels.map((ch) => ({
       name: ch.name,
@@ -490,7 +502,7 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
  */
 export async function generateServiceSpec(
   form: ServiceSpecForm,
-  marketplaceItem?: MarketplaceService
+  marketplaceItem?: MarketplaceService,
 ): Promise<ServiceWithLocalComponentSpec> {
   const formParams = form.config.parameters;
   const formResources = form.config.resources;
@@ -500,22 +512,49 @@ export async function generateServiceSpec(
     fileSystem,
     resources: componentResources,
   } = handleParametersToGenerateData(formParams, formResources);
+
+  console.log('--- GENERATE SERVICE SPEC ---', form.serviceId);
+  console.log('Channels from Form:', JSON.stringify(form.channels));
+
   const serverConfigDomainResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "HTTPS" && channel.isPublic)
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
-  if (serverConfigDomainResources.length) {
+
+  const hasDefaultCertChannel = form.channels.some(
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+  );
+  if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
       certificate: { name: "main_inbound_servercert" },
     });
   }
 
+  const customCertResources: ArtifactConfigResource[] = form.channels
+    .filter(
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+    )
+    .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
+
+  const customCaResources: ArtifactConfigResource[] = form.channels
+    .filter(
+      (ch) =>
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+    )
+    .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
+
+  console.log('Generated Resources Spec:', {
+    serverConfigDomainResources,
+    customCertResources,
+    customCaResources
+  });
+
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
 
   const serviceConfigResources: ArtifactConfigResource[] = form.config.resources
     .filter(
-      (resource) => resource.type === "volume" || resource.type === "secret"
+      (resource) => resource.type === "volume" || resource.type === "secret",
     )
     .map((resource) => {
       if (resource.type === "secret") {
@@ -543,7 +582,7 @@ export async function generateServiceSpec(
         resource.type === "string" ||
         resource.type === "boolean" ||
         resource.type === "number" ||
-        resource.type === "fileContent"
+        resource.type === "fileContent",
     )
     .map((resource) => {
       if (resource.type === "string" || resource.type === "fileContent") {
@@ -576,7 +615,7 @@ export async function generateServiceSpec(
 
   const rolesResources: ResourceBundle[] = form.config.resources
     .filter(
-      (resource) => resource.type === "volume" || resource.type === "secret"
+      (resource) => resource.type === "volume" || resource.type === "secret",
     )
     .map((resource) => {
       if (resource.type === "secret") {
@@ -607,13 +646,18 @@ export async function generateServiceSpec(
             config: {
               parameters: [
                 { name: "type", value: "https", type: "string" },
+                ...(channel.withMtls && channel.caResource
+                  ? [{ name: "mtls", value: "true", type: "bool" as const }]
+                  : []),
                 // { name: "websocket", value: "true", type: "bool", configParam: "websocket" },
               ],
               resources: [
                 {
                   certificate: {
                     name: "servercert",
-                    configResource: "main_inbound_servercert",
+                    configResource: channel.certificateResource
+                      ? `${channel.channelName}_cert`
+                      : "main_inbound_servercert",
                   },
                 },
                 {
@@ -622,6 +666,16 @@ export async function generateServiceSpec(
                     configResource: `${channel.channelName}_domain`,
                   },
                 },
+                ...(channel.withMtls && channel.caResource
+                  ? [
+                      {
+                        ca: {
+                          name: "clientca",
+                          configResource: `${channel.channelName}_ca`,
+                        },
+                      },
+                    ]
+                  : []),
               ],
             },
           },
@@ -669,7 +723,7 @@ export async function generateServiceSpec(
         });
       }
       return result;
-    }
+    },
   );
   const topologyClientsChannels: Connector[] = (form.clientChannels || []).map(
     (channel) => ({
@@ -677,7 +731,7 @@ export async function generateServiceSpec(
       clientChannel: channel.name,
       serverRole: "self",
       serverChannel: channel.name,
-    })
+    }),
   );
   const topology: Connector[] = [
     ...topologyServerChannels,
@@ -691,7 +745,7 @@ export async function generateServiceSpec(
           resource.type === "string" ||
           resource.type === "number" ||
           resource.type === "boolean" ||
-          resource.type === "fileContent"
+          resource.type === "fileContent",
       )
       .map((resource) => {
         if (resource.type === "string") {
@@ -723,7 +777,7 @@ export async function generateServiceSpec(
       (resource) =>
         resource.type === "volume" &&
         resource.kind === "volatile" &&
-        resource.size
+        resource.size,
     );
 
     for (const resource of volatileResources) {
@@ -741,7 +795,7 @@ export async function generateServiceSpec(
       } catch (error) {
         console.error(
           `Error creating volatile volume for ${resource.name}:`,
-          error
+          error,
         );
         throw error;
       }
@@ -750,7 +804,7 @@ export async function generateServiceSpec(
 
   const deploymentConfigResources: DeploymentResource[] = form.config.resources
     .filter(
-      (resource) => resource.type === "secret" || resource.type === "volume"
+      (resource) => resource.type === "secret" || resource.type === "volume",
     )
     .map((resource) => {
       if (resource.type === "secret") {
@@ -897,7 +951,7 @@ export async function generateServiceSpec(
       cmd: withDefaultValue(form.defaultExecutable.cmd, undefined),
       entrypoint: withDefaultValue(
         form.defaultExecutable.entryPoint,
-        undefined
+        undefined,
       ),
     },
   };
@@ -957,6 +1011,8 @@ export async function generateServiceSpec(
       parameters,
       resources: [
         ...serverConfigDomainResources,
+        ...customCertResources,
+        ...customCaResources,
         ...serviceConfigPortResources,
         ...serviceConfigResources,
         ...volatileVolumeResources,
@@ -987,7 +1043,7 @@ export async function generateServiceSpec(
                         ...acc,
                         [withDefaultValue(role, "")]: 1,
                       }),
-                      {}
+                      {},
                     ),
                   },
                 }),
@@ -1047,7 +1103,7 @@ export async function generateServiceSpec(
  */
 async function generateServiceSpecDSL(
   form: ServiceSpecForm,
-  marketplaceItem?: MarketplaceService
+  marketplaceItem?: MarketplaceService,
 ): Promise<ServiceSpecDSLWithLocalComponent> {
   const formParams = form.config.parameters;
   const formResources = form.config.resources;
@@ -1061,19 +1117,42 @@ async function generateServiceSpecDSL(
   const serverConfigDomainResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "HTTPS" && channel.isPublic)
     .map((channel) => ({ domain: { name: `${channel.channelName}_domain` } }));
-  if (serverConfigDomainResources.length) {
+
+  const hasDefaultCertChannel = form.channels.some(
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+  );
+  if (hasDefaultCertChannel) {
     serverConfigDomainResources.push({
       certificate: { name: "main_inbound_servercert" },
     });
   }
 
+  const customCertResources: ArtifactConfigResource[] = form.channels
+    .filter(
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+    )
+    .map((ch) => ({ certificate: { name: `${ch.channelName}_cert` } }));
+
+  const customCaResources: ArtifactConfigResource[] = form.channels
+    .filter(
+      (ch) =>
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+    )
+    .map((ch) => ({ ca: { name: `${ch.channelName}_ca` } }));
+
+  console.log('Generated Resources Config:', {
+    serverConfigDomainResources,
+    customCertResources,
+    customCaResources
+  });
+
   const serviceConfigPortResources: ArtifactConfigResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({ port: { name: `${channel.channelName}_port` } }));
 
   const serviceConfigResources: ArtifactConfigResource[] = form.config.resources
     .filter(
-      (resource) => resource.type === "volume" || resource.type === "secret"
+      (resource) => resource.type === "volume" || resource.type === "secret",
     )
     .map((resource) => {
       if (resource.type === "secret") {
@@ -1090,29 +1169,27 @@ async function generateServiceSpecDSL(
       .filter((param) => param.type === "volume" && param.size)
       .map((param) => ({ volume: { name: param.name } }));
 
-  
-
   const rolesParameters: Parameter[] = form.config.parameters
     .filter(
       (resource) =>
         resource.type === "string" ||
         resource.type === "boolean" ||
         resource.type === "number" ||
-        resource.type === "file"
+        resource.type === "file",
     )
     .map((resource, index) => {
-      if (resource.type === "string" ) {
+      if (resource.type === "string") {
         return {
           name: resource.name,
           type: "string",
           configParam: resource.name,
         };
       }
-      if(resource.type === "file") {
+      if (resource.type === "file") {
         return {
-          name: "CONFIG_FILE_"+index,
+          name: "CONFIG_FILE_" + index,
           type: "string",
-          configParam: "CONFIG_FILE_"+index,
+          configParam: "CONFIG_FILE_" + index,
         };
       }
       if (resource.type === "boolean" || resource.type === "bool") {
@@ -1138,12 +1215,12 @@ async function generateServiceSpecDSL(
 
   const rolesResources: ResourceBundle[] = form.config.resources
     .filter(
-      (resource) => resource.type === "volume" || resource.type === "secret"
+      (resource) => resource.type === "volume" || resource.type === "secret",
     )
     .map((resource) => {
       if (resource.type === "secret") {
         return {
-          secret: { name: resource.name, configResource: resource.name || '' },
+          secret: { name: resource.name, configResource: resource.name || "" },
         };
       }
       return { volume: { name: resource.name, configResource: resource.name } };
@@ -1164,12 +1241,17 @@ async function generateServiceSpecDSL(
             config: {
               parameters: [
                 { name: "type", value: "https", type: "string" as const },
+                ...(channel.withMtls && channel.caResource
+                  ? [{ name: "mtls", value: "true", type: "bool" as const }]
+                  : []),
               ],
               resources: [
                 {
                   certificate: {
                     name: "servercert",
-                    configResource: "main_inbound_servercert",
+                    configResource: channel.certificateResource
+                      ? `${channel.channelName}_cert`
+                      : "main_inbound_servercert",
                   },
                 },
                 {
@@ -1178,6 +1260,16 @@ async function generateServiceSpecDSL(
                     configResource: `${channel.channelName}_domain`,
                   },
                 },
+                ...(channel.withMtls && channel.caResource
+                  ? [
+                      {
+                        ca: {
+                          name: "clientca",
+                          configResource: `${channel.channelName}_ca`,
+                        },
+                      },
+                    ]
+                  : []),
               ],
             },
           },
@@ -1186,14 +1278,16 @@ async function generateServiceSpecDSL(
       return {
         name: `${channel.channelName}_inbound`,
         artifact: {
-          artifactKind: "service"  as const,
+          artifactKind: "service" as const,
           moduleDomain: "kumori",
           moduleName: "builtin",
-          moduleVersion: [1, 3, 0]  as [number, number, number],
+          moduleVersion: [1, 3, 0] as [number, number, number],
           artifactName: "TCPInbound",
           packageLocation: "",
           config: {
-            parameters: [{ name: "type", value: "tcp", type: "string" as const }],
+            parameters: [
+              { name: "type", value: "tcp", type: "string" as const },
+            ],
             resources: [
               {
                 port: {
@@ -1232,7 +1326,7 @@ async function generateServiceSpecDSL(
       clientChannel: channel.name,
       serverRole: "self",
       serverChannel: channel.name,
-    })
+    }),
   );
 
   const topology = [...topologyServerChannels, ...topologyClientsChannels];
@@ -1245,7 +1339,7 @@ async function generateServiceSpecDSL(
           resource.type === "number" ||
           resource.type === "boolean" ||
           resource.type === "bool" ||
-          resource.type === "file"
+          resource.type === "file",
       )
       .map((resource, index) => {
         if (resource.type === "string") {
@@ -1271,12 +1365,9 @@ async function generateServiceSpecDSL(
         return { name: resource.name, value: resource.value, type: "string" };
       });
 
-
-  
-
   const deploymentConfigResources: DeploymentResource[] = form.config.resources
     .filter(
-      (resource) => resource.type === "secret" || resource.type === "volume"
+      (resource) => resource.type === "secret" || resource.type === "volume",
     )
     .map((resource) => {
       if (resource.type === "secret") {
@@ -1342,7 +1433,11 @@ async function generateServiceSpecDSL(
         resource: withDefaultValue(channel.domain, ""),
       },
     }));
-  if (deploymentConfigDomain.length) {
+
+  const hasDefaultCertChannelDeployment = form.channels.some(
+    (ch) => ch.protocol === "HTTPS" && ch.isPublic && !ch.certificateResource
+  );
+  if (hasDefaultCertChannelDeployment) {
     deploymentConfigDomain.push({
       certificate: {
         name: "main_inbound_servercert",
@@ -1351,6 +1446,35 @@ async function generateServiceSpecDSL(
     });
   }
 
+  const customCertDeploymentResources: DeploymentResource[] = form.channels
+    .filter(
+      (ch) => ch.protocol === "HTTPS" && ch.isPublic && ch.certificateResource
+    )
+    .map((ch) => ({
+      certificate: {
+        name: `${ch.channelName}_cert`,
+        resource: ch.certificateResource!,
+      },
+    }));
+
+  const customCaDeploymentResources: DeploymentResource[] = form.channels
+    .filter(
+      (ch) =>
+        ch.protocol === "HTTPS" && ch.isPublic && ch.withMtls && ch.caResource
+    )
+    .map((ch) => ({
+      ca: {
+        name: `${ch.channelName}_ca`,
+        resource: ch.caResource!,
+      },
+    }));
+
+  console.log('Generated Deployment Resources:', {
+    deploymentConfigDomain,
+    customCertDeploymentResources,
+    customCaDeploymentResources
+  });
+
   const deploymentConfigPort: DeploymentResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({
@@ -1396,7 +1520,7 @@ async function generateServiceSpecDSL(
     packageLocation: "deployment",
     artifactName: withDefaultValue(
       marketplaceItem?.artifact || form.serviceId + "_service",
-      ""
+      "",
     ),
     tenantId: withDefaultValue(form.tenantId, ""),
     accountId: withDefaultValue(form.accountId, ""),
@@ -1424,6 +1548,8 @@ async function generateServiceSpecDSL(
       parameters,
       resources: [
         ...serverConfigDomainResources,
+        ...customCertResources,
+        ...customCaResources,
         ...serviceConfigPortResources,
         ...serviceConfigResources,
         ...volatileVolumeResources,
@@ -1433,7 +1559,7 @@ async function generateServiceSpecDSL(
       {
         name: withDefaultValue(
           marketplaceItem?.deploymentData?.name || form.serviceId,
-          ""
+          "",
         ),
         artifact: {
           artifactKind:
@@ -1445,18 +1571,18 @@ async function generateServiceSpecDSL(
             : "mod.local",
           moduleName: withDefaultValue(
             marketplaceItem?.module || form.serviceId,
-            ""
+            "",
           ),
           moduleVersion: marketplaceItem?.version
             ? (marketplaceItem.version.split(".").map(Number) as [
                 number,
                 number,
-                number
+                number,
               ])
             : ([0, 0, 1] as [number, number, number]),
           artifactName: withDefaultValue(
             marketplaceItem?.artifact || form.serviceId + "_component",
-            ""
+            "",
           ),
           packageLocation: hasMarketplacePackage
             ? marketplaceItem?.package || ""
@@ -1539,7 +1665,7 @@ async function generateServiceSpecDSL(
         cmd: withDefaultValue(form.defaultExecutable.cmd, undefined),
         entrypoint: withDefaultValue(
           form.defaultExecutable.entryPoint,
-          undefined
+          undefined,
         ),
       },
     };
@@ -1558,15 +1684,16 @@ async function generateServiceSpecDSL(
  */
 export async function deployServiceHelper(
   service: Service,
-  marketplaceItem?: MarketplaceService
+  marketplaceItem?: MarketplaceService,
 ): Promise<FormData> {
   const serviceForm: ServiceSpecForm = transformServiceToForm(service);
 
   let CUEBundle;
   const serviceSpecDSL = await generateServiceSpecDSL(
     serviceForm,
-    marketplaceItem
+    marketplaceItem,
   );
+  console.log('Final generated ServiceSpecDSL:', JSON.stringify(serviceSpecDSL, null, 2));
   CUEBundle = buildServiceDeploymentModule(serviceSpecDSL);
 
   // if (marketplaceItem?.package) {
@@ -1589,11 +1716,11 @@ export async function deployServiceHelper(
       JSON.stringify({
         targetAccount: withDefaultValue(serviceForm.accountId, ""),
         targetEnvironment: withDefaultValue(serviceForm.environmentId, ""),
-      })
+      }),
     );
     formData.append(
       "labels",
-      JSON.stringify({ project: withDefaultValue(service.project, "") })
+      JSON.stringify({ project: withDefaultValue(service.project, "") }),
     );
     formData.append("comment", " ");
     return formData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.0.97",
+  "version": "1.0.98",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {
@@ -11,7 +11,7 @@
     "glob": "^11.0.0"
   },
   "dependencies": {
-    "@kumori/aurora-interfaces": "^1.0.11",
+    "@kumori/aurora-interfaces": "^1.0.12",
     "@kumori/kumori-dsl-generator": "^1.0.4",
     "@kumori/kumori-module-generator": "^1.1.6",
     "ts-node": "^10.9.2",