Merge pull request #43 from rstalets/main

Resolve issue #42 regarding smash.py handling of EBS and AMI

Author: kmcquade

endgame/command/smash.py

@@ -141,7 +141,7 @@ def smash(service, evil_principal, profile, region, dry_run, undo, cloak, exclud
             translated_service = utils.get_service_translation(provided_service=resource.service)
             # client = None
             client = get_boto3_client(profile=profile, service=translated_service, region=region, cloak=cloak)
-            response_message = smash_resource(service=translated_service, region=region, name=name,
+            response_message = smash_resource(service=resource.service, region=region, name=name,
                                               current_account_id=current_account_id,
                                               client=client, undo=undo, dry_run=dry_run, evil_principal=evil_principal)
             if undo and not dry_run:
@@ -166,7 +166,6 @@ def smash_resource(
         dry_run: bool,
         evil_principal: str,
 ) -> ResponseMessage:
-    service = utils.get_service_translation(provided_service=service)
     response_message = expose_service(provided_service=service, region=region, name=name,
                                       current_account_id=current_account_id,
                                       client=client, undo=undo, dry_run=dry_run, evil_principal=evil_principal)

endgame/exposure_via_sharing_apis/ec2_amis.py

@@ -13,7 +13,7 @@
 
 class Ec2Image(ResourceSharingApi, ABC):
     def __init__(self, name: str, region: str, client: boto3.Session.client, current_account_id: str):
-        self.service = "ec2"
+        self.service = "ec2-ami"
         self.resource_type = "image"
         self.region = region
         self.current_account_id = current_account_id
@@ -168,7 +168,7 @@ def parse_evil_principal(self, evil_principal: str) -> str:
 class Ec2Images(ResourceTypes):
     def __init__(self, client: boto3.Session.client, current_account_id: str, region: str):
         super().__init__(client, current_account_id, region)
-        self.service = "ec2"
+        self.service = "ec2-ami"
         self.resource_type = "image"
 
     @property
@@ -181,7 +181,7 @@ def resources(self) -> [ListResourcesResponse]:
             image_id = resource.get("ImageId")
             name = resource.get("Name")
             volume_id = resource.get("VolumeId")
-            arn = f"arn:aws:{self.service}:{self.region}:{self.current_account_id}:{self.resource_type}/{image_id}"
+            arn = f"arn:aws:ec2:{self.region}:{self.current_account_id}:{self.resource_type}/{image_id}"
             list_resources_response = ListResourcesResponse(
                 service=self.service, account_id=self.current_account_id, arn=arn, region=self.region,
                 resource_type=self.resource_type, name=image_id)