moto 5.0.15.dev28__tar.gz → 5.0.16.dev5__tar.gz

{moto-5.0.15.dev28/moto.egg-info → moto-5.0.16.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.15.dev28
+Version: 5.0.16.dev5
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.15.dev28"
+__version__ = "5.0.16.dev5"

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/guardduty/models.py

@@ -21,6 +21,7 @@ class GuardDutyBackend(BaseBackend):
         finding_publishing_frequency: str,
         data_sources: Dict[str, Any],
         tags: Dict[str, str],
+        features: List[Dict[str, Any]],
     ) -> str:
         if finding_publishing_frequency not in [
             "FIFTEEN_MINUTES",
@@ -37,6 +38,7 @@ class GuardDutyBackend(BaseBackend):
             enabled=enable,
             datasources=data_sources,
             tags=tags,
+            features=features,
         )
         self.detectors[detector.id] = detector
         return detector.id
@@ -94,9 +96,10 @@ class GuardDutyBackend(BaseBackend):
         enable: bool,
         finding_publishing_frequency: str,
         data_sources: Dict[str, Any],
+        features: List[Dict[str, Any]],
     ) -> None:
         detector = self.get_detector(detector_id)
-        detector.update(enable, finding_publishing_frequency, data_sources)
+        detector.update(enable, finding_publishing_frequency, data_sources, features)
 
     def update_filter(
         self,
@@ -168,6 +171,7 @@ class Detector(BaseModel):
         enabled: bool,
         datasources: Dict[str, Any],
         tags: Dict[str, str],
+        features: List[Dict[str, Any]],
     ):
         self.id = mock_random.get_random_hex(length=32)
         self.created_at = created_at
@@ -177,6 +181,9 @@ class Detector(BaseModel):
         self.updated_at = created_at
         self.datasources = datasources or {}
         self.tags = tags or {}
+        # TODO: Implement feature configuration object and validation
+        # https://docs.aws.amazon.com/guardduty/latest/APIReference/API_DetectorFeatureConfiguration.html
+        self.features = features or []
 
         self.filters: Dict[str, Filter] = dict()
 
@@ -212,6 +219,7 @@ class Detector(BaseModel):
         enable: bool,
         finding_publishing_frequency: str,
         data_sources: Dict[str, Any],
+        features: List[Dict[str, Any]],
     ) -> None:
         if enable is not None:
             self.enabled = enable
@@ -219,6 +227,8 @@ class Detector(BaseModel):
             self.finding_publish_freq = finding_publishing_frequency
         if data_sources is not None:
             self.datasources = data_sources
+        if features is not None:
+            self.features = features
 
     def to_json(self) -> Dict[str, Any]:
         data_sources = {
@@ -248,6 +258,7 @@ class Detector(BaseModel):
             "updatedAt": self.updated_at.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
             "dataSources": data_sources,
             "tags": self.tags,
+            "features": self.features,
         }
 
 

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/guardduty/responses.py

@@ -32,9 +32,10 @@ class GuardDutyResponse(BaseResponse):
         finding_publishing_frequency = self._get_param("findingPublishingFrequency")
         data_sources = self._get_param("dataSources")
         tags = self._get_param("tags")
+        features = self._get_param("features")
 
         detector_id = self.guardduty_backend.create_detector(
-            enable, finding_publishing_frequency, data_sources, tags
+            enable, finding_publishing_frequency, data_sources, tags, features
         )
 
         return json.dumps(dict(detectorId=detector_id))
@@ -89,9 +90,10 @@ class GuardDutyResponse(BaseResponse):
         enable = self._get_param("enable")
         finding_publishing_frequency = self._get_param("findingPublishingFrequency")
         data_sources = self._get_param("dataSources")
+        features = self._get_param("features")
 
         self.guardduty_backend.update_detector(
-            detector_id, enable, finding_publishing_frequency, data_sources
+            detector_id, enable, finding_publishing_frequency, data_sources, features
         )
         return "{}"
 

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/rds/models.py

@@ -2904,26 +2904,36 @@ class OptionGroup(RDSBaseModel):
           <EngineName>{{ option_group.engine_name }}</EngineName>
           <OptionGroupDescription>{{ option_group.description }}</OptionGroupDescription>
           <OptionGroupArn>{{ option_group.arn }}</OptionGroupArn>
