[PRMP-1355] Removed the questionable ssm parameter dependency and imp…

…lemented a work around
nhsconnect · Jan 23, 2025 · fa92043 · fa92043
1 parent 1a741db
commit fa92043
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/base-deploy-ui.yml b/.github/workflows/base-deploy-ui.yml
@@ -47,20 +47,22 @@ jobs:
           role-skip-session-tagging: true
           aws-region: ${{ vars.AWS_REGION }}
           mask-aws-account-id: true
+
+      - name: Get SSM parameters from SSM
+        id: ssm-parameters
+        run: |
+          doc_store_api_endpoint=$(echo aws ssm get-parameter --name \"/ndr/${{ inputs.sandbox }}/api_endpoint\" --with-decryption)
+          echo "DOC_STORE_API_ENDPOINT=$doc_store_api_endpoint" >> $GITHUB_OUTPUT
+          container_port=$(echo aws ssm get-parameter --name \"ndr/${{ inputs.sandbox }}/container_port\" --with-decryption)
+          echo "CONTAINER_PORT=$container_port" >> $GITHUB_OUTPUT
 
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
 
-      - uses: dkershner6/aws-ssm-getparameters-action@v2
-        with:
-          parameterPairs: '/ndr/${{ inputs.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
-            /ndr/${{ inputs.sandbox }}/container_port = CONTAINER_PORT'
-          withDecryption: 'true' # defaults to true
-
       - name: Configure React environment vars
         env:
-          ENDPOINT_DOC_STORE_API: ${{ env.DOC_STORE_API_ENDPOINT }}
+          ENDPOINT_DOC_STORE_API: ${{ steps.ssm-parameters.outputs.DOC_STORE_API_ENDPOINT }}
           AWS_REGION: ${{ vars.AWS_REGION }}
           OIDC_PROVIDER_ID: not provided yet
           BUILD_ENV: ${{ inputs.environment }}
@@ -75,9 +77,8 @@ jobs:
           ECR_REPOSITORY: ndr-${{ inputs.sandbox }}-app
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
-          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=${{ steps.ssm-parameters.outputs.CONTAINER_PORT }}" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/full-ui-dispatch-deploy.yml b/.github/workflows/full-ui-dispatch-deploy.yml
@@ -75,15 +75,17 @@ jobs:
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v1
 
-      - uses: dkershner6/aws-ssm-getparameters-action@v2
-        with:
-          parameterPairs: '/ndr/${{ github.event.client_payload.sandbox }}/api_endpoint = DOC_STORE_API_ENDPOINT, 
-            /ndr/${{ github.event.client_payload.sandbox }}/container_port = CONTAINER_PORT'
-          withDecryption: 'true' # defaults to true
+      - name: Get SSM parameters from SSM
+        id: ssm-parameters
+        run: |
+          doc_store_api_endpoint=$(echo aws ssm get-parameter --name \"/ndr/$${{ github.event.client_payload.sandbox }}/api_endpoint\" --with-decryption)
+          echo "DOC_STORE_API_ENDPOINT=$doc_store_api_endpoint" >> $GITHUB_OUTPUT
+          container_port=$(echo aws ssm get-parameter --name \"ndr/${{ github.event.client_payload.sandbox }}/container_port\" --with-decryption)
+          echo "CONTAINER_PORT=$container_port" >> $GITHUB_OUTPUT
 
       - name: Configure React environment vars
         env:
-          ENDPOINT_DOC_STORE_API: ${{ env.DOC_STORE_API_ENDPOINT }}
+          ENDPOINT_DOC_STORE_API: ${{ steps.ssm-parameters.outputs.DOC_STORE_API_ENDPOINT }}
           AWS_REGION: ${{ vars.AWS_REGION }}
           OIDC_PROVIDER_ID: not provided yet
           BUILD_ENV: ${{ github.event.client_payload.environment }}
@@ -98,9 +100,8 @@ jobs:
           ECR_REPOSITORY: ndr-${{ github.event.client_payload.sandbox }}-app
           IMAGE_TAG: latest
           IMAGE_TAG_SHA: ${{ github.sha }}
-          CONTAINER_PORT: ${{ env.CONTAINER_PORT }}
         run: |
-          docker build --build-arg="CONTAINER_PORT=$CONTAINER_PORT" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
+          docker build --build-arg="CONTAINER_PORT=${{ steps.ssm-parameters.outputs.CONTAINER_PORT }}" -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA
           echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_SHA" >> $GITHUB_OUTPUT