FORMS-1671: Connect to ESS via NATS protocol

Signed-off-by: Jason Sherman <tools@usingtechnolo.gy>
bcgov · Dec 16, 2024 · a5b2c00 · a5b2c00
1 parent e8324f9
commit a5b2c00
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 19 deletions.
diff --git a/.devcontainer/chefs_local/test.json b/.devcontainer/chefs_local/test.json
@@ -63,6 +63,8 @@
   },
   "eventStreamService": {
     "servers": "localhost:4222,localhost:4223,localhost:4224",
+    "websockets": "false",
+    "consumerservers": "localhost:4222,localhost:4223,localhost:4224",
     "streamName": "CHEFS",
     "source": "chefs",
     "domain": "forms",

diff --git a/app/config/custom-environment-variables.json b/app/config/custom-environment-variables.json
@@ -61,6 +61,7 @@
   "eventStreamService": {
     "servers": "EVENTSTREAMSERVICE_SERVERS",
     "websockets": "EVENTSTREAMSERVICE_WEBSOCKETS",
+    "consumerservers": "EVENTSTREAMSERVICE_CONSUMERSERVERS",
     "streamName": "EVENTSTREAMSERVICE_STREAMNAME",
     "source": "EVENTSTREAMSERVICE_SOURCE",
     "domain": "EVENTSTREAMSERVICE_DOMAIN",

diff --git a/app/config/default.json b/app/config/default.json
@@ -65,6 +65,7 @@
   "eventStreamService": {
     "servers": "localhost:4222,localhost:4223,localhost:4224",
     "websockets": "false",
+    "consumerservers": "localhost:4222,localhost:4223,localhost:4224",
     "streamName": "CHEFS",
     "source": "chefs-local",
     "domain": "forms",

diff --git a/app/frontend/src/components/designer/settings/FormEventStreamSettings.vue b/app/frontend/src/components/designer/settings/FormEventStreamSettings.vue
@@ -127,7 +127,7 @@ defineExpose({
             >{{ $t('trans.formSettings.serversLabel') }}:
           </span>
           <span class="ml-2">{{
-            appStore.config?.eventStreamService?.servers
+            appStore.config?.eventStreamService?.consumerservers
           }}</span>
         </span>
         <br />

diff --git a/openshift/README.md b/openshift/README.md
@@ -157,18 +157,14 @@ oc create -n $NAMESPACE secret generic $APP_NAME-encryption-keys \
   --from-literal=proxy=$proxy_key
 ```
 
-We need to store a password for Event Stream Service client. Since the server(s) will change along with the password, we will store the server and credentials in a secret per environment (DEV, TEST, PROD) and whether we connect with WebSockets or NATS protocols Pull requests can use the same as DEV.
+We need to store a username/password for Event Stream Service client. Additional configuration (Stream name, servers, stream limits) is in a Config Map: `chefs-XXX-event-stream-service`.
 
 ```sh
 
-export ess_servers=<comma separated list of event stream servers>
-export ess_websockets=<true/false - true if connection is made via websockets>
 export ess_password=<chefs password from event stream service>
 
 oc create -n $NAMESPACE secret generic $APP_NAME-event-stream-service \
   --type=Opaque \
-  --from-literal=servers=$ess_servers \
-  --from-literal=websockets=$ess_websockets \
   --from-literal=username=chefs \
   --from-literal=password=$ess_password
 ```

diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml
@@ -233,16 +233,6 @@ objects:
                     secretKeyRef:
                       key: mailapitoken
                       name: "chefs-${JOB_NAME}-secret"
-                - name: EVENTSTREAMSERVICE_SERVERS
-                  valueFrom:
-                    secretKeyRef:
-                      key: servers
-                      name: "${APP_NAME}-event-stream-service"
-                - name: EVENTSTREAMSERVICE_WEBSOCKETS
-                  valueFrom:
-                    secretKeyRef:
-                      key: websockets
-                      name: "${APP_NAME}-event-stream-service"
                 - name: EVENTSTREAMSERVICE_USERNAME
                   valueFrom:
                     secretKeyRef:

diff --git a/openshift/ess.cm.yaml b/openshift/ess.cm.yaml
@@ -17,6 +17,9 @@ objects:
     metadata:
       name: "${APP_NAME}-${JOB_NAME}-event-stream-service"
     data:
+      EVENTSTREAMSERVICE_SERVERS: ${SERVERS}
+      EVENTSTREAMSERVICE_WEBSOCKETS: ${WEBSOCKETS}
+      EVENTSTREAMSERVICE_CONSUMERSERVERS: ${CONSUMERSERVERS}
       EVENTSTREAMSERVICE_STREAMNAME: ${STREAMNAME}
       EVENTSTREAMSERVICE_SOURCE: ${SOURCE}
       EVENTSTREAMSERVICE_DOMAIN: ${DOMAIN}
@@ -35,6 +38,18 @@ parameters:
     description: Job identifier (i.e. 'pr-5' OR 'master')
     displayName: Job Branch Name
     required: true
+  - name: SERVERS
+    description: Comma separated list of NATS servers for Event Stream Service
+    displayName: Event Stream NATS servers
+    required: true
+  - name: WEBSOCKETS
+    description: Connect to ESS via websockets or NATS protocol
+    displayName: Connect with websockets
+    required: true
+  - name: CONSUMERSERVERS
+    description: ESS Servers for consumer configuration
+    displayName: ESS Servers (consumers)
+    required: true
   - name: STREAMNAME
     description: Name of the CHEFS Event Stream
     displayName: CHEFS Event Stream name

diff --git a/openshift/ess.dev.param b/openshift/ess.dev.param
@@ -6,4 +6,7 @@ MAXBYTES="966367641"
 MAXMSGS="1000"
 MAXMSGSIZE="966367"
 DUPLICATEWINDOW="60000"
-NUMREPLICAS="3"
+NUMREPLICAS="3"
+SERVERS=ess-nats.a191b5-dev.svc.cluster.local
+WEBSOCKETS=false
+CONSUMERSERVERS=stream-dev.apps.silver.devops.gov.bc.ca
diff --git a/openshift/ess.prod.param b/openshift/ess.prod.param
@@ -6,4 +6,7 @@ MAXBYTES="966367641"
 MAXMSGS="1000"
 MAXMSGSIZE="966367"
 DUPLICATEWINDOW="60000"
-NUMREPLICAS="3"
+NUMREPLICAS="3"
+SERVERS=ess-nats.a191b5-prod.svc.cluster.local
+WEBSOCKETS=false
+CONSUMERSERVERS=stream.digital.gov.bc.ca
diff --git a/openshift/ess.test.param b/openshift/ess.test.param
@@ -6,4 +6,7 @@ MAXBYTES="209715200"
 MAXMSGS="500"
 MAXMSGSIZE="419430"
 DUPLICATEWINDOW="60000"
-NUMREPLICAS="3"
+NUMREPLICAS="3"
+SERVERS=ess-nats.a191b5-test.svc.cluster.local
+WEBSOCKETS=false
+CONSUMERSERVERS=stream-test.apps.silver.devops.gov.bc.ca