From 0c7cf0f3d12cca9ef8d37330b8f483813864bba7 Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Thu, 11 Dec 2025 16:56:20 +0000 Subject: [PATCH 1/6] [PRM-495] Moved ehr-out uuid to prod dependency --- services/ehr-out-service/package-lock.json | 6 ++---- services/ehr-out-service/package.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/services/ehr-out-service/package-lock.json b/services/ehr-out-service/package-lock.json index 6279fb6b..b7e89072 100644 --- a/services/ehr-out-service/package-lock.json +++ b/services/ehr-out-service/package-lock.json @@ -28,6 +28,7 @@ "swagger-ui-express": "^4.3.0", "traverse": "^0.6.6", "utils-deep-clone": "^0.0.3", + "uuid": "^8.3.2", "winston": "^3.6.0", "xml2js": "^0.5.0" }, @@ -48,7 +49,6 @@ "nodemon": "^2.0.19", "prettier": "2.6.0", "supertest": "^6.3.3", - "uuid": "^8.3.2", "wait-for-expect": "^3.0.2" } }, @@ -16234,7 +16234,6 @@ }, "node_modules/uuid": { "version": "8.3.2", - "dev": true, "license": "MIT", "bin": { "uuid": "dist/bin/uuid" @@ -28735,8 +28734,7 @@ "version": "1.0.1" }, "uuid": { - "version": "8.3.2", - "dev": true + "version": "8.3.2" }, "v8-to-istanbul": { "version": "9.2.0", diff --git a/services/ehr-out-service/package.json b/services/ehr-out-service/package.json index 359d1295..30e111a9 100644 --- a/services/ehr-out-service/package.json +++ b/services/ehr-out-service/package.json @@ -42,6 +42,7 @@ "swagger-ui-express": "^4.3.0", "traverse": "^0.6.6", "utils-deep-clone": "^0.0.3", + "uuid": "^8.3.2", "winston": "^3.6.0", "xml2js": "^0.5.0" }, @@ -62,7 +63,6 @@ "nodemon": "^2.0.19", "prettier": "2.6.0", "supertest": "^6.3.3", - "uuid": "^8.3.2", "wait-for-expect": "^3.0.2" }, "overrides": { From b6c4abbd0d587330e7423b384bbceb59a51285f2 Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Wed, 17 Dec 2025 12:35:15 +0000 Subject: [PATCH 2/6] [PRM-495] Removed 'latest' tagging from ECR --- .github/workflows/base-java-service-jobs.yml | 14 ++++---------- .github/workflows/base-node-service-jobs.yml | 14 ++++---------- .github/workflows/base-python-service-jobs.yml | 11 +++++------ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/.github/workflows/base-java-service-jobs.yml b/.github/workflows/base-java-service-jobs.yml index 33e3bf94..04beeb3b 100644 --- a/.github/workflows/base-java-service-jobs.yml +++ b/.github/workflows/base-java-service-jobs.yml @@ -101,12 +101,12 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest") + TAG_ARG="" if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") + TAG_ARG="-t $REGISTRY/$REPOSITORY:$REF_TAG" fi - docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . + docker build $TAG_ARG --build-arg BUILD_TAG="$IMAGE_TAG" . - name: Docker Publish if: ${{ inputs.is_deployment }} @@ -117,14 +117,8 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest") - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") - fi docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG" - docker push "$REGISTRY/$REPOSITORY:latest" - + if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" docker push "$REGISTRY/$REPOSITORY:$REF_TAG" diff --git a/.github/workflows/base-node-service-jobs.yml b/.github/workflows/base-node-service-jobs.yml index 2d1f7001..b62344d0 100644 --- a/.github/workflows/base-node-service-jobs.yml +++ b/.github/workflows/base-node-service-jobs.yml @@ -134,12 +134,12 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest") + TAG_ARG="" if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") + TAG_ARG="-t $REGISTRY/$REPOSITORY:$REF_TAG" fi - docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . + docker build $TAG_ARG --build-arg BUILD_TAG="$IMAGE_TAG" - name: Docker Publish if: ${{ inputs.is_deployment }} @@ -150,14 +150,8 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" -t "$REGISTRY/$REPOSITORY:latest") - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") - fi docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG" - docker push "$REGISTRY/$REPOSITORY:latest" - + if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" docker push "$REGISTRY/$REPOSITORY:$REF_TAG" diff --git a/.github/workflows/base-python-service-jobs.yml b/.github/workflows/base-python-service-jobs.yml index 3e04230f..15376b56 100644 --- a/.github/workflows/base-python-service-jobs.yml +++ b/.github/workflows/base-python-service-jobs.yml @@ -85,12 +85,12 @@ jobs: ECR_URI: ${{ steps.ecr-repo.outputs.uri }} IMAGE_TAG: ${{ github.sha }} run: | - TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG" -t "$ECR_URI:latest") + TAG_ARG="" if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$ECR_URI:$REF_TAG") + TAG_ARG="-t $ECR_URI:$REF_TAG" fi - docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . + docker build $TAG_ARG --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . - name: Push Docker Image if: ${{ inputs.is_deployment }} @@ -100,9 +100,8 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | docker push "$ECR_URI:$IMAGE_TAG" - docker push "$ECR_URI:latest" - if [ -n "${GITHUB_REF_NAME:-}" ]; then - REF_TAG="${GITHUB_REF_NAME//\//-}" + if [ -n "${REF_NAME:-}" ]; then + REF_TAG="${REF_NAME//\//-}" docker push "$ECR_URI:$REF_TAG" fi From 474786c15fff22e284410328e4c25c6e406b978f Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Thu, 18 Dec 2025 14:02:40 +0000 Subject: [PATCH 3/6] [PRM-495] reintroduced image tag to TAG_ARGS --- .github/workflows/base-java-service-jobs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/base-java-service-jobs.yml b/.github/workflows/base-java-service-jobs.yml index 04beeb3b..13bfae6f 100644 --- a/.github/workflows/base-java-service-jobs.yml +++ b/.github/workflows/base-java-service-jobs.yml @@ -101,12 +101,12 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARG="" + TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG") if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARG="-t $REGISTRY/$REPOSITORY:$REF_TAG" + TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") fi - docker build $TAG_ARG --build-arg BUILD_TAG="$IMAGE_TAG" . + docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . - name: Docker Publish if: ${{ inputs.is_deployment }} From 4c4290a0042bf74eb1464af61606b234ee34d9cf Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Thu, 18 Dec 2025 14:23:12 +0000 Subject: [PATCH 4/6] [PRM-495] reintroduced IMAGE_TAG for node & python workflows --- .github/workflows/base-node-service-jobs.yml | 6 +++--- .github/workflows/base-python-service-jobs.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/base-node-service-jobs.yml b/.github/workflows/base-node-service-jobs.yml index b62344d0..5883794a 100644 --- a/.github/workflows/base-node-service-jobs.yml +++ b/.github/workflows/base-node-service-jobs.yml @@ -134,12 +134,12 @@ jobs: IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARG="" + TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG") if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARG="-t $REGISTRY/$REPOSITORY:$REF_TAG" + TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") fi - docker build $TAG_ARG --build-arg BUILD_TAG="$IMAGE_TAG" + docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . - name: Docker Publish if: ${{ inputs.is_deployment }} diff --git a/.github/workflows/base-python-service-jobs.yml b/.github/workflows/base-python-service-jobs.yml index 15376b56..8b14858c 100644 --- a/.github/workflows/base-python-service-jobs.yml +++ b/.github/workflows/base-python-service-jobs.yml @@ -85,12 +85,12 @@ jobs: ECR_URI: ${{ steps.ecr-repo.outputs.uri }} IMAGE_TAG: ${{ github.sha }} run: | - TAG_ARG="" + TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG") if [ -n "${REF_NAME:-}" ]; then REF_TAG="${REF_NAME//\//-}" - TAG_ARG="-t $ECR_URI:$REF_TAG" + TAG_ARGS+=(-t "$ECR_URI:$REF_TAG") fi - docker build $TAG_ARG --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . + docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . - name: Push Docker Image if: ${{ inputs.is_deployment }} From 07cba4b2ea30c492958a056930062efada4d1c07 Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Fri, 19 Dec 2025 15:04:37 +0000 Subject: [PATCH 5/6] [PRM-495] Removed GIT_REF from ECR tagging --- .github/workflows/base-java-service-jobs.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/base-java-service-jobs.yml b/.github/workflows/base-java-service-jobs.yml index 13bfae6f..54ec0388 100644 --- a/.github/workflows/base-java-service-jobs.yml +++ b/.github/workflows/base-java-service-jobs.yml @@ -95,34 +95,22 @@ jobs: - name: Docker Build and Tag env: - REF_NAME: ${{ github.ref_name }} REGISTRY: ${{ steps.ecr-login.outputs.registry }} REPOSITORY: ${{inputs.image_prefix}}${{ inputs.service }} IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG") - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") - fi - docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . + docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" . - name: Docker Publish if: ${{ inputs.is_deployment }} env: - REF_NAME: ${{ github.ref_name }} REGISTRY: ${{ steps.ecr-login.outputs.registry }} REPOSITORY: ${{ inputs.image_prefix }}${{ inputs.service }} IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG" - - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - docker push "$REGISTRY/$REPOSITORY:$REF_TAG" - fi deploy_infra: name: Deploy Infrastructure From 341323fc75a932b0f9489233391d3d6564bfd769 Mon Sep 17 00:00:00 2001 From: AndyFlintAnswerDigital Date: Fri, 19 Dec 2025 15:14:15 +0000 Subject: [PATCH 6/6] [PRM-495] removed GIT_REF from ECR tagging on Node and Python --- .github/workflows/base-node-service-jobs.yml | 14 +------------- .github/workflows/base-python-service-jobs.yml | 13 +------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/base-node-service-jobs.yml b/.github/workflows/base-node-service-jobs.yml index 5883794a..98a0f30f 100644 --- a/.github/workflows/base-node-service-jobs.yml +++ b/.github/workflows/base-node-service-jobs.yml @@ -128,34 +128,22 @@ jobs: - name: Docker Build and Tag env: - REF_NAME: ${{ github.ref_name }} REGISTRY: ${{ steps.ecr-login.outputs.registry }} REPOSITORY: deductions/${{ inputs.service }} IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail - TAG_ARGS=(-t "$REGISTRY/$REPOSITORY:$IMAGE_TAG") - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$REGISTRY/$REPOSITORY:$REF_TAG") - fi - docker build "${TAG_ARGS[@]}" --build-arg BUILD_TAG="$IMAGE_TAG" . + docker build -t "$REGISTRY/$REPOSITORY:$IMAGE_TAG" --build-arg BUILD_TAG="$IMAGE_TAG" . - name: Docker Publish if: ${{ inputs.is_deployment }} env: - REF_NAME: ${{ github.ref_name }} REGISTRY: ${{ steps.ecr-login.outputs.registry }} REPOSITORY: deductions/${{ inputs.service }} IMAGE_TAG: ${{ github.sha }} run: | set -euo pipefail docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG" - - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - docker push "$REGISTRY/$REPOSITORY:$REF_TAG" - fi deploy_infra: name: Deploy Infrastructure diff --git a/.github/workflows/base-python-service-jobs.yml b/.github/workflows/base-python-service-jobs.yml index 8b14858c..30cd12bf 100644 --- a/.github/workflows/base-python-service-jobs.yml +++ b/.github/workflows/base-python-service-jobs.yml @@ -81,29 +81,18 @@ jobs: - name: Build Docker Image env: - REF_NAME: ${{ github.ref_name }} ECR_URI: ${{ steps.ecr-repo.outputs.uri }} IMAGE_TAG: ${{ github.sha }} run: | - TAG_ARGS=(-t "$ECR_URI:$IMAGE_TAG") - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - TAG_ARGS+=(-t "$ECR_URI:$REF_TAG") - fi - docker build "${TAG_ARGS[@]}" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . + docker build -t "$ECR_URI:$IMAGE_TAG" --build-arg IMAGE_TAG="$IMAGE_TAG" --build-arg ENV=${{steps.auth.outputs.aws-account-id}} . - name: Push Docker Image if: ${{ inputs.is_deployment }} env: - REF_NAME: ${{ github.ref_name }} ECR_URI: ${{ steps.ecr-repo.outputs.uri }} IMAGE_TAG: ${{ github.sha }} run: | docker push "$ECR_URI:$IMAGE_TAG" - if [ -n "${REF_NAME:-}" ]; then - REF_TAG="${REF_NAME//\//-}" - docker push "$ECR_URI:$REF_TAG" - fi deploy_infra: if: ${{ inputs.deploy_infra && inputs.is_deployment }}