@kumori/aurora-backend-handler 1.0.44 → 1.0.46

package/api/account-api-service.ts

@@ -222,6 +222,7 @@ export const createAccount = async (account: Account, security: Security) => {
                   username: account.cloudProvider.username || "",
                   password: account.cloudProvider.password || "",
                   region: account.cloudProvider?.region || "",
+                  project_id: account.cloudProvider?.project_id || "",
                 }
               : {
                   method: providerName,
@@ -333,6 +334,7 @@ export const createAccount = async (account: Account, security: Security) => {
                   password: account.cloudProvider.password || "",
                   region: account.cloudProvider?.region || "",
                   domain: account.cloudProvider?.domain || "",
+                  project_id: account.cloudProvider?.project_id || "",
                 }
               : {
                   method: providerName,
@@ -611,6 +613,7 @@ export const deleteAccount = async (account: Account, security: Security) => {
           credentials: {
             username: account.cloudProvider.username,
             password: account.cloudProvider.password,
+            project_id: account.cloudProvider.project_id || "",
           },
         },
       };
@@ -625,6 +628,7 @@ export const deleteAccount = async (account: Account, security: Security) => {
             username: account.cloudProvider.username,
             password: account.cloudProvider.password,
             domain: account.cloudProvider.domain,
+            project_id: account.cloudProvider.project_id || "",
           },
         },
       };
