[aws][fix]: Change _keys method implementation for AwsCloudwatchMetricFilter and AwsApiGatewayResource (#2096)

Author: 1101-1

plugins/aws/fix_plugin_aws/resource/apigateway.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import ClassVar, Dict, Optional, List, Type, Union, Any
+from typing import ClassVar, Dict, Optional, List, Tuple, Type, Union, Any
 
 from attrs import define, field
 from fix_plugin_aws.aws_client import AwsClient
@@ -223,6 +223,17 @@ def delete_resource(self, client: AwsClient, graph: Graph) -> bool:
         )
         return True
 
+    def _keys(self) -> Tuple[Any, ...]:
+        return (
+            self.kind,
+            self.cloud().id,
+            self.account().id,
+            self.region().id,
+            self.zone().id,
+            self.id,
+            self.api_link,
+        )
+
     @classmethod
     def called_mutator_apis(cls) -> List[AwsApiSpec]:
         return [AwsApiSpec(service_name, "delete-resource", override_iam_permission="apigateway:DELETE")]

plugins/aws/fix_plugin_aws/resource/cloudwatch.py

@@ -418,15 +418,17 @@ class AwsCloudwatchMetricFilter(AwsResource):
         "id": S("filterName"),
         "name": S("filterName"),
         "ctime": S("creationTime") >> F(lambda x: x // 1000) >> SecondsFromEpochToDatetime(),
+        "log_group_name": S("logGroupName"),
         "filter_pattern": S("filterPattern"),
         "filter_transformations": S("metricTransformations", default=[])
         >> ForallBend(AwsCloudwatchMetricTransformation.mapping),
     }
+    log_group_name: Optional[str] = field(default=None)
     filter_pattern: Optional[str] = field(default=None)
     filter_transformations: List[AwsCloudwatchMetricTransformation] = field(factory=list)
 
     def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
-        if log_group_name := source.get("logGroupName"):
+        if log_group_name := self.log_group_name:
             builder.dependant_node(self, reverse=True, clazz=AwsCloudwatchLogGroup, name=log_group_name)
         for transformation in self.filter_transformations:
             # every metric can be used by multiple alarms
@@ -452,6 +454,17 @@ def delete_resource(self, client: AwsClient, graph: Graph) -> bool:
             return True
         return False
 
+    def _keys(self) -> Tuple[Any, ...]:
+        return (
+            self.kind,
+            self.cloud().id,
+            self.account().id,
+            self.region().id,
+            self.zone().id,
+            self.id,
+            self.log_group_name,
+        )
+
 
 @define(hash=True, frozen=True)
 class AwsCloudwatchQuery: