[aws][feat] Add delete method to AMI images (#2037)

* [aws][feat] Add delete method to AMI images

Author: lloesche

fixlib/fixlib/baseresources.py

@@ -763,7 +763,7 @@ def __attrs_post_init__(self) -> None:
 
 
 @define(eq=False, slots=False)
-class BaseCloud(BaseResource):
+class BaseCloud(PhantomBaseResource):
     kind: ClassVar[str] = "base_cloud"
     kind_display: ClassVar[str] = "Cloud"
     kind_description: ClassVar[str] = "A cloud."
@@ -785,7 +785,7 @@ def account(self, graph: Optional[Any] = None) -> BaseAccount:
 
 
 @define(eq=False, slots=False)
-class BaseRegion(BaseResource):
+class BaseRegion(PhantomBaseResource):
     kind: ClassVar[str] = "region"
     kind_display: ClassVar[str] = "Region"
     kind_description: ClassVar[str] = "A region."
@@ -805,7 +805,7 @@ def region(self, graph: Optional[Any] = None) -> BaseRegion:
 
 
 @define(eq=False, slots=False)
-class BaseZone(BaseResource):
+class BaseZone(PhantomBaseResource):
     kind: ClassVar[str] = "zone"
     kind_display: ClassVar[str] = "Zone"
     kind_description: ClassVar[str] = "A zone."

plugins/aws/fix_plugin_aws/resource/ec2.py

@@ -720,7 +720,7 @@ def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
     def delete_resource(self, client: AwsClient, graph: Graph) -> bool:
         client.call(
             aws_service=self.api_spec.service,
-            action="delete_volume",
+            action="delete-volume",
             result_name=None,
             VolumeId=self.id,
         )
@@ -3439,6 +3439,23 @@ class AwsEc2Image(AwsResource):
     imds_support: Optional[str] = field(default=None, metadata={"description": "If v2.0, it indicates that IMDSv2 is specified in the AMI."})  # fmt: skip
     source_instance_id: Optional[str] = field(default=None, metadata={"description": "The ID of the instance that the AMI was created from if the AMI was created using CreateImage."})  # fmt: skip
 
+    def delete_resource(self, client: AwsClient, graph: Graph) -> bool:
+        client.call(
+            aws_service=self.api_spec.service,
+            action="deregister-image",
+            result_name=None,
+            ImageId=self.id,
+        )
+        return True
+
+    def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
+        super().connect_in_graph(builder, source)
+        if self.block_device_mappings is None:
+            return
+        for bdm in self.block_device_mappings:
+            if bdm.ebs and bdm.ebs.snapshot_id:
+                builder.add_edge(self, EdgeType.default, reverse=False, clazz=AwsEc2Snapshot, id=bdm.ebs.snapshot_id)
+
 
 @define(eq=False, slots=False)
 class AwsEc2LaunchTemplateIamInstanceProfileSpecification:

plugins/aws/test/resources/ec2_test.py

@@ -59,13 +59,24 @@ def test_delete_volumes() -> None:
     volume, _ = round_trip_for(AwsEc2Volume)
 
     def validate_delete_args(**kwargs: Any) -> None:
-        assert kwargs["action"] == "delete_volume"
+        assert kwargs["action"] == "delete-volume"
         assert kwargs["VolumeId"] == volume.id
 
     client = cast(AwsClient, SimpleNamespace(call=validate_delete_args))
     volume.delete_resource(client, Graph())
 
 
+def test_deregister_image() -> None:
+    image, _ = round_trip_for(AwsEc2Image)
+
+    def validate_delete_args(**kwargs: Any) -> None:
+        assert kwargs["action"] == "deregister-image"
+        assert kwargs["ImageId"] == image.id
+
+    client = cast(AwsClient, SimpleNamespace(call=validate_delete_args))
+    image.delete_resource(client, Graph())
+
+
 def test_snapshots() -> None:
     round_trip_for(AwsEc2Snapshot)