@@ -990,6 +994,7 @@ export const updateAccount = async (account: Account, security: Security) => {
                 username: account.cloudProvider.username || "",
                 password: account.cloudProvider.password || "",
                 region: account.cloudProvider?.region || "",
+                project_id: account.cloudProvider?.project_id || "",
               }
             : {
                 method: providerName,
@@ -1099,6 +1104,7 @@ export const updateAccount = async (account: Account, security: Security) => {
                 password: account.cloudProvider.password || "",
                 region: account.cloudProvider?.region || "",
                 domain: account.cloudProvider?.domain || "",
+                project_id: account.cloudProvider?.project_id || "",
               }
             : {
                 method: providerName,

package/api/service-api-service.ts

@@ -7,6 +7,7 @@ import {
   makeGlobalWebSocketRequest,
 } from "../websocket-manager";
 import { Link, Notification, Service } from "@kumori/aurora-interfaces";
+import { Revision } from "@kumori/aurora-interfaces/interfaces/revision-interface";
 let pendingLinks = new Map<string, Link[]>();
 /**
  * Function to deploy a service
@@ -15,13 +16,13 @@ let pendingLinks = new Map<string, Link[]>();
 export const deployService = async (data: Service, token: string) => {
   try {
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`,
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}`
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
     url.searchParams.append("wait", "30000");
     url.searchParams.append("validate", "true");
-    if (data.dsl) {
+    if(data.dsl){
       url.searchParams.append("dsl", "true");
     }
     if (data.serviceData) {
@@ -32,7 +33,7 @@ export const deployService = async (data: Service, token: string) => {
         JSON.stringify({
           targetAccount: data.account,
           targetEnvironment: data.environment,
-        }),
+        })
       );
       formData.append("labels", JSON.stringify({ project: data.project }));
       formData.append("comment", " ");
@@ -47,7 +48,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_",
+        (event: any) => event.content === "_timeout_"
       );
 
       if (isTimeout) {
@@ -80,7 +81,7 @@ export const deployService = async (data: Service, token: string) => {
       const jsonResponse = await response.json();
 
       const isTimeout = jsonResponse?.events?.some(
-        (event: any) => event.content === "_timeout_",
+        (event: any) => event.content === "_timeout_"
       );
 
       if (isTimeout) {
@@ -110,7 +111,7 @@ export const redeployService = async (data: Service) => {
   try {
     const formData = await deployServiceHelper(data);
     const url = new URL(
-      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`,
+      `${environment.apiServer.baseUrl}/api/${environment.apiServer.apiVersion}/tenant/${data.tenant}/service/${data.name}/revision/${data.currentRevision}`
     );
     url.searchParams.append("dryrun", "false");
     url.searchParams.append("accept", "true");
@@ -129,7 +130,7 @@ export const redeployService = async (data: Service) => {
     const jsonResponse = await response.json();
 
     const isTimeout = jsonResponse?.events?.some(
-      (event: any) => event.content === "_timeout_",
+      (event: any) => event.content === "_timeout_"
     );
 
     if (isTimeout) {
@@ -162,7 +163,7 @@ export const deleteService = async (data: Service, security: string) => {
       deleteBody,
       30000,
       "DELETE",
-      data.name,
+      data.name
     );
     return response;
   } catch (err) {
@@ -187,7 +188,7 @@ export const restartService = async (data: Service, security: string) => {
       restartBody,
       30000,
       "RESTART",
-      data.name,
+      data.name
     );
 
     const updatedService: Service = {
@@ -210,33 +211,27 @@ export const restartService = async (data: Service, security: string) => {
 const generateLinkBody = (data: Service, link: Link) => {
   const originInClient = data.clientChannels.find(
     (channel) =>
-      channel.name === link.originChannel ||
-      channel.from === link.originChannel,
+      channel.name === link.originChannel || channel.from === link.originChannel
   );
   const originInServer = data.serverChannels.find(
     (channel) =>
-      channel.name === link.originChannel ||
-      channel.from === link.originChannel,
+      channel.name === link.originChannel || channel.from === link.originChannel
   );
   const originInDuplex = data.duplexChannels.find(
     (channel) =>
-      channel.name === link.originChannel ||
-      channel.from === link.originChannel,
+      channel.name === link.originChannel || channel.from === link.originChannel
   );
   const targetInClient = data.clientChannels.find(
     (channel) =>
-      channel.name === link.targetChannel ||
-      channel.from === link.targetChannel,
+      channel.name === link.targetChannel || channel.from === link.targetChannel
   );
   const targetInServer = data.serverChannels.find(
     (channel) =>
-      channel.name === link.targetChannel ||
-      channel.from === link.targetChannel,
+      channel.name === link.targetChannel || channel.from === link.targetChannel
   );
   const targetInDuplex = data.duplexChannels.find(
     (channel) =>
-      channel.name === link.targetChannel ||
-      channel.from === link.targetChannel,
+      channel.name === link.targetChannel || channel.from === link.targetChannel
   );
 
   let linkBody;
@@ -296,7 +291,7 @@ const generateLinkBody = (data: Service, link: Link) => {
     };
   } else {
     console.warn(
-      `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`,
+      `No se encontraron canales para el enlace: origin=${link.origin}, target=${link.target}`
     );
     linkBody = {
       client_tenant: data.tenant,
@@ -324,7 +319,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
             linkBody,
             30000,
             "LINK",
-            service.name,
+            service.name
           );
 
           const notification: Notification = {
@@ -358,7 +353,7 @@ export const linkPendingServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      }),
+      })
     );
   }
 };
@@ -380,7 +375,7 @@ export const requestRevisionData = async (service: Service, token: string) => {
       "GET_REVISION",
       service.name,
       "service",
-      service,
+      service
     );
     return response;
   } catch (err) {
@@ -577,33 +572,33 @@ export const updateService = async (
         "UPDATE_CONFIG",
         data.name,
       );
+      const updatedService: Service = {
+        ...data,
+        status: {
+          code: "PENDING",
+          message: "",
+          timestamp: "",
+          args: [],
+        },
+      };
+      eventHelper.service.publish.updated(updatedService);
+  
+      const updateNotification: Notification = {
+        type: "success",
+        subtype: "service-updated",
+        date: Date.now().toString(),
+        status: "unread",
+        callToAction: false,
+        data: {
+          service: data.name,
+          tenant: data.tenant,
+        },
+      };
+  
+      eventHelper.notification.publish.creation(updateNotification);
+      return response;
     }
 
-    const updatedService: Service = {
-      ...data,
-      status: {
-        code: "PENDING",
-        message: "",
-        timestamp: "",
-        args: [],
-      },
-    };
-    eventHelper.service.publish.updated(updatedService);
-
-    const updateNotification: Notification = {
-      type: "success",
-      subtype: "service-updated",
-      date: Date.now().toString(),
-      status: "unread",
-      callToAction: false,
-      data: {
-        service: data.name,
-        tenant: data.tenant,
-      },
-    };
-
-    eventHelper.notification.publish.creation(updateNotification);
-    return response;
   } catch (err) {
     console.error("Error updating service configuration via WebSocket:", err);
     const notification: Notification = {
@@ -628,7 +623,7 @@ export const updateService = async (
 };
 export const unlinkServices = async (service: Service, token: string) => {
   const deleteLinks: Link[] = service.links.filter(
-    (link) => link.delete === true,
+    (link) => link.delete === true
   );
   if (deleteLinks.length > 0) {
     await Promise.all(
@@ -643,7 +638,7 @@ export const unlinkServices = async (service: Service, token: string) => {
             unlinkBody,
             30000,
             "UNLINK",
-            service.name,
+            service.name
           );
 
           const unlinkNotification: Notification = {
@@ -679,7 +674,7 @@ export const unlinkServices = async (service: Service, token: string) => {
           };
           eventHelper.notification.publish.creation(notification);
         }
-      }),
+      })
     );
   }
 };
@@ -704,7 +699,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "UNLINK",
-        link.origin,
+        link.origin
       );
 
       // const unlinkNotification: Notification = {
@@ -750,7 +745,7 @@ export const updateServiceLinks = async (link: Link, token: string) => {
         linkBody,
         30000,
         "LINK",
-        link.origin,
+        link.origin
       );
 
       const notification: Notification = {
@@ -806,7 +801,7 @@ export const changeRevision = async (data: Service, token: string) => {
       revisionBody,
       30000,
       "UPDATE_REVISION",
-      data.name,
+      data.name
     );
     const notification: Notification = {
       type: "success",
@@ -838,10 +833,10 @@ export const changeRevision = async (data: Service, token: string) => {
     eventHelper.notification.publish.creation(notification);
   }
 };
-function getLatestRevision(revisions: string[]): number | null {
+function getLatestRevision(revisions: Revision[]): number | null {
   if (!revisions || revisions.length === 0) {
     return null;
   }
-
-  return Math.max(...revisions.map(Number));
-}
+  
+  return Math.max(...revisions.map((revision) => Number(revision.id)));
+}