Fix tf dockerfile path issues and add mns step

Author: dlzhry2nhs

.github/workflows/deploy-backend.yml

@@ -6,6 +6,10 @@ on:
       apigee_environment:
         required: true
         type: string
+      create_mns_subscription:
+        required: false
+        type: boolean
+        default: true
       environment:
         required: true
         type: string
@@ -19,6 +23,11 @@ on:
         description: Select the Apigee proxy environment
         options:
           - internal-dev # Add rest later
+      create_mns_subscription:
+        description: Create an MNS Subscription. Only available in dev
+        required: false
+        type: boolean
+        default: true
       environment:
         type: string
         description: Select the backend environment
@@ -93,7 +102,24 @@ jobs:
       - name: Terraform Apply
         working-directory: ${{ vars.TERRAFORM_DIR_PATH }}
         run: make apply apigee_environment=${{ inputs.apigee_environment }} environment=${{ inputs.environment }} sub_environment=${{ inputs.sub_environment }}
-        # TODO - use a saved plan from the plan step
+
+      - name: Install poetry
+        if: ${{ inputs.environment == 'dev' && inputs.create_mns_subscription }}
+        run: pip install poetry==2.1.4
+
+      - uses: actions/setup-python@v5
+        if: ${{ inputs.environment == 'dev' && inputs.create_mns_subscription }}
+        with:
+          python-version: 3.11
+          cache: 'poetry'
+
+      - name: Create MNS Subscription
+        if: ${{ inputs.environment == 'dev' && inputs.create_mns_subscription }}
+        working-directory: './lambdas/mns_subscription'
+        run: |
+          poetry install --no-root
+          echo "Subscribing SQS to MNS for notifications..."
+          make subscribe
   # TODO - replace with modular e2e test workflow
   # e2e-tests:
   #   if: ${{ vars.RUN_E2E == 'true' && inputs.sub_environment == vars.ACTIVE_ENVIRONMENT }}

Makefile

@@ -41,13 +41,16 @@ build-proxy:
 	scripts/build_proxy.sh
 
 #Files to loop over in release
-_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. specification sandbox terraform scripts $(PYTHON_PROJECT_DIRS) $(PYTHON_LAMBDA_DEPENDENCIES)"
+# VED-811: remove everything except for proxy related files as we move to Github Actions for backend deployment
+_dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/. specification sandbox terraform scripts"
 
 
 #Create /dist/ sub-directory and copy files into directory
+#Ensure full dir structure is preserved for Lambdas
 release: clean publish build-proxy
 	mkdir -p dist
 	for f in $(_dist_include); do cp -r $$f dist; done
+	for f in $(PYTHON_PROJECT_DIRS); do cp --parents -r $$f dist; done
 	cp ecs-proxies-deploy.yml dist/ecs-deploy-sandbox.yml
 	cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-qa-sandbox.yml
 	cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-dev-sandbox.yml

azure/templates/post-deploy.yml

@@ -93,7 +93,7 @@ steps:
         echo "Subscribing SQS to MNS for notifications..."
         make subscribe
       displayName: "Run MNS Subscription"
-      workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/mns_subscription"
+      workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/lambdas/mns_subscription"
       env:
         SQS_ARN: "$(ID_SYNC_QUEUE_ARN)"
 

terraform/id_sync_lambda.tf

@@ -42,9 +42,10 @@ module "id_sync_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = abspath("${path.root}/..")
+  source_path   = abspath("${path.root}/../lambdas")
   triggers = {
-    dir_sha = local.id_sync_lambda_dir_sha
+    dir_sha        = local.id_sync_lambda_dir_sha
+    shared_dir_sha = local.shared_dir_sha
   }
 }
 

terraform/outputs.tf

@@ -22,11 +22,3 @@ output "id_sync_queue_arn" {
   description = "The ARN of the created SQS queue"
   value       = aws_sqs_queue.id_sync_queue.arn
 }
-
-output "lambdas_dir_abs_path" {
-  value = local.id_sync_lambda_dir
-}
-
-output "lambdas_dir_normal" {
-  value = "${local.id_sync_lambda_dir}/id_sync"
-}

terraform/redis_sync_lambda.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  redis_sync_lambda_dir = abspath("${path.root}/../redis_sync")
+  redis_sync_lambda_dir = abspath("${path.root}/../lambdas/redis_sync")
 
   redis_sync_lambda_files = fileset(local.redis_sync_lambda_dir, "**")
 
@@ -42,9 +42,10 @@ module "redis_sync_docker_image" {
 
   platform      = "linux/amd64"
   use_image_tag = false
-  source_path   = abspath("${path.root}/..")
+  source_path   = abspath("${path.root}/../lambdas")
   triggers = {
-    dir_sha = local.redis_sync_lambda_dir_sha
+    dir_sha        = local.redis_sync_lambda_dir_sha
+    shared_dir_sha = local.shared_dir_sha
   }
 }