-          <Options/>
+          <Options>
+              {% for name, option_settings in option_group.options.items() %}
+              <Option>
+                <OptionName>{{ name }}</OptionName>
+                <OptionSettings>
+                  {% for setting in option_settings %}
+                  <OptionSetting>
+                    <Name>{{ setting.get("Name") }}</Name>
+                    <Value>{{ setting.get("Value") }}</Value>
+                  </OptionSetting>
+                  {% endfor %}
+                </OptionSettings>
+              </Option>
+              {% endfor %}
+          </Options>
         </OptionGroup>"""
         )
         return template.render(option_group=self)
 
-    def remove_options(
-        self,
-        options_to_remove: Any,  # pylint: disable=unused-argument
-    ) -> None:
-        # TODO: Check for option in self.options and remove if exists. Raise
-        # error otherwise
-        return
-
-    def add_options(
-        self,
-        options_to_add: Any,  # pylint: disable=unused-argument
-    ) -> None:
-        # TODO: Validate option and add it to self.options. If invalid raise
-        # error
-        return
+    def remove_options(self, options_to_remove: Any) -> None:
+        for option in options_to_remove:
+            if isinstance(option, str):
+                self.options.pop(option, None)
+
+    def add_options(self, options_to_add: Any) -> None:
+        for option in options_to_add:
+            if isinstance(option, str):
+                self.options[option] = {}
+            elif isinstance(option, dict):
+                self.options[option["OptionName"]] = option["OptionSettings"]
 
 
 class DBParameterGroup(CloudFormationModel, RDSBaseModel):

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/rds/responses.py

@@ -489,34 +489,11 @@ class RDSResponse(BaseResponse):
 
     def modify_option_group(self) -> str:
         option_group_name = self._get_param("OptionGroupName")
-        count = 1
-        options_to_include = []
-        # TODO: This can probably be refactored with a single call to super.get_multi_param, but there are not enough tests (yet) to verify this
-        while self._get_param(f"OptionsToInclude.member.{count}.OptionName"):
-            options_to_include.append(
-                {
-                    "Port": self._get_param(f"OptionsToInclude.member.{count}.Port"),
-                    "OptionName": self._get_param(
-                        f"OptionsToInclude.member.{count}.OptionName"
-                    ),
-                    "DBSecurityGroupMemberships": self._get_param(
-                        f"OptionsToInclude.member.{count}.DBSecurityGroupMemberships"
-                    ),
-                    "OptionSettings": self._get_param(
-                        f"OptionsToInclude.member.{count}.OptionSettings"
-                    ),
-                    "VpcSecurityGroupMemberships": self._get_param(
-                        f"OptionsToInclude.member.{count}.VpcSecurityGroupMemberships"
-                    ),
-                }
-            )
-            count += 1
+        options_to_include = (self._get_multi_param_dict("OptionsToInclude") or {}).get(
+            "OptionConfiguration", []
+        )
+        options_to_remove = self._get_params().get("OptionsToRemove", [])
 
-        count = 1
-        options_to_remove = []
-        while self._get_param(f"OptionsToRemove.member.{count}"):
-            options_to_remove.append(self._get_param(f"OptionsToRemove.member.{count}"))
-            count += 1
         option_group = self.backend.modify_option_group(
             option_group_name, options_to_include, options_to_remove
         )

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/resourcegroupstaggingapi/models.py

@@ -663,12 +663,27 @@ class ResourceGroupsTaggingAPIBackend(BaseBackend):
                     "ResourceARN": f"arn:{self.partition}:ec2:{self.region_name}:{self.account_id}:vpc/{vpc.id}",
                     "Tags": tags,
                 }
+        # VPC Subnet
+        if (
+            not resource_type_filters
+            or "ec2" in resource_type_filters
+            or "ec2:subnet" in resource_type_filters
+        ):
+            for subnet in self.ec2_backend.subnets.values():
+                for subnet_id in subnet.keys():
+                    tags = format_tags(self.ec2_backend.tags.get(subnet_id, {}))
+                    if not tags or not tag_filter(tags):
+                        continue
+                    yield {
+                        "ResourceARN": f"arn:{self.partition}:ec2:{self.region_name}:{self.account_id}:subnet/{subnet_id}",
+                        "Tags": tags,
+                    }
+
         # VPC Customer Gateway
         # VPC DHCP Option Set
         # VPC Internet Gateway
         # VPC Network ACL
         # VPC Route Table
-        # VPC Subnet
         # VPC Virtual Private Gateway
         # VPC VPN Connection
 

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/moto/route53/responses.py

@@ -373,13 +373,16 @@ class Route53(BaseResponse):
             return 200, headers, template.render()
 
     def list_tags_for_resources(self) -> str:
-        if id_matcher := re.search(r"/tags/[-a-z]+/(.+)", self.parsed_url.path):
+        if id_matcher := re.search(r"/tags/(.+)", self.parsed_url.path):
             resource_type = unquote(id_matcher.group(1))
         else:
             resource_type = ""
         resource_ids = xmltodict.parse(self.body)["ListTagsForResourcesRequest"][
             "ResourceIds"
         ]["ResourceId"]
+        # If only one resource id is passed, it is a string, not a list
+        if not isinstance(resource_ids, list):
+            resource_ids = [resource_ids]
         tag_sets = self.backend.list_tags_for_resources(resource_ids=resource_ids)
         template = Template(LIST_TAGS_FOR_RESOURCES_RESPONSE)
         return template.render(tag_sets=tag_sets, resource_type=resource_type)

{moto-5.0.15.dev28 → moto-5.0.16.dev5/moto.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.15.dev28
+Version: 5.0.16.dev5
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = moto
-version = 5.0.15.dev28
+version = 5.0.16.dev5
 long_description = file:README.md
 long_description_content_type = text/markdown
 author = Steve Pulec

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/tests/test_guardduty/test_guardduty.py

@@ -13,6 +13,7 @@ def test_create_detector():
         ClientToken="745645734574758463758",
         FindingPublishingFrequency="ONE_HOUR",
         DataSources={"S3Logs": {"Enable": True}},
+        Features=[{"Name": "Test", "Status": "ENABLED"}],
         Tags={},
     )
     assert "DetectorId" in response
@@ -65,6 +66,35 @@ def test_get_detector_with_all_data_sources():
     assert "CreatedAt" in resp
 
 
+@mock_aws
+def test_get_detector_with_features():
+    client = boto3.client("guardduty", region_name="us-east-1")
+    detector_id = client.create_detector(
+        Enable=True,
+        Features=[
+            {
+                "Name": "EKS_AUDIT_LOGS",
+                "Status": "ENABLED",
+                "AdditionalConfiguration": [
+                    {"Name": "EKS_ADDON_MANAGEMENT", "Status": "ENABLED"}
+                ],
+            },
+            {"Name": "TS3_DATA_EVENTS", "Status": "DISABLED"},
+        ],
+    )["DetectorId"]
+
+    resp = client.get_detector(DetectorId=detector_id)
+    assert len(resp["Features"]) == 2
+    assert resp["Features"][0]["Name"] == "EKS_AUDIT_LOGS"
+    assert resp["Features"][0]["Status"] == "ENABLED"
+    assert (
+        resp["Features"][0]["AdditionalConfiguration"][0]["Name"]
+        == "EKS_ADDON_MANAGEMENT"
+    )
+    assert resp["Features"][1]["Name"] == "TS3_DATA_EVENTS"
+    assert resp["Features"][1]["Status"] == "DISABLED"
+
+
 @mock_aws
 def test_update_detector():
     client = boto3.client("guardduty", region_name="us-east-1")
@@ -83,12 +113,14 @@ def test_update_detector():
             "S3Logs": {"Enable": True},
             "Kubernetes": {"AuditLogs": {"Enable": False}},
         },
+        Features=[{"Name": "Test", "Status": "ENABLED"}],
     )
 
     resp = client.get_detector(DetectorId=detector_id)
     assert resp["FindingPublishingFrequency"] == "SIX_HOURS"
     assert resp["DataSources"]["S3Logs"] == {"Status": "ENABLED"}
     assert resp["DataSources"]["Kubernetes"]["AuditLogs"] == {"Status": "DISABLED"}
+    assert resp["Features"] == [{"Name": "Test", "Status": "ENABLED"}]
 
 
 @mock_aws

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/tests/test_rds/test_rds.py

@@ -1,4 +1,5 @@
 import datetime
+from uuid import uuid4
 
 import boto3
 import pytest
@@ -6,6 +7,7 @@ from botocore.exceptions import ClientError
 
 from moto import mock_aws
 from moto.core import DEFAULT_ACCOUNT_ID as ACCOUNT_ID
+from tests import aws_verified
 
 DEFAULT_REGION = "us-west-2"
 
@@ -1468,27 +1470,96 @@ def test_describe_option_group_options():
         )
 
 
-@mock_aws
+@pytest.mark.aws_verified
+@aws_verified
 def test_modify_option_group():
-    conn = boto3.client("rds", region_name=DEFAULT_REGION)
+    conn = boto3.client("rds", region_name="us-east-1")
+    option_group_name = f"og-{str(uuid4())[0:6]}"
     conn.create_option_group(
-        OptionGroupName="test",
+        OptionGroupName=option_group_name,
         EngineName="mysql",
         MajorEngineVersion="5.6",
         OptionGroupDescription="test option group",
     )
-    # TODO: create option and validate before deleting.
-    # if Someone can tell me how the hell to use this function
-    # to add options to an option_group, I can finish coding this.
-    result = conn.modify_option_group(
-        OptionGroupName="test",
-        OptionsToInclude=[],
-        OptionsToRemove=["MEMCACHED"],
-        ApplyImmediately=True,
-    )
-    assert result["OptionGroup"]["EngineName"] == "mysql"
-    assert result["OptionGroup"]["Options"] == []
-    assert result["OptionGroup"]["OptionGroupName"] == "test"
+
+    try:
+        # Verify OptionsToRemove do not have to exist
+        option_group = conn.modify_option_group(
+            OptionGroupName=option_group_name,
+            OptionsToInclude=[],
+            OptionsToRemove=["MEMCACHED"],
+            ApplyImmediately=True,
+        )["OptionGroup"]
+        assert option_group["EngineName"] == "mysql"
+        assert option_group["Options"] == []
+        assert option_group["OptionGroupName"] == option_group_name
+
+        option_groups = conn.describe_option_groups(OptionGroupName=option_group_name)[
+            "OptionGroupsList"
+        ]
+        assert option_groups[0]["Options"] == []
+
+        # Include option
+        # https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.MySQL.Options.AuditPlugin.html
+        conn.modify_option_group(
+            OptionGroupName=option_group_name,
+            OptionsToInclude=[{"OptionName": "MARIADB_AUDIT_PLUGIN"}],
+            OptionsToRemove=[],
+            ApplyImmediately=True,
+        )["OptionGroup"]
+
+        # Verify it was added successfully
+        option_groups = conn.describe_option_groups(OptionGroupName=option_group_name)[
+            "OptionGroupsList"
+        ]
+
+        options = option_groups[0]["Options"]
+        assert len(options) == 1
+        assert options[0]["OptionName"] == "MARIADB_AUDIT_PLUGIN"
+        # AWS automatically adds a description + default option settings, but Moto does not support that yet
+
+        # Change setting for an existing option
+        conn.modify_option_group(
+            OptionGroupName=option_group_name,
+            OptionsToInclude=[
+                {
+                    "OptionName": "MARIADB_AUDIT_PLUGIN",
+                    "OptionSettings": [
+                        {"Name": "SERVER_AUDIT_FILE_ROTATE_SIZE", "Value": "1000"},
+                    ],
+                }
+            ],
+            ApplyImmediately=True,
+        )["OptionGroup"]
+
+        # Verify it was added successfully
+        option_groups = conn.describe_option_groups(OptionGroupName=option_group_name)[
+            "OptionGroupsList"
+        ]
+
+        options = option_groups[0]["Options"]
+        assert len(options) == 1
+        assert options[0]["OptionName"] == "MARIADB_AUDIT_PLUGIN"
+
+        option_settings = options[0]["OptionSettings"]
+        audit_plugin = [
+            o for o in option_settings if o["Name"] == "SERVER_AUDIT_FILE_ROTATE_SIZE"
+        ][0]
+        audit_plugin["Name"] == "SERVER_AUDIT_FILE_ROTATE_SIZE"
+        audit_plugin["Value"] == "1000"
+
+        # Verify option can be deleted
+        conn.modify_option_group(
+            OptionGroupName=option_group_name,
+            OptionsToRemove=["MARIADB_AUDIT_PLUGIN"],
+            ApplyImmediately=True,
+        )
+        option_groups = conn.describe_option_groups(OptionGroupName=option_group_name)[
+            "OptionGroupsList"
+        ]
+        assert option_groups[0]["Options"] == []
+    finally:
+        conn.delete_option_group(OptionGroupName=option_group_name)
 
 
 @mock_aws

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/tests/test_resourcegroupstaggingapi/test_resourcegroupstaggingapi.py

@@ -332,20 +332,32 @@ def test_get_resources_ec2():
 def test_get_resources_ec2_vpc():
     ec2 = boto3.resource("ec2", region_name="us-west-2")
     vpc = ec2.create_vpc(CidrBlock="10.0.0.0/16")
-    ec2.create_tags(Resources=[vpc.id], Tags=[{"Key": "test", "Value": "test"}])
-
-    def assert_response(resp):
-        results = resp.get("ResourceTagMappingList", [])
-        assert len(results) == 1
-        assert vpc.id in results[0]["ResourceARN"]
+    ec2.create_tags(Resources=[vpc.id], Tags=[{"Key": "test", "Value": "test_vpc"}])
+    subnet = ec2.create_subnet(VpcId=vpc.id, CidrBlock="10.0.1.0/24")
+    ec2.create_tags(
+        Resources=[subnet.id], Tags=[{"Key": "test", "Value": "test_subnet"}]
+    )
 
     rtapi = boto3.client("resourcegroupstaggingapi", region_name="us-west-2")
+    # Check that we have one entry for VPC, one for the subnet
     resp = rtapi.get_resources(ResourceTypeFilters=["ec2"])
-    assert_response(resp)
+    assert len(resp["ResourceTagMappingList"]) == 2
+
+    # 1 Entry for VPC
     resp = rtapi.get_resources(ResourceTypeFilters=["ec2:vpc"])
-    assert_response(resp)
-    resp = rtapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test"]}])
-    assert_response(resp)
+    assert len(resp["ResourceTagMappingList"]) == 1
+    assert "vpc/" in resp["ResourceTagMappingList"][0]["ResourceARN"]
+    resp = rtapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test_vpc"]}])
+    assert len(resp["ResourceTagMappingList"]) == 1
+    assert "vpc/" in resp["ResourceTagMappingList"][0]["ResourceARN"]
+
+    # 1 Entry for Subnet
+    resp = rtapi.get_resources(ResourceTypeFilters=["ec2:subnet"])
+    assert len(resp["ResourceTagMappingList"]) == 1
+    assert "subnet/" in resp["ResourceTagMappingList"][0]["ResourceARN"]
+    resp = rtapi.get_resources(TagFilters=[{"Key": "test", "Values": ["test_subnet"]}])
+    assert len(resp["ResourceTagMappingList"]) == 1
+    assert "subnet/" in resp["ResourceTagMappingList"][0]["ResourceARN"]
 
 
 @mock_aws

{moto-5.0.15.dev28 → moto-5.0.16.dev5}/tests/test_route53/test_route53.py

@@ -634,6 +634,7 @@ def test_list_tags_for_resources():
     assert len(response["ResourceTagSets"]) == 2
     for set in response["ResourceTagSets"]:
         assert set["ResourceId"] in (zone1_id, zone2_id)
+        assert set["ResourceType"] == "hostedzone"
         if set["ResourceId"] == zone1_id:
             assert tag1 in set["Tags"]
             assert tag2 in set["Tags"]
@@ -645,6 +646,19 @@ def test_list_tags_for_resources():
             assert tag3 in set["Tags"]
             assert tag4 in set["Tags"]
 
+    # Test hostedzone with single resource
+    response = conn.list_tags_for_resources(
+        ResourceIds=[zone1_id], ResourceType="hostedzone"
+    )
+    assert len(response["ResourceTagSets"]) == 1
+    for set in response["ResourceTagSets"]:
+        assert set["ResourceId"] == zone1_id
+        assert set["ResourceType"] == "hostedzone"
+        assert tag1 in set["Tags"]
+        assert tag2 in set["Tags"]
+        assert tag3 not in set["Tags"]
+        assert tag4 not in set["Tags"]
+
     # Test healthcheck
     response = conn.list_tags_for_resources(
         ResourceIds=[healthcheck1_id, healthcheck2_id], ResourceType="healthcheck"
@@ -652,6 +666,7 @@ def test_list_tags_for_resources():
     assert len(response["ResourceTagSets"]) == 2
     for set in response["ResourceTagSets"]:
         assert set["ResourceId"] in (healthcheck1_id, healthcheck2_id)
+        assert set["ResourceType"] == "healthcheck"
         if set["ResourceId"] == healthcheck1_id:
             assert tag1 in set["Tags"]
             assert tag2 in set["Tags"]