updates

Author: Jmevorach

infrastructure/shepard.py

@@ -1543,7 +1543,7 @@ def __init__(self, scope: Construct, id: str, **kwargs) -> None:
                   export_name=stack_name + "ECSInstanceRoleARN", )
 
         # export ecs instance role ARN.
-        CfnOutput(self, "ECSInstanceRoleNAME",
+        CfnOutput(self, "ECSInstanceRoleName",
                   value=ecs_instance_role.role_name,
                   description='Name of the ECS instance role created for this architecture.',
                   export_name=stack_name + "ECSInstanceRoleName", )

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shepard"
-version = "0.9.1"
+version = "0.9.2"
 authors = [
   { name="Shepard Team", email="shepard_dev_group@googlegroups.com" },
 ]

src/shepard/lib.py

@@ -362,26 +362,46 @@ def destroy(account_number,role_to_assume_to_target_account,cloudformation_stack
         ecr_repo_to_push_to = search_result_dictionary['EcrRepoRepositoryName']
 
         # delete ecr repo
-        response = ecr_assumed_client.delete_repository(repositoryName=ecr_repo_to_push_to,force=True)
-        print(response)
+        try:
+            response = ecr_assumed_client.delete_repository(repositoryName=ecr_repo_to_push_to,force=True)
+            print(response)
+        except Exception as error:
+            traceback.print_tb(error.__traceback__)
+            print('attempt to delete ecr repo failed.')
+            raise ValueError(str(error))
 
         # get ECS instance role from CFN output
         ecs_instance_role = search_result_dictionary['ECSInstanceRoleName']
 
         # delete ECS instance role
-        response = iam_assumed_client.delete_role(RoleName=ecs_instance_role)
-        print(response)
+        try:
+            response = iam_assumed_client.delete_role(RoleName=ecs_instance_role)
+            print(response)
+        except Exception as error:
+            traceback.print_tb(error.__traceback__)
+            print('attempt to delete ecs instance role failed.')
+            raise ValueError(str(error))
 
         # get ECS instance profile from CFN output
         ecs_instance_profile = search_result_dictionary['ECSInstanceProfileName']
 
         # delete instance profile
-        response = iam_assumed_client.delete_repository(InstanceProfileName=ecs_instance_profile)
-        print(response)
+        try:
+            response = iam_assumed_client.delete_repository(InstanceProfileName=ecs_instance_profile)
+            print(response)
+        except Exception as error:
+            traceback.print_tb(error.__traceback__)
+            print('attempt to delete ecs instance profile failed.')
+            raise ValueError(str(error))
 
         # delete cloudformation stack
-        response = cloudformation_assumed_client.delete_stack(StackName=cloudformation_stack_name)
-        print(response)
+        try:
+            response = cloudformation_assumed_client.delete_stack(StackName=cloudformation_stack_name)
+            print(response)
+        except Exception as error:
+            traceback.print_tb(error.__traceback__)
+            print('attempt to delete cloudformation stack failed.')
+            raise ValueError(str(error))
 
     except Exception as error:
         traceback.print_tb(error.__traceback__)