@kumori/aurora-backend-handler 1.0.95 → 1.0.97

package/helpers/resource-helper.ts

@@ -65,7 +65,8 @@ const buildPortResource = (
 const buildSecretResource = (
   eventData: any,
   tenantId: string,
-  secretsMap: Map<string, any>
+  secretsMap: Map<string, any>,
+  hasRequestingServices: boolean
 ): { resource: Resource; secretsToStore: Array<{ key: string; value: any }> } => {
   const secretName = eventData.id?.name;
   const secretKey = `${tenantId}/${secretName}`;
@@ -113,7 +114,7 @@ const buildSecretResource = (
     type: "secret",
     name: secretName,
     value: eventData.spec.secret,
-    status: "available",
+    status: hasRequestingServices ? "used" : "available",
     tenant: tenantId,
   };
 
@@ -125,7 +126,8 @@ const buildSecretResource = (
  */
 const buildCertificateResource = (
   eventData: any,
-  tenantId: string
+  tenantId: string,
+  hasRequestingServices: boolean
 ): Resource => {
   return {
     type: "certificate",
@@ -133,7 +135,7 @@ const buildCertificateResource = (
     value: eventData.spec.certificate.cert,
     key: eventData.spec.certificate.key,
     domain: eventData.spec.certificate.domain,
-    status: "available",
+    status: hasRequestingServices ? "used" : "available",
     tenant: tenantId,
     certName: eventData.meta?.labels?.certNameWUI || undefined,
     certKeyName: eventData.meta?.labels?.certKeyWUI || undefined,
@@ -145,13 +147,14 @@ const buildCertificateResource = (
  */
 const buildCAResource = (
   eventData: any,
-  tenantId: string
+  tenantId: string,
+   hasRequestingServices: boolean
 ): Resource => {
   return {
     type: "ca",
     name: eventData.id?.name,
     value: eventData.spec.ca,
-    status: "available",
+    status: hasRequestingServices ? "used" : "available",
     tenant: tenantId,
     certName: eventData.meta?.labels?.certNameWUI || undefined,
   };
@@ -203,16 +206,17 @@ export const handleResourceEvent = ({
       const secretResult = buildSecretResource(
         eventData,
         tenantId,
-        secretsMap
+        secretsMap,
+        hasRequestingServices
       );
       resource = secretResult.resource;
       secretsToStore = secretResult.secretsToStore;
       break;
     case "certificate":
-      resource = buildCertificateResource(eventData, tenantId);
+      resource = buildCertificateResource(eventData, tenantId, hasRequestingServices);
       break;
     case "ca":
-      resource = buildCAResource(eventData, tenantId);
+      resource = buildCAResource(eventData, tenantId, hasRequestingServices);
       break;
     case "volume":
       resource = buildVolumeResource(eventData, tenantId);
@@ -304,7 +308,8 @@ export const handleSecretEvent = (
   eventData: any,
   parentParts: { [entity: string]: string },
   tenantsMap: Map<string, Tenant>,
-  secretsMap: Map<string, any>
+  secretsMap: Map<string, any>,
+  hasRequestingServices: boolean = false,
 ): HandleResourceEventResult => {
   return handleResourceEvent({
     kind: "secret",
@@ -312,7 +317,7 @@ export const handleSecretEvent = (
     parentParts,
     tenantsMap,
     secretsMap,
-    hasRequestingServices: false
+    hasRequestingServices
   });
 };
 
@@ -322,7 +327,8 @@ export const handleSecretEvent = (
 export const handleCertificateEvent = (
   eventData: any,
   parentParts: { [entity: string]: string },
-  tenantsMap: Map<string, Tenant>
+  tenantsMap: Map<string, Tenant>,
+  hasRequestingServices: boolean = false,
 ): HandleResourceEventResult => {
   return handleResourceEvent({
     kind: "certificate",
@@ -330,7 +336,7 @@ export const handleCertificateEvent = (
     parentParts,
     tenantsMap,
     secretsMap: new Map(),
-    hasRequestingServices: false
+    hasRequestingServices
   });
 };
 
@@ -340,7 +346,8 @@ export const handleCertificateEvent = (
 export const handleCAEvent = (
   eventData: any,
   parentParts: { [entity: string]: string },
-  tenantsMap: Map<string, Tenant>
+  tenantsMap: Map<string, Tenant>,
+  hasRequestingServices: boolean = false,
 ): HandleResourceEventResult => {
   return handleResourceEvent({
     kind: "ca",
@@ -348,7 +355,7 @@ export const handleCAEvent = (
     parentParts,
     tenantsMap,
     secretsMap: new Map(),
-    hasRequestingServices: false
+    hasRequestingServices
   });
 };
 

package/package.json

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

package/websocket-manager.ts

@@ -902,6 +902,7 @@ const handleEvent = async (message: WSMessage) => {
           parentParts,
           tenantsMap,
           secretsMap,
+          hasRequestingServices,
         );
         secretResult.secretsToStore.forEach(({ key, value }) =>
           secretsMap.set(key, value),
@@ -919,6 +920,7 @@ const handleEvent = async (message: WSMessage) => {
           eventData,
           parentParts,
           tenantsMap,
+          hasRequestingServices,
         );
         processResourceResult(
           certificateResult,
@@ -929,12 +931,13 @@ const handleEvent = async (message: WSMessage) => {
         break;
 
       case "ca":
-        const caResult = handleCAEvent(eventData, parentParts, tenantsMap);
+        const caResult = handleCAEvent(eventData, parentParts, tenantsMap, hasRequestingServices,);
         processResourceResult(
           caResult,
           tenantsMap,
           pendingDomains,
           eventHelper,
+          
         );
         break;