@kumori/aurora-backend-handler 1.1.68 → 1.1.70

package/api/deploy-service-helper.ts

@@ -84,6 +84,8 @@ export interface ServiceSpecForm {
   cpuRequirements: number;
   memoryRequirements: number;
   registryUrl: string;
+  registryCredentialsSecret?: string;
+  registryCredentialSecret?: string;
   imageTag: string;
   clientChannels: Array<{ name: string }>;
   channels: Array<{
@@ -136,6 +138,7 @@ export interface ServiceSpecForm {
     };
     histeresys: string;
   };
+  hsize?: number;
 }
 
 export interface ServiceWithLocalComponentSpec {
@@ -444,6 +447,7 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
     cpuRequirements: service.usage.limit.cpu.max,
     memoryRequirements: service.usage.limit.memory.max,
     registryUrl: service.registry,
+    registryCredentialsSecret: service.registryCredentialSecret,
     imageTag: service.imageName,
     clientChannels: service.clientChannels.map((ch) => ({ name: ch.name })),
     channels: service.serverChannels.map((ch) => ({
@@ -1055,7 +1059,7 @@ export async function generateServiceSpec(
                     detail: (marketplaceItem.roles ?? []).reduce(
                       (acc, role) => ({
                         ...acc,
-                        [withDefaultValue(role, "")]: 1,
+                        [withDefaultValue(role, "")]: (marketplaceItem.deploymentData.role ?? []).find((r) => r.name === withDefaultValue(role, ""))?.hsize || 1,
                       }),
                       {},
                     ),
@@ -1098,7 +1102,7 @@ export async function generateServiceSpec(
       ],
       scale: {
         detail: {
-          [withDefaultValue(form.serviceId, "")]: 1,
+          [withDefaultValue(form.serviceId, "")]: form.hsize || 1,
         },
       },
       meta: autoscalingDefined
@@ -1607,7 +1611,7 @@ async function generateServiceSpecDSL(
       ],
       scale: {
         detail: {
-          [withDefaultValue(form.serviceId, "")]: 1,
+          [withDefaultValue(form.serviceId, "")]: form.hsize || 1,
         },
       },
       meta: {
@@ -1651,13 +1655,13 @@ async function generateServiceSpecDSL(
       memoryRequirements: withDefaultValue(form.memoryRequirements, 0) * 1000,
       registryUrl: withDefaultValue(form.registryUrl, "docker.io").trim(),
       imageTag: withDefaultValue(form.imageTag, "").trim(),
-      registryCredentialsSecret: form.config.resources
-        .map((r) => {
-          if (r.type === "secret" && r.key === "registryCredentials") {
-            return r.name;
-          }
-        })
-        .find((name) => name !== undefined),
+      registryCredentialsSecret: form.registryCredentialsSecret
+        ? form.config.resources.find(
+            (r) => r.type === "secret" && r.name === form.registryCredentialsSecret,
+          )?.name
+        : form.config.resources.find(
+            (r) => r.type === "secret" && r.key === "registryCredentials",
+          )?.name,
       config: {
         parameters,
         resources: componentResources,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.68",
+  "version": "1.1.70",
   "description": "backend handler",
   "main": "backend-handler.ts",
   "scripts": {
@@ -11,7 +11,7 @@
     "glob": "^11.0.0"
   },
   "dependencies": {
-    "@kumori/aurora-interfaces": "1.0.16",
+    "@kumori/aurora-interfaces": "^1.0.18",
     "@kumori/kumori-dsl-generator": "1.0.6",
     "@kumori/kumori-module-generator": "^1.1.6",
     "ts-node": "^10.9.2",