moto 5.0.2.dev7__py2.py3-none-any.whl → 5.0.2.dev8__py2.py3-none-any.whl

moto/__init__.py

@@ -1,4 +1,4 @@
 from moto.core.decorator import mock_aws as mock_aws
 
 __title__ = "moto"
-__version__ = "5.0.2.dev7"
+__version__ = "5.0.2.dev8"

moto/route53/models.py

@@ -723,7 +723,11 @@ class Route53Backend(BaseBackend):
                     the_zone.delete_rrset(record_set)
             the_zone.rr_changes.append(original_change)
 
+    @paginate(pagination_model=PAGINATION_MODEL)  # type: ignore[misc]
     def list_hosted_zones(self) -> List[FakeZone]:
+        """
+        The parameters DelegationSetId and HostedZoneType are not yet implemented
+        """
         return list(self.zones.values())
 
     def list_hosted_zones_by_name(
@@ -733,7 +737,7 @@ class Route53Backend(BaseBackend):
             dnsname = dnsnames[0]
             if dnsname[-1] != ".":
                 dnsname += "."
-            zones = [zone for zone in self.list_hosted_zones() if zone.name == dnsname]
+            zones = [zone for zone in self.zones.values() if zone.name == dnsname]
         else:
             dnsname = None
             # sort by names, but with domain components reversed
@@ -745,8 +749,7 @@ class Route53Backend(BaseBackend):
                     domains = domains[-1:] + domains[:-1]
                 return ".".join(reversed(domains))
 
-            zones = self.list_hosted_zones()
-            zones = sorted(zones, key=sort_key)
+            zones = sorted(self.zones.values(), key=sort_key)
         return dnsname, zones
 
     def list_hosted_zones_by_vpc(self, vpc_id: str) -> List[Dict[str, Any]]:
@@ -754,7 +757,7 @@ class Route53Backend(BaseBackend):
         Pagination is not yet implemented
         """
         zone_list = []
-        for zone in self.list_hosted_zones():
+        for zone in self.zones.values():
             if zone.private_zone is True:
                 this_zone = self.get_hosted_zone(zone.id)
                 for vpc in this_zone.vpcs:
@@ -776,10 +779,10 @@ class Route53Backend(BaseBackend):
         return the_zone
 
     def get_hosted_zone_count(self) -> int:
-        return len(self.list_hosted_zones())
+        return len(self.zones.values())
 
     def get_hosted_zone_by_name(self, name: str) -> Optional[FakeZone]:
-        for zone in self.list_hosted_zones():
+        for zone in self.zones.values():
             if zone.name == name:
                 return zone
         return None
@@ -875,8 +878,7 @@ class Route53Backend(BaseBackend):
     ) -> QueryLoggingConfig:
         """Process the create_query_logging_config request."""
         # Does the hosted_zone_id exist?
-        response = self.list_hosted_zones()
-        zones = list(response) if response else []
+        zones = list(self.zones.values())
         for zone in zones:
             if zone.id == hosted_zone_id:
                 break
@@ -940,8 +942,7 @@ class Route53Backend(BaseBackend):
         """Return a list of query logging configs."""
         if hosted_zone_id:
             # Does the hosted_zone_id exist?
-            response = self.list_hosted_zones()
-            zones = list(response) if response else []
+            zones = list(self.zones.values())
             for zone in zones:
                 if zone.id == hosted_zone_id:
                     break

moto/route53/responses.py

@@ -81,16 +81,27 @@ class Route53(BaseResponse):
                 vpcregion=vpcregion,
                 delegation_set_id=delegation_set_id,
             )
-            template = Template(CREATE_HOSTED_ZONE_RESPONSE)
+            template = Template(CREATE_HOSTED_ZONE_RESPONSE).render(zone=new_zone)
             headers = {
                 "Location": f"https://route53.amazonaws.com/2013-04-01/hostedzone/{new_zone.id}"
             }
-            return 201, headers, template.render(zone=new_zone)
+            return 201, headers, template
 
         elif request.method == "GET":
-            all_zones = self.backend.list_hosted_zones()
-            template = Template(LIST_HOSTED_ZONES_RESPONSE)
-            return 200, headers, template.render(zones=all_zones)
+            max_size = self.querystring.get("maxitems", [None])[0]
+            if max_size:
+                max_size = int(max_size)
+            marker = self.querystring.get("marker", [None])[0]
+            zone_page, next_marker = self.backend.list_hosted_zones(
+                marker=marker, max_size=max_size
+            )
+            template = Template(LIST_HOSTED_ZONES_RESPONSE).render(
+                zones=zone_page,
+                marker=marker,
+                next_marker=next_marker,
+                max_items=max_size,
+            )
+            return 200, headers, template
 
     def list_hosted_zones_by_name_response(
         self, request: Any, full_url: str, headers: Any
@@ -704,7 +715,10 @@ LIST_HOSTED_ZONES_RESPONSE = """<ListHostedZonesResponse xmlns="https://route53.
       </HostedZone>
       {% endfor %}
    </HostedZones>
-   <IsTruncated>false</IsTruncated>
+   {% if marker %}<Marker>{{ marker }}</Marker>{% endif %}
+   {%if next_marker %}<NextMarker>{{ next_marker }}</NextMarker>{% endif %}
+   {%if max_items %}<MaxItems>{{ max_items }}</MaxItems>{% endif %}
+   <IsTruncated>{{ 'true' if next_marker else 'false'}}</IsTruncated>
 </ListHostedZonesResponse>"""
 
 LIST_HOSTED_ZONES_BY_NAME_RESPONSE = """<ListHostedZonesByNameResponse xmlns="{{ xmlns }}">

moto/route53/utils.py

@@ -2,6 +2,12 @@
 from .exceptions import InvalidPaginationToken
 
 PAGINATION_MODEL = {
+    "list_hosted_zones": {
+        "input_token": "marker",
+        "limit_key": "max_size",
+        "limit_default": 100,
+        "unique_attribute": "id",
+    },
     "list_query_logging_configs": {
         "input_token": "next_token",
         "limit_key": "max_results",

{moto-5.0.2.dev7.dist-info → moto-5.0.2.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moto
-Version: 5.0.2.dev7
+Version: 5.0.2.dev8
 Home-page: https://github.com/getmoto/moto
 Author: Steve Pulec
 Author-email: spulec@gmail.com

{moto-5.0.2.dev7.dist-info → moto-5.0.2.dev8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-moto/__init__.py,sha256=oZeD873Mvp3VTBKl_SDn1JnWbuS8NiXHK4ONJAf9S0Y,100
+moto/__init__.py,sha256=ZAdhYHCx1nkqNM8hGEMnPEloN1H6PPqFgJatAp_jAf0,100
 moto/backend_index.py,sha256=0ZXW2MoTfOl-F3w0DiRCg4XefVIWvLgAmZW-3Pcx7f4,10951
 moto/backends.py,sha256=uM9-6lJ6cqPJuKKFymnhidN1iqslTmOUfnYDT3mvOPI,24575
 moto/proxy.py,sha256=5oz1ZGQP4SoWDYycZApQSRmOv9M-TpjeJpJY9fG3oxY,3113
@@ -830,10 +830,10 @@ moto/robomaker/responses.py,sha256=l8X_yzTCihrGItZSZJEHfSIKvWCrPUSVRnIZ2QdjYVA,1
 moto/robomaker/urls.py,sha256=bWI4R347OSGc1HtvRTvzOftRq9BDk38e-6Xot56RkiU,375
 moto/route53/__init__.py,sha256=-cqzuaCnL6aA7UWUlsCYQ_VUYNtk9yNyIgilOCBzVio,51
 moto/route53/exceptions.py,sha256=Bbqg11F-Uyi7sb7MAaJ5LOglXcWPp5doGp1unb9H9fs,6014
-moto/route53/models.py,sha256=T3d_ms-aKmCXFMFZvtTjQkw4qjXkb5aPDI35zXbpGqw,39391
-moto/route53/responses.py,sha256=ND9PhovhPTUZddq_RLHyky8gagMFIYcYlBFG2eMRTh8,36934
+moto/route53/models.py,sha256=TizwR15LaDOCsnqeqC2TPAjim7dTbKSst-7mgzO6LEg,39407
+moto/route53/responses.py,sha256=p14FuZNz5hvFcXgPN0gIXwBMDlyEpf_FHpGsC_rVd90,37581
 moto/route53/urls.py,sha256=zuweZkUMC3o3eO2rzNpJr4WvFrH_zaxs8DMJHc1majU,3607
-moto/route53/utils.py,sha256=P1CqCR_zFycVQWiNQI5Q8bfNrUA5wYpCqLNnsByFMAA,364
+moto/route53/utils.py,sha256=ta6hnmgk99aGBqBoDIyi-4hnyPK4aarTxjQz2E0IDVo,528
 moto/route53resolver/__init__.py,sha256=w6Cj-tmD7kIFT3kthNprVBlEXdiWWS9aqNm--Wifp_A,59
 moto/route53resolver/exceptions.py,sha256=ZhUYGsBUXN6D2BLvtCTHkdScCkatsUMmZZwYLYaKVAM,2367
 moto/route53resolver/models.py,sha256=RaEuOsZiwFpF2VhlmL0b6Q9TB_mCA2jza-qG1xfcz_U,37414
@@ -1070,10 +1070,10 @@ moto/xray/mock_client.py,sha256=_hckCof1BgtizZ4u-Da0tpXX9JNGTbVs7AhbkxBnuGU,3811
 moto/xray/models.py,sha256=NbevJjH4Qly1A6YM0SswSv7gTBc44547Zl5XnRMd84s,11229
 moto/xray/responses.py,sha256=StNwTGhzvkqCmghSo2O9tMfTRQSN4BWYzLODyKMUj-s,6316
 moto/xray/urls.py,sha256=R6T3gMwobWipukWcC1DQ36CU1Rjt6oqBDoe-7HqaIZU,393
-moto-5.0.2.dev7.dist-info/AUTHORS.md,sha256=dDUhasV8HGSkzb7zj7a0b3alnqY0P1LPOyOUNoo8Mpo,2976
-moto-5.0.2.dev7.dist-info/LICENSE,sha256=8S75_TlqE-kIeGMLG0-rRxxu2ct6SM8quyUWKBYyIY4,10834
-moto-5.0.2.dev7.dist-info/METADATA,sha256=yz90LjfivCAh9oY5PjJ_o2isHEqfe3pTw8ZKfJqmtVo,12754
-moto-5.0.2.dev7.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-moto-5.0.2.dev7.dist-info/entry_points.txt,sha256=QWCojULQb54Hi_2KamEEYHA6Cwek_vN685aS8DbI9rU,78
-moto-5.0.2.dev7.dist-info/top_level.txt,sha256=TETRKAPcAAvoZDkSkwQiZtTSr-1gzaEAXVm9FmZKj8s,5
-moto-5.0.2.dev7.dist-info/RECORD,,
+moto-5.0.2.dev8.dist-info/AUTHORS.md,sha256=dDUhasV8HGSkzb7zj7a0b3alnqY0P1LPOyOUNoo8Mpo,2976
+moto-5.0.2.dev8.dist-info/LICENSE,sha256=8S75_TlqE-kIeGMLG0-rRxxu2ct6SM8quyUWKBYyIY4,10834
+moto-5.0.2.dev8.dist-info/METADATA,sha256=MW2spcLk2oOBTl-lRny74V3eXwNGDICER0jXxDKewYU,12754
+moto-5.0.2.dev8.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+moto-5.0.2.dev8.dist-info/entry_points.txt,sha256=QWCojULQb54Hi_2KamEEYHA6Cwek_vN685aS8DbI9rU,78
+moto-5.0.2.dev8.dist-info/top_level.txt,sha256=TETRKAPcAAvoZDkSkwQiZtTSr-1gzaEAXVm9FmZKj8s,5
+moto-5.0.2.dev8.dist-info/RECORD,,