@kumori/aurora-backend-handler 1.1.67 → 1.1.69

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<{
@@ -444,6 +446,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) => ({
@@ -1651,13 +1654,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/helpers/environment-helper.ts

@@ -80,17 +80,18 @@ export const handleEnvironmentEvent = ({
     logo: "",
     services: [],
     domains: [],
-    status: eventData.meta?.deleted
-      ? {
-          code: "DELETING",
-          message: `Environment ${entityId} is being deleted.`,
-          timestamp: new Date().toISOString(),
-        }
-      : {
-          code: eventData.status.state.code,
-          message: eventData.status.state.message,
-          timestamp: eventData.status.state.timestamp,
-        },
+    status: (() => {
+      const existingCode = existingEnvironment?.status?.code;
+      const isPurging = existingCode === "PURGING" || existingCode === "CLEANING_ENVIRONMENT";
+      const eventCode = eventData.meta?.deleted ? "DELETING" : eventData.status?.state?.code;
+      if (isPurging && typeof eventCode === "string" && eventCode.startsWith("DELETING")) {
+        return { code: "PURGING", message: `Environment ${entityId} is being purged.`, timestamp: new Date().toISOString() };
+      }
+      if (eventData.meta?.deleted) {
+        return { code: "DELETING", message: `Environment ${entityId} is being deleted.`, timestamp: new Date().toISOString() };
+      }
+      return { code: eventData.status.state.code, message: eventData.status.state.message, timestamp: eventData.status.state.timestamp };
+    })(),
     highAvaliable: eventData.spec.highlyAvailable || false,
     usage: {
       current: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kumori/aurora-backend-handler",
-  "version": "1.1.67",
+  "version": "1.1.69",
   "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",

package/websocket-manager.ts

@@ -712,7 +712,7 @@ const handleEvent = async (message: WSMessage) => {
         }
         const envSetKey = parentParts.tenant && parentParts.account ? `${parentParts.tenant}/${parentParts.account}/${entityId}` : entityId;
         let envToStore = envEventResult.environment;
-        if (envToStore.status?.code === "DELETING" && purgingEnvironments.has(envSetKey)) {
+        if (envToStore.status?.code?.startsWith("DELETING") && purgingEnvironments.has(envSetKey)) {
           envToStore = {
             ...envToStore,
             status: {