CCM-11529 Fixing DynamoDB Types

Author: aidenvaines-cgi

.github/workflows/pr_create_dynamic_env.yaml

@@ -17,7 +17,6 @@ jobs:
       - name: Trigger nhs-notify-internal dynamic environment workflow
         shell: bash
         run: |
-          set -x
           this_repo_name=$(echo ${{ github.repository }} | cut -d'/' -f2)
 
           DISPATCH_EVENT=$(jq -ncM \
@@ -46,10 +45,70 @@ jobs:
               }
             }')
 
-          curl --fail -L \
+          curl --fail -L -s \
             -X POST \
             -H "Accept: application/vnd.github+json" \
             -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
             -H "X-GitHub-Api-Version: 2022-11-28" \
             https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/dispatch-deploy-dynamic-env.yaml/dispatches \
             -d "${DISPATCH_EVENT}"
+
+          echo "Workflow triggered. Waiting for the workflow to complete.."
+
+          # Poll GitHub API to check the workflow status
+          workflow_run_url=""
+          for i in {1..12}; do
+            workflow_run_url=$(curl -s \
+              -H "Accept: application/vnd.github+json" \
+              -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/runs?event=workflow_dispatch&status=in_progress" \
+              | jq -r '.workflow_runs[]
+                | select(.name
+                | contains("'pr${{ github.event.number }}'") and
+                  contains("'nhs-notify-supplier-api-dev'") and
+                  contains("'api'") and
+                  contains("'apply'"))
+                | .url')
+
+            if [[ -n "$workflow_run_url" && "$workflow_run_url" != null ]]; then
+              ui_url=${workflow_run_url/api./}
+              ui_url=${ui_url/\/repos/}
+              echo "Found workflow run url: $ui_url"
+              echo "workflow_run_url=$workflow_run_url" >> $GITHUB_ENV
+              break
+            fi
+
+            echo "Waiting for workflow to start..."
+            sleep 10
+          done
+
+          if [[ -z "$workflow_run_url" || "$workflow_run_url" == null ]]; then
+            echo "Failed to get the workflow run url. Exiting."
+            exit 1
+          fi
+
+          # Wait for workflow completion
+          while true; do
+            sleep 10
+            response=$(curl -s -L \
+              -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
+              -H "Accept: application/vnd.github+json" \
+              $workflow_run_url)
+
+            status=$(echo "$response" | jq -r '.status')
+            conclusion=$(echo "$response" | jq -r '.conclusion')
+
+            if [ "$status" == "completed" ]; then
+              if [ "$conclusion" == "success" ]; then
+                echo "Workflow completed successfully."
+                exit 0
+              else
+                echo "Workflow failed with conclusion: $conclusion"
+                exit 1
+              fi
+            fi
+
+            echo "Workflow still running..."
+            sleep 20
+          done

infrastructure/terraform/components/api/ddb_table_letters.tf

@@ -19,17 +19,17 @@ resource "aws_dynamodb_table" "letters" {
 
   attribute {
     name = "id"
-    type = "string"
+    type = "S"
   }
 
   attribute {
     name = "supplierId"
-    type = "string"
+    type = "S"
   }
 
   attribute {
     name = "supplierStatus"
-    type = "string"
+    type = "S"
   }
 
   point_in_time_recovery {

infrastructure/terraform/components/api/ddb_table_mi.tf

@@ -12,12 +12,12 @@ resource "aws_dynamodb_table" "mi" {
 
   attribute {
     name = "id"
-    type = "string"
+    type = "S"
   }
 
   attribute {
     name = "supplierId"
-    type = "string"
+    type = "S"
   }
 
   point_in_time_recovery {