Update build system for notifications-api (part 1)

.github/workflows/deploy-dev-patch.yml

@@ -18,11 +18,24 @@ jobs:
       BRANCH: ${{ vars.PATCH_BRANCH }}
       TAG: ${{ vars.HOTFIX_TAG }}
 
-  call-mvn-server-patch:
+  wfnews-api-server-build-patch:
     uses: ./.github/workflows/mvn-server-patch.yml
     #SMTP_PASSWORD, DV_PASSWORD AND TFC_PROJECT ARE STORED AS SECRET
     with:
       REGISTRY: ghcr.io
+      PROJECT_NAME: wfnews-api
+      BRANCH: ${{ vars.PATCH_BRANCH }}
+      TAG: ${{ vars.HOTFIX_TAG }}
+    secrets:
+      IDIR_AS_EMAIL: ${{ secrets.IDIR_AS_EMAIL }}
+      IDIR_PASSWORD: ${{ secrets.IDIR_PASSWORD }}
+
+  wfone-notifications-api-server-build-patch:
+    uses: ./.github/workflows/mvn-server-patch.yml
+    #SMTP_PASSWORD, DV_PASSWORD AND TFC_PROJECT ARE STORED AS SECRET
+    with:
+      REGISTRY: ghcr.io
+      PROJECT_NAME: wfone-notifications-api
       BRANCH: ${{ vars.PATCH_BRANCH }}
       TAG: ${{ vars.HOTFIX_TAG }}
     secrets:
@@ -41,9 +54,9 @@ jobs:
       REGISTRY: ghcr.io
     secrets: inherit
 
-  terragrunt-deploy-dev:
-    uses: ./.github/workflows/terragrunt-deploy.yml
-    needs: [call-mvn-client-patch, call-mvn-server-patch, liquibase-build, apisix-build]
+  wfnews-terragrunt-deploy-dev:
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
+    needs: [call-mvn-client-patch, wfnews-api-server-build-patch, liquibase-build, apisix-build]
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step
@@ -109,6 +122,6 @@ jobs:
 
   jmeter-test-dev:
     uses: ./.github/workflows/jmeter.yml
-    needs: [terragrunt-deploy-dev]
+    needs: [wfnews-terragrunt-deploy-dev]
     with:
       ENVIRONMENT: dev

.github/workflows/deploy-dev.yml

@@ -31,12 +31,23 @@ jobs:
     with: 
       REGISTRY: ghcr.io
 
-  call-mvn-server:
+  wfnews-api-server-build:
     if: github.event.pull_request.merged == true
     uses: ./.github/workflows/mvn-server.yml
     #SMTP_PASSWORD, DV_PASSWORD AND TFC_PROJECT ARE STORED AS SECRET
     with:
       REGISTRY: ghcr.io
+      PROJECT_NAME: wfnews-api
+    secrets:
+      IDIR_AS_EMAIL: ${{ secrets.IDIR_AS_EMAIL }}
+      IDIR_PASSWORD: ${{ secrets.IDIR_PASSWORD }}
+
+  wfone-notifications-api-server-build:
+    if: github.event.pull_request.merged == true
+    uses: ./.github/workflows/mvn-server.yml
+    with:
+      REGISTRY: ghcr.io
+      PROJECT_NAME: wfone-notifications-api
     secrets:
       IDIR_AS_EMAIL: ${{ secrets.IDIR_AS_EMAIL }}
       IDIR_PASSWORD: ${{ secrets.IDIR_PASSWORD }}
@@ -53,9 +64,9 @@ jobs:
       REGISTRY: ghcr.io
     secrets: inherit
 
-  terragrunt-deploy-dev:
-    uses: ./.github/workflows/terragrunt-deploy.yml
-    needs: [call-mvn-client, call-mvn-server, liquibase-build, apisix-build]
+  wfnews-terragrunt-deploy-dev:
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
+    needs: [call-mvn-client, wfnews-api-server-build, liquibase-build, apisix-build]
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step
@@ -133,6 +144,6 @@ jobs:
 
   jmeter-test-dev:
     uses: ./.github/workflows/jmeter.yml
-    needs: [terragrunt-deploy-dev]
+    needs: [wfnews-terragrunt-deploy-dev]
     with:
       ENVIRONMENT: dev

