@kumori/aurora-backend-handler 1.1.71 → 1.1.73

package/api/deploy-service-helper.ts

@@ -496,6 +496,7 @@ export function transformServiceToForm(service: Service): ServiceSpecForm {
         resourceVolume: resource.name,
       })),
     scaling: service.role[0].scalling,
+    hsize: service.role[0].hsize
   };
 }
 /**

package/helpers/service-helper.ts

@@ -98,7 +98,7 @@ const parseKeyPath = (key: string): { [entity: string]: string } => {
   return result;
 };
 
-const getDefaultUsage = (): Usage => ({
+const getDefaultUsage = (eventData?: any): Usage => ({
   current: {
     cpu: 0,
     memory: 0,
@@ -108,12 +108,12 @@ const getDefaultUsage = (): Usage => ({
     persistentStorage: 0,
   },
   limit: {
-    cpu: { max: 0, min: 0 },
-    memory: { max: 0, min: 0 },
-    storage: { max: 0, min: 0 },
-    volatileStorage: { max: 0, min: 0 },
-    nonReplicatedStorage: { max: 0, min: 0 },
-    persistentStorage: { max: 0, min: 0 },
+    cpu: { max: eventData.vcpu || 0, min: eventData.vcpu || 0 },
+    memory: { max: eventData.ram || 0, min: eventData.ram || 0 },
+    storage: { max: eventData.shared_disk || 0, min: eventData.shared_disk || 0 },
+    volatileStorage: { max: eventData.volatile_disk || 0, min: eventData.volatile_disk || 0 },
+    nonReplicatedStorage: { max: eventData.persistent_disk || 0, min: eventData.persistent_disk || 0 },
+    persistentStorage: { max: eventData.persistent_disk || 0, min: eventData.persistent_disk || 0 },
   },
   cost: 0,
 });
@@ -193,7 +193,12 @@ export const handleServiceEvent = ({
 
   const projectLabel = eventData.meta?.labels?.project;
   const serviceRoles = roleMap.get(serviceFullKey) || [];
-  const serviceUsage = currentRevision?.usage || getDefaultUsage();
+  const serviceUsage = currentRevision?.usage || getDefaultUsage(eventData);
+  console.log("DEBUG currentRevision", currentRevision);
+  console.log("DEBUG currentRevision.usage", currentRevision?.usage);
+  console.log("DEBUG defaultData", getDefaultUsage(eventData));
+  console.log("DEBUG: serviceUsage", serviceUsage);
+
 
   const serviceRevisions: Revision[] = [];
   revisionsMap.forEach((revision, key) => {

package/package.json

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