localstack-core 4.13.2.dev69__py3-none-any.whl → 4.13.2.dev71__py3-none-any.whl

localstack/aws/api/apigateway/__init__.py

@@ -1138,11 +1138,14 @@ class TlsConfig(TypedDict, total=False):
     insecureSkipVerification: Boolean | None
 
 
+MapOfStringToNullableString = dict[String, String | None]
+
+
 class IntegrationResponse(TypedDict, total=False):
     statusCode: StatusCode | None
     selectionPattern: String | None
     responseParameters: MapOfStringToString | None
-    responseTemplates: MapOfStringToString | None
+    responseTemplates: MapOfStringToNullableString | None
     contentHandling: ContentHandlingStrategy | None
 
 

localstack/aws/protocol/serializer.py

@@ -1533,6 +1533,17 @@ class RestJSONResponseSerializer(BaseRestResponseSerializer, JSONResponseSeriali
         if has_body and not has_content_type:
             serialized.headers["Content-Type"] = mime_type
 
+    def _serialize_type_map(
+        self, body: dict, value: dict, shape: MapShape, key: str, mime_type: str
+    ):
+        # REST JSON is different from regular JSON, it returns None values in Map
+        if value is None:
+            return
+        map_obj = {}
+        body[key] = map_obj
+        for sub_key, sub_value in value.items():
+            self._serialize(map_obj, sub_value, shape.value, sub_key, mime_type)
+
 
 class BaseCBORResponseSerializer(ResponseSerializer):
     """

localstack/aws/scaffold.py

@@ -64,6 +64,14 @@ def html_to_rst(html: str):
     return rst
 
 
+def is_sparse_shape(shape: ListShape | MapShape):
+    # see https://smithy.io/2.0/spec/type-refinement-traits.html#sparse-trait
+    # this is needed for generating Map that can have nullable values
+    # We need to access `_shape_model` directly, because `sparse` is not used by Botocore, so it is not picked in
+    # `metadata`: see ``botocore.model.Shape.METADATA_ATTRS`` and ``botocore.model.Shape.metadata``
+    return getattr(shape, "_shape_model", {}).get("sparse")
+
+
 class ShapeNode:
     service: ServiceModel
     shape: Shape
@@ -258,8 +266,12 @@ class ShapeNode:
                 f"{to_valid_python_name(shape.name)} = list[{q}{to_valid_python_name(shape.member.name)}{q}]"
             )
         elif isinstance(shape, MapShape):
+            if is_sparse_shape(shape):
+                value_key = f"{q}{to_valid_python_name(shape.value.name)} | None{q}"
+            else:
+                value_key = f"{q}{to_valid_python_name(shape.value.name)}{q}"
             output.write(
-                f"{to_valid_python_name(shape.name)} = dict[{q}{to_valid_python_name(shape.key.name)}{q}, {q}{to_valid_python_name(shape.value.name)}{q}]"
+                f"{to_valid_python_name(shape.name)} = dict[{q}{to_valid_python_name(shape.key.name)}{q}, {value_key}]"
             )
         elif isinstance(shape, StringShape):
             if shape.enum:

localstack/aws/spec-patches.json

@@ -1372,5 +1372,22 @@
       "path": "/operations/CreateApiMapping/http/responseCode",
       "value": 200
     }
+  ],
+  "apigateway/2015-07-09/service-2": [
+    {
+      "op": "add",
+      "path": "/shapes/MapOfStringToNullableString",
+      "value": {
+        "type":"map",
+        "key":{"shape":"String"},
+        "value":{"shape":"String"},
+        "sparse": true
+      }
+    },
+    {
+      "op": "replace",
+      "path": "/shapes/IntegrationResponse/members/responseTemplates/shape",
+      "value": "MapOfStringToNullableString"
+    }
   ]
 }

localstack/testing/pytest/fixtures.py

@@ -2821,3 +2821,40 @@ def aws_catalog_mock(monkeypatch):
         return catalog
 
     return _mock_catalog
+
+
+@pytest.fixture
+def logs_log_group(aws_client):
+    """Create a log group for testing and clean up afterwards."""
+
+    log_group_names = []
+
+    def _create_log_group():
+        log_group_name = f"test-log-group-{short_uid()}"
+        aws_client.logs.create_log_group(logGroupName=log_group_name)
+        log_group_names.append(log_group_name)
+        return log_group_name
+
+    yield _create_log_group()
+
+    for group_name in log_group_names:
+        aws_client.logs.delete_log_group(logGroupName=group_name)
+
+
+@pytest.fixture
+def logs_log_stream(logs_log_group, aws_client):
+    """Create a log stream for testing and clean up afterwards."""
+    log_stream_names = []
+
+    def _create_log_stream():
+        log_stream_name = f"test-log-stream-{short_uid()}"
+        aws_client.logs.create_log_stream(
+            logGroupName=logs_log_group, logStreamName=log_stream_name
+        )
+        log_stream_names.append(log_stream_name)
+        return log_stream_name
+
+    yield _create_log_stream()
+
+    for stream_name in log_stream_names:
+        aws_client.logs.delete_log_stream(logStreamName=stream_name, logGroupName=logs_log_group)

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev69'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev69')
+__version__ = version = '4.13.2.dev71'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev71')
 
 __commit_id__ = commit_id = None

{localstack_core-4.13.2.dev69.dist-info → localstack_core-4.13.2.dev71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev69
+Version: 4.13.2.dev71
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.13.2.dev69.dist-info → localstack_core-4.13.2.dev71.dist-info}/RECORD

@@ -4,7 +4,7 @@ localstack/deprecations.py,sha256=-3IYgCd6LEC3PjO7hbr3Dg-p0PIS6phjmv1qZnj1uo0,15
 localstack/openapi.yaml,sha256=jFUzv-NKkJttxb8HRrmKiNYOmJD-zVfPxG3DDMrRwfg,30865
 localstack/plugins.py,sha256=BIJC9dlo0WbP7lLKkCiGtd_2q5oeqiHZohvoRTcejXM,2457
 localstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-localstack/version.py,sha256=EkURekcDSUdm0MV3wrHgwGzpocKIvsPMvPJMl_fzyuE,721
+localstack/version.py,sha256=aGAfA7KWqsAuyy2y7e5Z1YRtCIbWNKY6nYfUxHNJLjg,721
 localstack/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/aws/accounts.py,sha256=102zpGowOxo0S6UGMpfjw14QW7WCLVAGsnFK5xFMLoo,3043
 localstack/aws/app.py,sha256=n9bJCfJRuMz_gLGAH430c3bIQXgUXeWO5NPfcdL2MV8,5145
@@ -17,14 +17,14 @@ localstack/aws/forwarder.py,sha256=GGo3l0GCsaASLOC7THKoUsVaH678WVH-PJoMzEotk0Y,1
 localstack/aws/gateway.py,sha256=d_Tm0N2-mAnuvE4puXfRjgzMHwR3EuuOQH5IIWX-vAQ,903
 localstack/aws/mocking.py,sha256=JZZ7ZyAmlCGzywTF8jH4IelPGIiLqyz_ltDtO046a3E,13683
 localstack/aws/patches.py,sha256=r5EDhDE_OL25fQzT6oEhV7LvpBzTisOqxdn-JD_ZfrI,1883
-localstack/aws/scaffold.py,sha256=GxUHvnmc5zidpj1d6IIHqF7q9w1UCrAh1SNco7rlpS4,19943
+localstack/aws/scaffold.py,sha256=bHxaAyWF2-E5Fh6gRte0_1oX8jnCepChKUicfkb7lQg,20602
 localstack/aws/skeleton.py,sha256=7R0M8X5hnoPxdZ1sy0oaBOu_gWAFS4ZrIYUx5617VZs,8832
-localstack/aws/spec-patches.json,sha256=TsGJ6uLE5L0WylJ0i4URhvNauGHkgB45jJ3-MVWeN90,43032
+localstack/aws/spec-patches.json,sha256=w13utQLNiMtkpu1fKRASguVKsrRXK2AW0rkguw7lgqE,43458
 localstack/aws/spec.py,sha256=WT_sqIIKjWjrD-lBfJFgbvmrfhAbcqak5cfOQdnBJZo,14976
 localstack/aws/api/__init__.py,sha256=JspwCauxfTTdLNVAr7AkQaPu1lELdBQ1miB9B9sndOo,297
 localstack/aws/api/core.py,sha256=7qi_hFySJTnOSh1Kv-FCAp2JNpK5jP8sucoG-VTyH4k,6913
 localstack/aws/api/acm/__init__.py,sha256=g0f7UL6AIRsb64cUOxm_n0UR2VMZRaknJvVWPUNbq18,18773
-localstack/aws/api/apigateway/__init__.py,sha256=NWFc6T3nHO8LGI06PC47sNMuOXxsg5huAT7E8IryzbY,80078
+localstack/aws/api/apigateway/__init__.py,sha256=GhWxpSBRGKlfT0Wsw4sC5AwM0zmwPcEKWF7uumCpYcg,80146
 localstack/aws/api/cloudcontrol/__init__.py,sha256=qFIcOWAtk4Xe4REXn8JSqpV1zIXzaTcTXQwlJGmghyA,11424
 localstack/aws/api/cloudformation/__init__.py,sha256=Tbi6JoTo_pA03rVuR2R_DvdWFD7fS-qgt-eW007uRsM,121616
 localstack/aws/api/cloudwatch/__init__.py,sha256=MWUSm7rqKf3p_MMVmXcZFaqRgmNAFTIGhqP-WNZjWbE,46267
@@ -87,7 +87,7 @@ localstack/aws/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 localstack/aws/protocol/op_router.py,sha256=2nSpL6H9seK1h_AuIZlBG1yYa_ykARIgJJrKm4Hkc0s,12039
 localstack/aws/protocol/parser.py,sha256=69633HWAlRH01orBZxsbaOKAmd94A64UbkL5udGlD2o,71608
 localstack/aws/protocol/routing.py,sha256=bi02VUUEQaneVribxAvSkQ4VJloSFWxmSBlwTbHH3j8,3188
-localstack/aws/protocol/serializer.py,sha256=sOW5TEeAWD82yy5tjd9pSdbx1qW92-o1Yd9sVqq-ivk,108086
+localstack/aws/protocol/serializer.py,sha256=aJKsjr-kXdmhkiLTBh0tEhULXW4VOpPx_etX803vtGo,108510
 localstack/aws/protocol/service_router.py,sha256=M5iQ8XKUaPV65DyKewlVYHYNmu4k17Zn_p6_Jdj2Bw8,20705
 localstack/aws/protocol/validate.py,sha256=j3HJAQEKS6V_arrmvlPmP2jbge3LutxwEXDNabDlDdY,5285
 localstack/aws/serving/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1194,7 +1194,7 @@ localstack/testing/pytest/detect_thread_leakage.py,sha256=iV2qFm4sQ7AkoqRfSZgoAU
 localstack/testing/pytest/filters.py,sha256=4PUUj6B-L8leWE00qzS0LP76LHZ3eiycM9jTozMIrkk,1149
 localstack/testing/pytest/find_orphaned_snapshots.py,sha256=-abDUtXa2-9PkZBDjU9XxQkT7i0dATXnFR2GzsX0TFc,1336
 localstack/testing/pytest/fixture_conflicts.py,sha256=cCWOEwO5clVRFseFS0_9wH5v47n_x4OQeIfVXHJvSOU,1497
-localstack/testing/pytest/fixtures.py,sha256=BZ4z-Jy6T5tpIn2YDCa0GVESu5DdyumaAuvFyCw-5O0,96639
+localstack/testing/pytest/fixtures.py,sha256=A-XCiw1JQ_E3Yla01-Zqsg0mHJRP0HsJAwRQNpkO62o,97778
 localstack/testing/pytest/in_memory_localstack.py,sha256=8dnsVzKu-ARz9CnL4Q7d0bTxAFXfXHFrSihWOvXSd_U,3242
 localstack/testing/pytest/marker_report.py,sha256=_GOdUQQ5e-FUdw-26rHJ3B13qHrM9m4qGuzKvW2CdsE,5549
 localstack/testing/pytest/marking.py,sha256=bPtqIDuNcfXUuc9U66G4CEJykGdGbTb1BVBEZBc49XI,9007
@@ -1311,10 +1311,10 @@ localstack/utils/server/tcp_proxy.py,sha256=y2NJAmvftTiAYsLU_8qe4W5LGqwUw21i90Pu
 localstack/utils/xray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/utils/xray/trace_header.py,sha256=ahXk9eonq7LpeENwlqUEPj3jDOCiVRixhntQuxNor-Q,6209
 localstack/utils/xray/traceid.py,sha256=GKO-R2sMMjlrH2UaLPXlQlZ6flbE7ZKb6IZMtMu_M5U,1110
-localstack_core-4.13.2.dev69.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
-localstack_core-4.13.2.dev69.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
-localstack_core-4.13.2.dev69.dist-info/METADATA,sha256=E4FANnz9E_Qmzh7GRzalH8bwupg-GNDbtBvjCdDsqiY,5867
-localstack_core-4.13.2.dev69.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack_core-4.13.2.dev69.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
-localstack_core-4.13.2.dev69.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
-localstack_core-4.13.2.dev69.dist-info/RECORD,,
+localstack_core-4.13.2.dev71.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
+localstack_core-4.13.2.dev71.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
+localstack_core-4.13.2.dev71.dist-info/METADATA,sha256=rhMFBe7t9jXKXZAqVWszr9NLZFBgZmubPTCkE3KPXis,5867
+localstack_core-4.13.2.dev71.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack_core-4.13.2.dev71.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
+localstack_core-4.13.2.dev71.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
+localstack_core-4.13.2.dev71.dist-info/RECORD,,