VED-507: rename error response and refactor teardown pipeline

Author: Akol125

azure/azure-pr-teardown-pipeline.yml

@@ -23,15 +23,13 @@ jobs:
       vmImage: 'ubuntu-latest'
     steps:
       - checkout: self
-        path: "s/$(SERVICE_NAME)"
 
       - bash: |
           echo $(action_pr_number)
           WORKSPACE="pr-"$(ACTION_PR_NUMBER)
           echo $WORKSPACE
           echo "##vso[task.setvariable variable=WORKSPACE]$WORKSPACE"
           echo "##vso[task.setvariable variable=ACTION_PR_NUMBER]$(ACTION_PR_NUMBER)"
-          echo $(SERVICE_NAME)
         displayName: Set workspace tag
 
       - template: ./templates/aws-assume-role.yml
@@ -47,10 +45,9 @@ jobs:
 
       - bash: |
           export AWS_PROFILE=apim-dev
-          account_id="$(aws sts get-caller-identity --query Account --output text)"
 
           export ENVIRONMENT="internal-dev"
-          export BUCKET_NAME="immunisation-internal-dev-terraform-state-files"
+          export bucket_name="immunisation-internal-dev-terraform-state-files"
           cd terraform
           make init
 
@@ -84,9 +81,9 @@ jobs:
           export AWS_PROFILE=apim-dev
           export ENVIRONMENT="dev"
           export SUB_ENVIRONMENT="$WORKSPACE"
-          
+
           cd terraform
           make workspace sub_environment="$SUB_ENVIRONMENT"
-          make destroy aws_account_no=${account_id} environment="$ENVIRONMENT" sub_environment="$SUB_ENVIRONMENT"
+          make destroy environment="$ENVIRONMENT" sub_environment="$SUB_ENVIRONMENT"
         displayName: Destroy terraform PR workspace and linked resources
         retryCountOnTaskFailure: 2

mns_subscription/src/mns_service.py

@@ -52,7 +52,7 @@ def subscribe_notification(self) -> dict | None:
         if response.status_code in (200, 201):
             return response.json()
         else:
-            MnsService.handle_response(response)
+            MnsService.raise_error_response(response)
 
     def get_subscription(self) -> dict | None:
         response = requests.get(MNS_URL, headers=self.request_headers, timeout=10)
@@ -70,7 +70,7 @@ def get_subscription(self) -> dict | None:
                     return resource
             return None
         else:
-            MnsService.handle_response(response)
+            MnsService.raise_error_response(response)
 
     def check_subscription(self) -> dict:
         """
@@ -96,10 +96,9 @@ def delete_subscription(self, subscription_id: str) -> str:
         response = requests.delete(url, headers=self.request_headers, timeout=10)
         if response.status_code == 204:
             logging.info(f"Deleted subscription {subscription_id}")
-            print(f"{response.text}")
             return "Subscription Successfully Deleted..."
         else:
-            MnsService.handle_response(response)
+            MnsService.raise_error_response(response)
 
     def check_delete_subscription(self):
         try:
@@ -117,7 +116,7 @@ def check_delete_subscription(self):
             return f"Error deleting subscription: {str(e)}"
 
     @staticmethod
-    def handle_response(response):
+    def raise_error_response(response):
         error_mapping = {
             401: (TokenValidationError, "Token validation failed for the request"),
             400: (BadRequestError, "Bad request: Resource type or parameters incorrect"),

mns_subscription/tests/test_mns_service.py

@@ -264,23 +264,23 @@ def mock_response(self, status_code, json_data=None):
     def test_404_resource_found_error(self):
         resp = self.mock_response(404, {"resource": "Not found"})
         with self.assertRaises(ResourceNotFoundError) as context:
-            MnsService.handle_response(resp)
+            MnsService.raise_error_response(resp)
         self.assertIn("Subscription or Resource not found", str(context.exception))
         self.assertEqual(context.exception.message, "Subscription or Resource not found")
         self.assertEqual(context.exception.response, {"resource": "Not found"})
 
     def test_400_bad_request_error(self):
         resp = self.mock_response(400, {"resource": "Invalid"})
         with self.assertRaises(BadRequestError) as context:
-            MnsService.handle_response(resp)
+            MnsService.raise_error_response(resp)
         self.assertIn("Bad request: Resource type or parameters incorrect", str(context.exception))
         self.assertEqual(context.exception.message, "Bad request: Resource type or parameters incorrect")
         self.assertEqual(context.exception.response, {"resource": "Invalid"})
 
     def test_unhandled_status_code(self):
         resp = self.mock_response(418, {"resource": 1234})
         with self.assertRaises(UnhandledResponseError) as context:
-            MnsService.handle_response(resp)
+            MnsService.raise_error_response(resp)
         self.assertIn("Unhandled error: 418", str(context.exception))
         self.assertEqual(context.exception.response, {"resource": 1234})