Merge branch 'main' into km/azure_update_security_assessments

someengineering · Nov 1, 2024 · 779588d · 779588d
2 parents cf1981b + 65c98f7
commit 779588d
Show file tree

Hide file tree

Showing 9 changed files with 1,581 additions and 13 deletions.
diff --git a/plugins/aws/fix_plugin_aws/collector.py b/plugins/aws/fix_plugin_aws/collector.py
@@ -50,6 +50,7 @@
     backup,
     bedrock,
     scp,
+    guardduty,
     inspector,
 )
 from fix_plugin_aws.resource.base import (
@@ -105,6 +106,7 @@
     + elb.resources
     + elbv2.resources
     + glacier.resources
+    + guardduty.resources
     + kinesis.resources
     + kms.resources
     + lambda_.resources

diff --git a/plugins/aws/fix_plugin_aws/resource/bedrock.py b/plugins/aws/fix_plugin_aws/resource/bedrock.py
@@ -221,7 +221,7 @@ def add_tags(job: AwsResource) -> None:
                 modelIdentifier=js["modelArn"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work(service_name, add_tags, instance)
 
 
@@ -505,7 +505,7 @@ def add_tags(job: AwsResource) -> None:
                 guardrailVersion=js["version"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work(service_name, add_tags, instance)
 
 
@@ -637,7 +637,7 @@ def add_tags(job: AwsResource) -> None:
                 jobIdentifier=js["jobArn"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work(service_name, add_tags, instance)
 
 
@@ -838,7 +838,7 @@ def add_tags(job: AwsResource) -> None:
                 jobIdentifier=js["jobArn"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work(service_name, add_tags, instance)
 
 
@@ -1037,7 +1037,7 @@ def add_tags(agent: AwsResource) -> None:
             ):
                 if instance := AwsBedrockAgent.from_api(result, builder):
                     instance.agent_version = js["latestAgentVersion"]
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work("bedrock-agent", add_tags, instance)
 
 
@@ -1324,7 +1324,7 @@ def add_tags(knowledge_base: AwsResource) -> None:
                 knowledgeBaseId=js["knowledgeBaseId"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work(service_name, add_tags, instance)
 
     @classmethod
@@ -1492,7 +1492,7 @@ def add_tags(prompt: AwsResource) -> None:
                 promptVersion=js["version"],
             ):
                 if instance := cls.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work("bedrock-agent", add_tags, instance)
 
 
@@ -1822,7 +1822,7 @@ def collect_flow_versions(flow: AwsBedrockAgentFlow) -> None:
                 flowVersion=flow.version,
             ):
                 if instance := AwsBedrockAgentFlowVersion.from_api(result, builder):
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work("bedrock-agent", add_tags, instance)
 
         for js in json:
@@ -1834,7 +1834,7 @@ def collect_flow_versions(flow: AwsBedrockAgentFlow) -> None:
                 if instance := AwsBedrockAgentFlow.from_api(result, builder):
                     if not instance.version:
                         instance.version = js["version"]
-                    builder.add_node(instance, js)
+                    builder.add_node(instance, result)
                     builder.submit_work("bedrock-agent", add_tags, instance)
                     builder.submit_work("bedrock-agent", collect_flow_versions, instance)
 

diff --git a/plugins/aws/fix_plugin_aws/resource/ecr.py b/plugins/aws/fix_plugin_aws/resource/ecr.py
@@ -8,7 +8,7 @@
 
 from fix_plugin_aws.resource.base import AwsResource, AwsApiSpec, GraphBuilder
 from fix_plugin_aws.utils import ToDict
-from fixlib.baseresources import HasResourcePolicy, ModelReference, PolicySource, PolicySourceKind
+from fixlib.baseresources import HasResourcePolicy, PolicySource, PolicySourceKind
 from fixlib.json import sort_json
 from fixlib.json_bender import Bender, S, Bend
 from fixlib.types import Json
@@ -34,7 +34,6 @@ class AwsEcrRepository(AwsResource, HasResourcePolicy):
     _kind_service: ClassVar[Optional[str]] = service_name
     _metadata: ClassVar[Dict[str, Any]] = {"icon": "repository", "group": "compute"}
     _aws_metadata: ClassVar[Dict[str, Any]] = {"provider_link_tpl": "https://{region_id}.console.aws.amazon.com/ecr/repositories/{name}?region={region}", "arn_tpl": "arn:{partition}:ecr:{region}:{account}:repository/{name}"}  # fmt: skip
-    _reference_kinds: ClassVar[ModelReference] = {}
     api_spec: ClassVar[AwsApiSpec] = AwsApiSpec("ecr", "describe-repositories", "repositories")
     public_spec: ClassVar[AwsApiSpec] = AwsApiSpec("ecr-public", "describe-repositories", "repositories")
     mapping: ClassVar[Dict[str, Bender]] = {