.github/workflows/deploy-prod-patch.yml

@@ -63,9 +63,9 @@ jobs:
         id: get-release-tag
 
 
-  terragrunt-deploy-prod:
+  wfnews-terragrunt-deploy-prod:
     needs: tag-images
-    uses: ./.github/workflows/terragrunt-deploy.yml
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step

.github/workflows/deploy-prod.yml

@@ -64,9 +64,9 @@ jobs:
         id: get-release-tag
 
 
-  terragrunt-deploy-prod:
+  wfnews-terragrunt-deploy-prod:
     needs: tag-images
-    uses: ./.github/workflows/terragrunt-deploy.yml
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step

.github/workflows/deploy-test-patch.yml

@@ -59,9 +59,9 @@ jobs:
         id: get-release-tag
 
 
-  terragrunt-deploy-test:
+  wfnews-terragrunt-deploy-test:
     needs: tag-images
-    uses: ./.github/workflows/terragrunt-deploy.yml
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step

.github/workflows/deploy-test.yml

@@ -60,9 +60,9 @@ jobs:
         id: get-release-tag
 
 
-  terragrunt-deploy-test:
+  wfnews-terragrunt-deploy-test:
     needs: tag-images
-    uses: ./.github/workflows/terragrunt-deploy.yml
+    uses: ./.github/workflows/wfnews-terragrunt-deploy.yml
     with:
       REGISTRY: ghcr.io
       #Server and Image name get PR number as appropriate inside deploy step
@@ -74,7 +74,7 @@ jobs:
       #1024 CPU units = 1 vCPU
       CLIENT_CPU_UNITS: 2048
       CLIENT_MEMORY: 4096
-      SERVER_CPU_UNITS: 2048 
+      SERVER_CPU_UNITS: 2048
       SERVER_MEMORY: 4096
       DB_INSTANCE_TYPE: 'db.t3.medium'
       INSTANCE_COUNT: 2

.github/workflows/mvn-server-patch.yml

@@ -1,12 +1,9 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Build Server
 
 env:
-  IMAGE_NAME: ${{ github.repository }}-server
+  IMAGE_NAME: "${{ github.repository }}-${{inputs.PROJECT_NAME}}"
 
-# Controls when the workflow will run
-on:
+on: 
   workflow_call:
     inputs:
       REGISTRY:
@@ -18,20 +15,19 @@ on:
       TAG:
         required: true
         type: string
+      PROJECT_NAME:
+        type: string
+        description: 'Name of project, as given to the subfolder of /server to build'
+        required: true
     secrets:
       IDIR_AS_EMAIL:
         required: true
       IDIR_PASSWORD:
         required: true
-
-
 
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
         with:
@@ -44,24 +40,24 @@ jobs:
           distribution: 'adopt'
 
       - name: Build with Maven
-        run: mvn --settings server/wfnews-api/mvn_settings/settings.xml --batch-mode --update-snapshots -f server/wfnews-api/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} -DskipTests package
+        run: mvn --settings server/${{ inputs.PROJECT_NAME }}/mvn_settings/settings.xml --batch-mode --update-snapshots -f server/${{ inputs.PROJECT_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} -DskipTests package
 
       - name: Copy files to neccessary folders
-        run: mkdir staging && cp server/wfnews-api/wfnews-api-rest-endpoints/target/*.war staging
+        run: mkdir staging && cp server/${{ inputs.PROJECT_NAME }}/${{ inputs.PROJECT_NAME }}-rest-endpoints/target/*.war staging
 
       - uses: actions/upload-artifact@v3
         with:
-         name: Package
+         name: ${{ inputs.PROJECT_NAME }}-package
          path: staging
 
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:
           path: staging
-          key: ${{ runner.os }}-maven-${{ hashFiles('**war.xml') }}
+          key: ${{ inputs.PROJECT_NAME }}-maven-${{ hashFiles('**war.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-
-         
+            ${{ inputs.PROJECT_NAME }}-maven-
+
   docker:
     needs: build
     runs-on: ubuntu-latest
@@ -70,13 +66,15 @@ jobs:
       - uses: actions/checkout@v3
         with:
           ref: ${{ inputs.BRANCH }}
+
       - name: download artifact
         uses: actions/download-artifact@v3
         with:
-          name: Package
+          name: ${{ inputs.PROJECT_NAME }}-package
           path: .
 
       - name: Update image name if PR number present
+        if: ${{ github.event.pull_request.number > 0 }}
         run: echo "IMAGE_NAME = ${{env.IMAGE_NAME}}-hotfix" >> $GITHUB_ENV
 
       - name: Set up QEMU
@@ -109,5 +107,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta_pr.outputs.tags }}
-          labels: ${{ steps.meta_pr.outputs.labels }}
-
+          labels: ${{ steps.meta_pr.outputs.labels }}

.github/workflows/mvn-server.yml

@@ -1,31 +1,27 @@
-# This is a basic workflow to help you get started with Actions
-
 name: Build Server
 
 env:
-  IMAGE_NAME: ${{ github.repository }}-server
+  IMAGE_NAME: "${{ github.repository }}-${{inputs.PROJECT_NAME}}"
 
-# Controls when the workflow will run
-on:
+on: 
   workflow_call:
     inputs:
       REGISTRY:
         type: string
         required: true
+      PROJECT_NAME:
+        type: string
+        description: 'Name of project, as given to the subfolder of /server to build'
+        required: true
     secrets:
       IDIR_AS_EMAIL:
         required: true
       IDIR_PASSWORD:
         required: true
-
-
-
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
 
@@ -36,47 +32,40 @@ jobs:
           distribution: 'adopt'
 
       - name: Build with Maven
-        run: mvn --settings server/wfnews-api/mvn_settings/settings.xml --batch-mode --update-snapshots -f server/wfnews-api/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} -DskipTests package
+        run: mvn --settings server/${{ inputs.PROJECT_NAME }}/mvn_settings/settings.xml --batch-mode --update-snapshots -f server/${{ inputs.PROJECT_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} -DskipTests package
 
       - name: Copy files to neccessary folders
-        run: mkdir staging && cp server/wfnews-api/wfnews-api-rest-endpoints/target/*.war staging
+        run: mkdir staging && cp server/${{ inputs.PROJECT_NAME }}/${{ inputs.PROJECT_NAME }}-rest-endpoints/target/*.war staging
 
       - uses: actions/upload-artifact@v3
         with:
-         name: Package
+         name: ${{ inputs.PROJECT_NAME }}-package
          path: staging
 
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:
           path: staging
-          key: ${{ runner.os }}-maven-${{ hashFiles('**war.xml') }}
+          key: ${{ inputs.PROJECT_NAME }}-maven-${{ hashFiles('**war.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-
-         
+            ${{ inputs.PROJECT_NAME }}-maven-
+
   docker:
     needs: build
     runs-on: ubuntu-latest
-    outputs:
-      pull_request_number: ${{ steps.pr.outputs.pull_request_number }}
 
     steps:
       - uses: actions/checkout@v3
+
       - name: download artifact
         uses: actions/download-artifact@v3
         with:
-          name: Package
+          name: ${{ inputs.PROJECT_NAME }}-package
           path: .
-
-      - name: Get Pull Request Number
-        id: pr
-        run: echo "::set-output name=pull_request_number::$(gh pr view --json number -q .number || echo "")"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Update image name if PR number present
-        if: ${{'' != steps.pr.outputs.pull_request_number}}
-        run: echo "IMAGE_NAME = ${{env.IMAGE_NAME}}-${{ steps.pr.outputs.pull_request_number }}" >> $GITHUB_ENV
+        if: ${{ github.event.pull_request.number > 0 }}
+        run: echo "IMAGE_NAME = ${{env.IMAGE_NAME}}-${{ github.event.pull_request.number }}" >> $GITHUB_ENV
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -110,5 +99,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta_pr.outputs.tags }}
-          labels: ${{ steps.meta_pr.outputs.labels }}
-
+          labels: ${{ steps.meta_pr.outputs.labels }}

.github/workflows/terragrunt-plan.yml

@@ -1,3 +1,5 @@
+# Used for validation and not in use in codebase
+
 name: Plan using terragrunt
 
 on:

.github/workflows/terragrunt-deploy.yml → .github/workflows/wfnews-terragrunt-deploy.yml

@@ -1,4 +1,4 @@
-name: Deploy using terragrunt
+name: Deploy WFNEWS API using terragrunt
 
 on:
   workflow_call: