Merge pull request #232 from solace-iot-team/feat-app-status-webhook-…

…name Feat app status webhook name
solace-iot-team · Apr 22, 2022 · cc04c43 · cc04c43
2 parents 5ef0857 + 4bd3347
commit cc04c43
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/api-implementation/server/api/services/broker/statusservice.ts b/api-implementation/server/api/services/broker/statusservice.ts
@@ -115,14 +115,15 @@ class StatusService {
         const bindingStatus: MsgVpnRestDeliveryPointQueueBindingResponse = await apiClient.getMsgVpnRestDeliveryPointQueueBinding(service.msgVpnName, app.internalName, app.internalName);
         const q: MsgVpnQueueResponse = await apiClient.getMsgVpnQueue(service.msgVpnName, encodeURIComponent(app.internalName));
         const up: boolean = c.up && (consumerStatus.data && consumerStatus.data.up) && (bindingStatus.data && bindingStatus.data.up);
-
+        const wh: WebHook = this.getWebHook(app, envName);
         const conn: WebHookStatus = {
           up: up,
           failureReason: up ? '' : `${c.lastFailureReason} (${consumerStatus.data.lastConnectionFailureReason})`,
           lastFailureTime: c.lastFailureTime,
           messagesQueued: q.collections.msgs.count,
           messagesQueuedMB: (q.data.msgSpoolUsage / 1048576),
-          uri: this.getWebHookURI(app, envName),
+          uri: wh.uri,
+          name: wh.name?wh.name:wh.uri,
         }
         webHooks.push(conn);
       }
@@ -157,7 +158,7 @@ class StatusService {
     }
   }
 
-  private getWebHookURI(app: App, envName: string): string {
+  private getWebHook(app: App, envName: string): WebHook {
     let wh: WebHook;
     // try to locate specific web hook for this environment
     wh = app.webHooks.find(w => w.environments && w.environments.find(e => e == envName));
@@ -166,9 +167,9 @@ class StatusService {
       wh = app.webHooks.find(w => (w.environments === undefined || w.environments.length == 0));
     }
     if (wh) {
-      return wh.uri;
+      return wh;
     } else {
-      return '';
+      return null;
     }
   }
 }

diff --git a/api-implementation/server/common/api.yml b/api-implementation/server/common/api.yml
@@ -2,7 +2,7 @@ openapi: 3.0.0
 info:
   title: Solace API Management Connector
   description: 'Solace API Management Connector API. Note: basic authentication security mechanism is deprecated.'
-  version: 0.7.10
+  version: 0.7.11
 servers:
   - url: /v1
 
@@ -1210,6 +1210,11 @@ components:
           pattern: "^https?:\\/\\/[A-Za-z\\.:0-9\\-]*.*$"
           minLength: 0
           maxLength: 200
+        name: 
+          type: string
+          minLength: 3
+          maxLength: 200
+          pattern: ^.*$
         up:
           description: indicates if the webhook is up and running
           type: boolean

diff --git a/api-implementation/src/model/@types/api-model/index.d.ts b/api-implementation/src/model/@types/api-model/index.d.ts
@@ -1093,6 +1093,7 @@ declare namespace Components {
         }
         export interface WebHookStatus {
             uri?: string; // ^https?:\/\/[A-Za-z\.:0-9\-]*.*$
+            name?: string; // ^.*$
             /**
              * indicates if the webhook is up and running
              * example: