@kumori/aurora-backend-handler 1.0.98 → 1.0.99

package/api/deploy-service-helper.ts

@@ -646,9 +646,6 @@ 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: [
@@ -670,7 +667,7 @@ export async function generateServiceSpec(
                   ? [
                       {
                         ca: {
-                          name: "clientca",
+                          name: "clientcertca",
                           configResource: `${channel.channelName}_ca`,
                         },
                       },
@@ -892,7 +889,11 @@ export async function generateServiceSpec(
         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",
@@ -900,6 +901,29 @@ export async function generateServiceSpec(
       },
     });
   }
+
+  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!,
+      },
+    }));
   const deploymentConfigPort: DeploymentResource[] = form.channels
     .filter((channel) => channel.protocol === "TCP" && channel.isPublic)
     .map((channel) => ({
@@ -1077,6 +1101,8 @@ export async function generateServiceSpec(
       parameters: [...deploymentConfigParameters],
       resources: [
         ...deploymentConfigDomain,
+        ...customCertDeploymentResources,
+        ...customCaDeploymentResources,
         ...deploymentConfigPort,
         ...deploymentConfigResources,
       ],
@@ -1241,9 +1267,6 @@ 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: [
                 {
@@ -1264,7 +1287,7 @@ async function generateServiceSpecDSL(
                   ? [
                       {
                         ca: {
-                          name: "clientca",
+                          name: "clientcertca",
                           configResource: `${channel.channelName}_ca`,
                         },
                       },
@@ -1600,6 +1623,8 @@ async function generateServiceSpecDSL(
       parameters: [...deploymentConfigParameters],
       resources: [
         ...deploymentConfigDomain,
+        ...customCertDeploymentResources,
+        ...customCaDeploymentResources,
         ...deploymentConfigPort,
         ...deploymentConfigResources,
       ],

package/package.json

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