ignore publish version code hash when using hot reloading, use fixture for opensearch test to avoid resource leak

dfangl · dfangl · commit 355c2bdf4a6e · 2023-03-29T16:40:15.000+02:00
diff --git a/localstack/services/awslambda/provider.py b/localstack/services/awslambda/provider.py
@@ -385,7 +385,11 @@ def _create_version_model(
                 Type="User",
             )
         current_hash = current_latest_version.config.code.code_sha256
-        if code_sha256 and current_hash != code_sha256:
+        if (
+            code_sha256
+            and current_hash != code_sha256
+            and not current_latest_version.config.code.is_hot_reloading()
+        ):
             raise InvalidParameterValueException(
                 f"CodeSHA256 ({code_sha256}) is different from current CodeSHA256 in $LATEST ({current_hash}). Please try again with the CodeSHA256 in $LATEST.",
                 Type="User",
diff --git a/tests/integration/awslambda/test_lambda_developer_tools.py b/tests/integration/awslambda/test_lambda_developer_tools.py
@@ -98,6 +98,39 @@ def test_hot_reloading(
         assert response_dict["counter"] == 1
         assert response_dict["constant"] == "value2"
 
+    def test_hot_reloading_publish_version(
+        self,
+        create_lambda_function_aws,
+        lambda_client,
+        lambda_su_role,
+        cleanups,
+    ):
+        """
+        Test if publish version code sha256s are ignored when using hot-reload (cannot be matched anyways)
+        Serverless, for example, will hash the code before publishing on the client side, which can brick the publish
+        version operation
+        """
+
+        function_name = f"test-hot-reloading-{short_uid()}"
+        hot_reloading_bucket = config.BUCKET_MARKER_LOCAL
+        tmp_path = config.dirs.tmp
+        hot_reloading_dir_path = os.path.join(tmp_path, f"hot-reload-{short_uid()}")
+        mkdir(hot_reloading_dir_path)
+        cleanups.append(lambda: rm_rf(hot_reloading_dir_path))
+        function_content = load_file(HOT_RELOADING_NODEJS_HANDLER)
+        with open(os.path.join(hot_reloading_dir_path, "handler.mjs"), mode="wt") as f:
+            f.write(function_content)
+
+        mount_path = get_host_path_for_path_in_docker(hot_reloading_dir_path)
+        create_lambda_function_aws(
+            FunctionName=function_name,
+            Handler="handler.handler",
+            Code={"S3Bucket": hot_reloading_bucket, "S3Key": mount_path},
+            Role=lambda_su_role,
+            Runtime=Runtime.nodejs18_x,
+        )
+        lambda_client.publish_version(FunctionName=function_name, CodeSha256="zipfilehash")
+
 
 @pytest.mark.skipif(condition=is_old_provider(), reason="Focussing on the new provider")
 class TestDockerFlags:
diff --git a/tests/integration/test_firehose.py b/tests/integration/test_firehose.py
@@ -240,6 +240,7 @@ def test_kinesis_firehose_incompatible_with_opensearch_2_3(
         self,
         firehose_client,
         opensearch_client,
+        opensearch_create_domain,
         kinesis_client,
         kinesis_create_stream,
     ):
@@ -250,10 +251,10 @@ def test_kinesis_firehose_incompatible_with_opensearch_2_3(
         bucket_arn = "arn:aws:s3:::foo"
         delivery_stream_name = f"test-delivery-stream-{short_uid()}"
 
-        opensearch_create_response = opensearch_client.create_domain(
-            DomainName=domain_name, EngineVersion="OpenSearch_2.3"
-        )
-        opensearch_arn = opensearch_create_response["DomainStatus"]["ARN"]
+        opensearch_create_domain(DomainName=domain_name, EngineVersion="OpenSearch_2.3")
+        opensearch_arn = opensearch_client.describe_domain(DomainName=domain_name)["DomainStatus"][
+            "ARN"
+        ]
 
         # create kinesis stream
         kinesis_create_stream(StreamName=stream_name, ShardCount=2)
