[aws][feat] Edge: s3 account settings --> s3 bucket (#2112)

Author: aquamatthias

plugins/aws/fix_plugin_aws/resource/s3.py

@@ -457,7 +457,8 @@ class AwsS3AccountSettings(AwsResource, PhantomBaseResource):
         " available for an Amazon S3 (Simple Storage Service) account."
     )
     reference_kinds: ClassVar[ModelReference] = {
-        "successors": {"default": ["aws_account"]},
+        "predecessors": {"default": ["aws_account"]},
+        "successors": {"default": ["aws_s3_bucket"]},
     }
     api_spec: ClassVar[AwsApiSpec] = AwsApiSpec(
         "s3control",
@@ -489,5 +490,9 @@ def collect_resources(cls: Type[AwsResource], builder: GraphBuilder) -> None:
         builder.add_node(node)
         builder.add_edge(builder.account, node=node)
 
+    def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
+        for bucket in builder.nodes(AwsS3Bucket):
+            builder.add_edge(self, node=bucket)
+
 
 resources: List[Type[AwsResource]] = [AwsS3AccountSettings, AwsS3Bucket]

plugins/aws/test/collector_test.py

@@ -34,7 +34,7 @@ def count_kind(clazz: Type[AwsResource]) -> int:
     assert len(threading.enumerate()) == 1
     # ensure the correct number of nodes and edges
     assert count_kind(AwsResource) == 225
-    assert len(account_collector.graph.edges) == 515
+    assert len(account_collector.graph.edges) == 519
     assert len(account_collector.graph.deferred_edges) == 2
     for node in account_collector.graph.nodes:
         if isinstance(node, AwsRegion):