fix(FSADT1-662): adding acronym as a parameter (#135)

* chore(deps): pin eclipse-temurin docker tag to b99f945

* chore(deps): update dependency maven-wrapper to v3.2.0

* chore(deps): update maven all non-major dependencies

* chore(deps): update dependency maven to v3.9.1

* chore(deps): update eclipse-temurin docker tag to v17.0.6_10-jdk-alpine

* fix: adding acronym to view dto

* ci: updating workflow and test data

* ci: removing concurrency to allow for openshift cleanup

* ci: updating concurrency to avoid issues

---------

Co-authored-by: Renovate Bot <renovate@whitesourcesoftware.com>

.github/workflows/merge-main.yml

@@ -164,6 +164,22 @@ jobs:
           reporters: '["cli"]'
           folder: '["general"]'
 
+  image-promotions:
+    name: Promote images to PROD
+    needs:
+      - deploy-test
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        component: [ api, init ]
+    steps:
+      - uses: shrink/actions-docker-registry-tag@v3
+        with:
+          registry: ghcr.io
+          repository: ${{ github.repository }}/${{ matrix.component }}
+          target: test
+          tags: prod
+
   deploy-prod:
     name: PROD Deployment
     needs:
@@ -178,22 +194,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Promoting API
-        uses: shrink/actions-docker-registry-tag@v3
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/api
-          target: ${{ env.PREV }}
-          tags: ${{ env.ZONE }}
-
-      - name: Promoting Init
-        uses: shrink/actions-docker-registry-tag@v3
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/init
-          target: ${{ env.PREV }}
-          tags: ${{ env.ZONE }}
-
       - name: Broker
         id: broker
         uses: bcgov-nr/action-vault-broker-approle@v0.0.5

.github/workflows/pr-close.yml

@@ -10,7 +10,7 @@ env:
   NAME: ${{ github.event.repository.name }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:
@@ -34,22 +34,18 @@ jobs:
     name: Image Promotions
     if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main'
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        component: [ api, init ]
     steps:
-      - name: Promoting API
+      - name: Promoting ${{ matrix.component }}
         uses: shrink/actions-docker-registry-tag@v3
         with:
           registry: ghcr.io
-          repository: ${{ github.repository }}/api
+          repository: ${{ github.repository }}/${{ matrix.component }}
           target: ${{ github.event.number }}
           tags: test
 
-      - name: Promoting Init
-        uses: shrink/actions-docker-registry-tag@v3
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/init
-          target: ${{ github.event.number }}
-          tags: test
 
   # Notify when PR merged and branch = main
   merge-notification:

.github/workflows/pr-open.yml

@@ -9,7 +9,7 @@ env:
   DOMAIN: apps.silver.devops.gov.bc.ca
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.number }}
   cancel-in-progress: true
 
 jobs:

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,18 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-alpine
+FROM eclipse-temurin:17.0.6_10-jdk-alpine@sha256:b99f9457ad5cabdfa02935d1048082dd79d318685cfa0ca79a8f623c052c406a
 
 WORKDIR /app