Remove hardcoded suspend values for WS and Webhook ports

Author: NethmiRanasinghe

all-in-one-apim/modules/distribution/product/src/main/resources/conf/default.json

@@ -236,6 +236,7 @@
   "recaptcha.enabled": false,
   "recaptcha.api_url": "https://www.google.com/recaptcha/api.js",
   "recaptcha.verify_url": "https://www.google.com/recaptcha/api/siteverify",
+  "apim.ws.enable": true,
   "apim.ws.port" : "9099",
   "apim.ws.dispatch.sequence" : "dispatchSeq",
   "apim.ws.dispatch.on_error.sequence" : "fault",
@@ -244,6 +245,7 @@
   "apim.ws.dispatch.custom.sequence" : true,
   "apim.ws.outflow.dispatch.fault.sequence" : "fault",
   "apim.ws.client.side.broadcast.level" : "0",
+  "apim.wss.enable": true,
   "apim.wss.port" : "8099",
   "apim.wss.dispatch.sequence" : "dispatchSeq",
   "apim.wss.dispatch.on_error.sequence" : "fault",
@@ -256,6 +258,7 @@
   "apim.wss.keystore.password" : "$ref{keystore.tls.password}",
   "apim.wss.keystore.key_password" : "$ref{keystore.tls.key_password}",
   "apim.wss.ssl_enabled_protocols" : "TLSv1.1,TLSv1.2",
+  "apim.webhooks.https.enable": true,
   "apim.webhooks.https.port" : "8021",
   "apim.webhooks.https.key_store.location": "repository/resources/security/$ref{keystore.tls.file_name}",
   "apim.webhooks.https.key_store.type": "$ref{keystore.tls.type}",

all-in-one-apim/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/SecureWebSocketInboundEndpoint.xml.j2

@@ -5,7 +5,7 @@
                  sequence="{{apim.wss.dispatch.sequence}}"
                  onError="{{apim.wss.dispatch.on_error.sequence}}"
                  protocol="wss"
-                 suspend="false">
+                 suspend="{{!apim.wss.enable}}">
     <parameters>
         <parameter name="inbound.ws.port">{{apim.wss.port}}</parameter>
         <parameter name="ws.outflow.dispatch.sequence">{{apim.wss.out_dispatch_seq}}</parameter>

all-in-one-apim/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/SecureWebhookServer.xml.j2

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inboundEndpoint name="SecureWebhookServer"
                  protocol="https"
-                 suspend="false" sequence="TestIn" onError="fault" >
+                 suspend="{{!apim.webhooks.https.enable}}" sequence="TestIn" onError="fault" >
     <p:parameters xmlns:p="http://ws.apache.org/ns/synapse">
         <p:parameter  name="inbound.http.port">{{apim.webhooks.https.port}}</p:parameter>
         <p:parameter name="keystore">

all-in-one-apim/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/WebSocketInboundEndpoint.xml.j2

@@ -4,7 +4,7 @@
                  sequence="{{apim.ws.dispatch.sequence}}"
                  onError="{{apim.ws.dispatch.on_error.sequence}}"
                  protocol="ws"
-                 suspend="false">
+                 suspend="{{!apim.ws.enable}}">
     <parameters>
         <parameter name="inbound.ws.port">{{apim.ws.port}}</parameter>
         <parameter name="ws.outflow.dispatch.sequence">{{apim.ws.out_dispatch_seq}}</parameter>

all-in-one-apim/modules/distribution/product/src/main/resources/conf/templates/repository/resources/apim-synapse-config/SecureWebhookServer.xml.j2

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inboundEndpoint name="SecureWebhookServer"
                  protocol="https"
-                 suspend="false" sequence="TestIn" onError="fault" >
+                 suspend="{{!apim.webhooks.https.enable}}" sequence="TestIn" onError="fault" >
     <p:parameters xmlns:p="http://ws.apache.org/ns/synapse">
         <p:parameter  name="inbound.http.port">{{apim.webhooks.https.port}}</p:parameter>
         <p:parameter name="keystore">

gateway/modules/distribution/product/src/main/resources/conf/default.json

@@ -236,6 +236,7 @@
   "recaptcha.enabled": false,
   "recaptcha.api_url": "https://www.google.com/recaptcha/api.js",
   "recaptcha.verify_url": "https://www.google.com/recaptcha/api/siteverify",
+  "apim.ws.enable": true,
   "apim.ws.port" : "9099",
   "apim.ws.dispatch.sequence" : "dispatchSeq",
   "apim.ws.dispatch.on_error.sequence" : "fault",
@@ -244,6 +245,7 @@
   "apim.ws.dispatch.custom.sequence" : true,
   "apim.ws.outflow.dispatch.fault.sequence" : "fault",
   "apim.ws.client.side.broadcast.level" : "0",
+  "apim.wss.enable": true,
   "apim.wss.port" : "8099",
   "apim.wss.dispatch.sequence" : "dispatchSeq",
   "apim.wss.dispatch.on_error.sequence" : "fault",
@@ -256,6 +258,7 @@
   "apim.wss.keystore.password" : "$ref{keystore.tls.password}",
   "apim.wss.keystore.key_password" : "$ref{keystore.tls.key_password}",
   "apim.wss.ssl_enabled_protocols" : "TLSv1.1,TLSv1.2",
+  "apim.webhooks.https.enable": true,
   "apim.webhooks.https.port" : "8021",
   "apim.webhooks.https.key_store.location": "repository/resources/security/$ref{keystore.tls.file_name}",
   "apim.webhooks.https.key_store.type": "$ref{keystore.tls.type}",

gateway/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/SecureWebSocketInboundEndpoint.xml.j2

@@ -5,7 +5,7 @@
                  sequence="{{apim.wss.dispatch.sequence}}"
                  onError="{{apim.wss.dispatch.on_error.sequence}}"
                  protocol="wss"
-                 suspend="false">
+                 suspend="{{!apim.wss.enable}}">
     <parameters>
         <parameter name="inbound.ws.port">{{apim.wss.port}}</parameter>
         <parameter name="ws.outflow.dispatch.sequence">{{apim.wss.out_dispatch_seq}}</parameter>

gateway/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/SecureWebhookServer.xml.j2

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inboundEndpoint name="SecureWebhookServer"
                  protocol="https"
-                 suspend="false" sequence="TestIn" onError="fault" >
+                 suspend="{{!apim.webhooks.https.enable}}" sequence="TestIn" onError="fault" >
     <p:parameters xmlns:p="http://ws.apache.org/ns/synapse">
         <p:parameter  name="inbound.http.port">{{apim.webhooks.https.port}}</p:parameter>
         <p:parameter name="keystore">

gateway/modules/distribution/product/src/main/resources/conf/templates/repository/deployment/server/synapse-configs/default/inbound-endpoints/WebSocketInboundEndpoint.xml.j2

@@ -4,7 +4,7 @@
                  sequence="{{apim.ws.dispatch.sequence}}"
                  onError="{{apim.ws.dispatch.on_error.sequence}}"
                  protocol="ws"
-                 suspend="false">
+                 suspend="{{!apim.ws.enable}}">
     <parameters>
         <parameter name="inbound.ws.port">{{apim.ws.port}}</parameter>
         <parameter name="ws.outflow.dispatch.sequence">{{apim.ws.out_dispatch_seq}}</parameter>

gateway/modules/distribution/product/src/main/resources/conf/templates/repository/resources/apim-synapse-config/SecureWebhookServer.xml.j2

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inboundEndpoint name="SecureWebhookServer"
                  protocol="https"
-                 suspend="false" sequence="TestIn" onError="fault" >
+                 suspend="{{!apim.webhooks.https.enable}}" sequence="TestIn" onError="fault" >
     <p:parameters xmlns:p="http://ws.apache.org/ns/synapse">
         <p:parameter  name="inbound.http.port">{{apim.webhooks.https.port}}</p:parameter>
         <p:parameter name="keystore">