Change how image is fetched to avoid use of old images (#957)

Author: vivid-cpreston

.github/workflows/build-full-environment.yml

@@ -49,7 +49,6 @@ jobs:
       IMAGE_TAG: latest
       RUN_LIQUIBASE: true
       COMMAND: apply
-      GDB_EXTRACTOR_DIGEST: ${{ needs.node-build.outputs.gdb_digest }}
     secrets: inherit
 
   wfprev-ui:

.github/workflows/node-build.yml

@@ -136,18 +136,3 @@ jobs:
         docker pull ${{vars.REPOSITORY_HOST}}/${{ github.repository_owner }}/nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }}:${{ inputs.TAG }}
         docker tag ${{vars.REPOSITORY_HOST}}/${{ github.repository_owner }}/nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }}:${{ inputs.TAG }} ${{ secrets.LZA_ECR_AWS_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }}:${{ inputs.TAG }}
         docker push ${{ secrets.LZA_ECR_AWS_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }}:${{ inputs.TAG }}
-        echo "GDB_EXTRACTOR_IMAGE=${{ secrets.LZA_ECR_AWS_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }}:${{ inputs.TAG }}" >> $GITHUB_ENV
-
-    - name: Get Digest of GDB Extractor ECR image
-      id: getGdbDigest
-      run: |
-        DIGEST=$(aws ecr describe-images \
-          --repository-name nr-bcws-wfprev-${{ inputs.COMPONENT_NAME }} \
-          --image-ids imageTag=latest \
-          --query 'imageDetails[0].imageDigest' \
-          --output text)
-        export GDB_EXTRACTOR_DIGEST=${DIGEST}
-        echo "digest_output=$GDB_EXTRACTOR_DIGEST" >> $GITHUB_OUTPUT
-        
-    outputs:
-          gdb_digest: ${{ steps.getGdbDigest.outputs.digest_output }}

.github/workflows/prerelease.yml

@@ -47,7 +47,6 @@ jobs:
       IMAGE_TAG: ${{ github.event.release.tag_name }}
       COMMAND: apply
       RUN_LIQUIBASE: 'true'
-      GDB_EXTRACTOR_DIGEST: ${{ needs.node-build.outputs.gdb_digest }}
 
   wfprev-ui-dlv:
     uses: ./.github/workflows/client-build.yml
@@ -66,7 +65,6 @@ jobs:
       IMAGE_TAG: ${{ github.event.release.tag_name }}
       COMMAND: apply
       RUN_LIQUIBASE: 'true'
-      GDB_EXTRACTOR_DIGEST: ${{ needs.node-build.outputs.gdb_digest }}
 
   wfprev-ui-tst:
     uses: ./.github/workflows/client-build.yml

.github/workflows/terragrunt-deploy.yml

@@ -24,10 +24,6 @@ on:
         required: false
         type: string
         default: 'false'
-      GDB_EXTRACTOR_DIGEST:
-        required: false
-        type: string
-        default: 'false'
   workflow_dispatch:
     inputs:
       DEFAULT_APPLICATION_ENVIRONMENT:
@@ -139,17 +135,13 @@ jobs:
           aws ecr get-login-password --region ca-central-1 | \
           docker login --username AWS --password-stdin ${{ secrets.ECR_TARGET_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com     
 
-      - name: Get digest of GDB extractor docker image
-        id: getDigestGDB
+      - name: Get URI of GDB extractor docker image
+        id: getDigestURI
         run: |
           if [[ "${{inputs.RESTORE_DOWNSCALED_CLUSTER}}" == 'false' ]]; then
-            if [[ "${{inputs.GDB_EXTRACTOR_DIGEST }}" == '' ]]; then
-              IMAGE="${{ secrets.ECR_TARGET_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-wfprev-gdb-extractor:latest"
-              docker pull $IMAGE
-              echo "GDB_EXTRACTOR_IMAGE=$(docker inspect --format='{{index .RepoDigests 0}}' $IMAGE)" >> $GITHUB_OUTPUT
-            else
-              echo "GDB_EXTRACTOR_IMAGE=${{ secrets.ECR_TARGET_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-wfprev-gdb-extractor@${{ inputs.GDB_EXTRACTOR_DIGEST }}" >> $GITHUB_OUTPUT
-            fi
+            IMAGE="${{ secrets.ECR_TARGET_ACCOUNT_ID }}.dkr.ecr.ca-central-1.amazonaws.com/nr-bcws-wfprev-wfprev-gdb-extractor:${{ inputs.IMAGE_TAG }}"
+            docker pull $IMAGE
+            echo "GDB_EXTRACTOR_IMAGE=$(docker inspect --format='{{index .RepoDigests 0}}' $IMAGE)" >> $GITHUB_OUTPUT
           else
             export GDB_EXTRACTOR_IMAGE="$(aws ssm get-parameter --name 'gdb-extractor-image' --query 'Parameter.Value' | sed 's/\"//g')" 
             echo "GDB_EXTRACTOR_IMAGE=$GDB_EXTRACTOR_IMAGE" >> "$GITHUB_OUTPUT"
@@ -212,7 +204,7 @@ jobs:
           DB_INSTANCE_TYPE: ${{vars.DB_INSTANCE_TYPE}}
 
           # GDB Extractor Lambda Image
-          WFPREV_GDB_EXTRACTOR_DIGEST: ${{ steps.getDigestGDB.outputs.GDB_EXTRACTOR_IMAGE }}
+          WFPREV_GDB_EXTRACTOR_IMAGE: ${{ steps.getDigestURI.outputs.GDB_EXTRACTOR_IMAGE }}
 
           # AWS
           AWS_ALERT_EMAIL_LIST: ${{ vars.AWS_ALERT_EMAIL_LIST }}

terraform/lambda.tf

@@ -26,7 +26,7 @@ resource "aws_lambda_function" "gdb_processor" {
   role          = aws_iam_role.lambda_role.arn
   package_type  = "Image"
 
-  image_uri = var.WFPREV_GDB_EXTRACTOR_DIGEST
+  image_uri = var.WFPREV_GDB_EXTRACTOR_IMAGE
 
   memory_size   = var.WFPREV_LAMBDA_MEMORY
   timeout       = var.WFPREV_LAMBDA_TIMEOUT

terraform/terragrunt.hcl

@@ -59,7 +59,7 @@ WFPREV_CHECK_TOKEN_URL = "${get_env("WFPREV_CHECK_TOKEN_URL")}"
 TRAINING_AND_SUPPORT_LINK = "${get_env("TRAINING_AND_SUPPORT_LINK")}"
 
 # node
-WFPREV_GDB_EXTRACTOR_DIGEST = "${get_env("WFPREV_GDB_EXTRACTOR_DIGEST")}"
+WFPREV_GDB_EXTRACTOR_IMAGE = "${get_env("WFPREV_GDB_EXTRACTOR_IMAGE")}"
 
 # db
 WFPREV_USERNAME = "${get_env("WFPREV_USERNAME")}"

terraform/variables.tf

@@ -47,7 +47,7 @@ variable "WFPREV_LAMBDA_TIMEOUT" {
   default     = 300
 }
 
-variable "WFPREV_GDB_EXTRACTOR_DIGEST" {
+variable "WFPREV_GDB_EXTRACTOR_IMAGE" {
   description = "Digest-based URI for the Lambda image"
   type        = string
   default     = ""