Update main branch with test

.env.example

@@ -37,6 +37,12 @@ PORTAL_EXPIRE_TOKEN_ENDPOINT=expireToken
 APP_CONFIG='{
   "localhost": {
     "apiHost":"someHost",
+    "apiKey": "secret",
+    "portalAuth": "basic",
+    "basicAuth": {
+      "username": "test",
+      "password": "thing"
+    },
     "saveEndpoint":"someEndpoint",
     "employeeEndpoint":"someEndpoint"
   }

.github/workflows/build-and-deploy.yml

@@ -1,76 +1,127 @@
-name: Build and Deploy
-
-on:
-  push:
-    branches:
-      - main
-      - dev
-      - test
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-
-  build_and_push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch,ref=${{ github.ref_name }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-    outputs:
-      image_tag: ${{ steps.meta.outputs.tags }}
-
-  deploy:
-    needs: build_and_push
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4
-
-      - name: Install oc CLI
-        uses: redhat-actions/oc-installer@v1
-
-      - name: Authenticate with OpenShift
-        uses: redhat-actions/oc-login@v1
-        with:
-          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
-          namespace: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_NAMESPACE || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_NAMESPACE) || secrets.OPENSHIFT_TEST_NAMESPACE }}
-          openshift_token: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_TOKEN || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_TOKEN) || secrets.OPENSHIFT_TEST_TOKEN }}
-          insecure_skip_tls_verify: true
-
-      - name: Deploy with Helm
-        run: |
-          helm upgrade --install communication-layer ./helm --set image.repository=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} --set image.tag=${{ needs.build_and_push.outputs.image_tag }}
-      - name: Trigger OpenShift Rollout
-        run: |
-         oc rollout restart deployment/communication-layer    
+name: Build and Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - test
+    workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch,ref=${{ github.ref_name }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+    outputs:
+      image_tag: ${{ steps.meta.outputs.tags }}
+
+  deploy:
+    needs: build_and_push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install oc CLI
+        uses: redhat-actions/oc-installer@v1
+
+      - name: Authenticate with OpenShift
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
+          namespace: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_NAMESPACE || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_NAMESPACE) || secrets.OPENSHIFT_TEST_NAMESPACE }}
+          openshift_token: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_TOKEN || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_TOKEN) || secrets.OPENSHIFT_TEST_TOKEN }}
+          insecure_skip_tls_verify: true
+
+      - name: Deploy with Helm
+        run: |
+          helm upgrade --install communication-layer ./helm --set image.repository=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} --set image.tag=${{ needs.build_and_push.outputs.image_tag }}
+      - name: Trigger OpenShift Rollout
+        run: |
+         oc rollout restart deployment/communication-layer
+
+       # Deploy to Tools only if branch = dev
+      - name: Authenticate with OpenShift (tools env)
+        if: github.ref == 'refs/heads/dev'
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
+          namespace: ${{ secrets.OPENSHIFT_TOOLS_NAMESPACE }}
+          openshift_token: ${{ secrets.OPENSHIFT_TOOLS_TOKEN }}
+          insecure_skip_tls_verify: true
+
+      - name: Deploy with Helm (tools env)
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          helm upgrade --install communication-layer ./helm \
+            --namespace "${{ secrets.OPENSHIFT_TOOLS_NAMESPACE }}" \
+            --set image.repository=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} \
+            --set image.tag=${{ needs.build_and_push.outputs.image_tag }}
+
+      - name: Trigger OpenShift Rollout (tools env)
+        if: github.ref == 'refs/heads/dev'
+        run: |
+          oc rollout restart deployment/communication-layer \
+            -n "${{ secrets.OPENSHIFT_TOOLS_NAMESPACE }}"
+
+  deploy_to_portal:
+    needs: build_and_push
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: Install oc CLI
+        uses: redhat-actions/oc-installer@v1
+
+      - name: Authenticate with OpenShift
+        uses: redhat-actions/oc-login@v1
+        with:
+          openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
+          namespace: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_PORTAL_NAMESPACE || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_PORTAL_NAMESPACE) || secrets.OPENSHIFT_TEST_PORTAL_NAMESPACE }}
+          openshift_token: ${{ github.ref == 'refs/heads/main' && secrets.OPENSHIFT_PROD_PORTAL_TOKEN || (github.ref == 'refs/heads/dev' && secrets.OPENSHIFT_DEV_PORTAL_TOKEN) || secrets.OPENSHIFT_TEST_PORTAL_TOKEN }}
+          insecure_skip_tls_verify: true
+
+      - name: Deploy with Helm
+        run: |
+          helm upgrade --install communication-layer ./helm --set image.repository=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} --set image.tag=${{ needs.build_and_push.outputs.image_tag }}
+      - name: Trigger OpenShift Rollout
+        run: |
+         oc rollout restart deployment/communication-layer        

app.js

@@ -1,41 +1,42 @@
-const express = require("express");
-const cors = require("cors");
-const env = require("dotenv").config();
-const routes = require("./routes");
-const swaggerUi = require("swagger-ui-express");
-const swaggerDocument = require("./swagger.json");
-const bodyParser = require("body-parser");
-
-const app = express();
-const PORT = process.env.PORT || 3000;
-
-app.use(express.json({ limit: '50mb' }));
-app.use(bodyParser.json());
-
-app.use(express.urlencoded({ limit: '50mb', extended: true }));
-
-
-// Serve Swagger UI at `/api-docs`
-app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
-
-const allowedOrigins = process.env.ALLOWEDORIGINS ? process.env.ALLOWEDORIGINS.split(',') : [];
-
-const corsOptions = {
-  origin: (origin, callback) => {
-    if (!origin || allowedOrigins.includes(origin)) {
-      callback(null, true);
-    } else {
-      callback(new Error('Not allowed by CORS'));
-    }
-  },
-  optionsSuccessStatus: 200
-};
-
-app.use(cors(corsOptions));
-
-// Use the routes defined in routes.js
-app.use("/", routes);
-
-app.listen(PORT, () => {
-  console.log("Server Listening on PORT:", PORT);
-});
+const express = require("express");
+const cors = require("cors");
+const env = require("dotenv").config();
+const routes = require("./routes");
+const swaggerUi = require("swagger-ui-express");
+const swaggerDocument = require("./swagger.json");
+const bodyParser = require("body-parser");
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+
+app.use(express.json({ limit: '50mb' }));
+app.use(bodyParser.json());
+
+app.use(express.urlencoded({ limit: '50mb', extended: true }));
+
+
+// Serve Swagger UI at `/api-docs`
+app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+
+const allowedOrigins = process.env.ALLOWEDORIGINS ? process.env.ALLOWEDORIGINS.split(',') : [];
+
+const corsOptions = {
+  origin: (origin, callback) => {
+    if (!origin || allowedOrigins.includes(origin)) {
+      callback(null, true);
+    } else {
+      callback(new Error('Not allowed by CORS'));
+    }
+  },
+  optionsSuccessStatus: 200
+};
+
+
+app.use(cors(corsOptions));
+
+// Use the routes defined in routes.js
+app.use("/", routes);
+
+app.listen(PORT, () => {
+  console.log("Server Listening on PORT:", PORT);
+});