Merge from aws/aws-sam-cli/develop

requirements/base.txt

@@ -5,15 +5,15 @@ boto3>=1.29.2,<2
 jmespath~=1.0.1
 ruamel_yaml~=0.18.6
 PyYAML~=6.0,>=6.0.1
-cookiecutter~=2.5.0
+cookiecutter~=2.6.0
 aws-sam-translator==1.85.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.0.0
 dateparser~=1.2
 requests~=2.31.0
-aws_lambda_builders==1.46.0
+aws_lambda_builders==1.47.0
 tomlkit==0.12.3
-watchdog==3.0.0
+watchdog==4.0.0
 rich~=13.7.0
 pyopenssl~=24.0.0
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
@@ -28,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=0.85.1
+cfn-lint~=0.85.2
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.43
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.52

requirements/dev.txt

@@ -1,6 +1,6 @@
 -r pre-dev.txt
 
-coverage==7.4.1
+coverage==7.4.3
 pytest-cov==4.1.0
 
 
@@ -12,19 +12,19 @@ types-pywin32==306.0.0.20240130
 types-PyYAML==6.0.12.12
 types-chevron==0.14.2.20240106
 types-psutil==5.9.5.20240205
-types-setuptools==69.1.0.20240215
+types-setuptools==69.1.0.20240229
 types-Pygments==2.17.0.20240106 
 types-colorama==0.4.15.20240205
 types-dateparser==1.1.4.20240106
-types-docutils==0.20.0.20240201
+types-docutils==0.20.0.20240227
 types-jsonschema==4.21.0.20240118
-types-pyOpenSSL==24.0.0.20240130
+types-pyOpenSSL==24.0.0.20240228
 # as of types-requests>=2.31.0.7, this now requires `urllib3>2`, pin we are able to upgrade
 types-requests==2.31.0.6
 types-urllib3==1.26.25.14
 
 # Test requirements
-pytest~=8.0.0
+pytest~=8.0.1
 parameterized==0.9.0
 pytest-xdist==3.5.0
 pytest-forked==1.6.0

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.2.1
+ruff==0.2.2

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==69.1.0
+setuptools==69.1.1
 pyinstaller==6.4.0

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.110.0"
+__version__ = "1.111.0"

samcli/local/docker/container.py

@@ -402,7 +402,7 @@ def wait_for_http_response(self, name, event, stdout) -> Tuple[Union[str, bytes]
 
         try:
             # if response is an image then json.loads/dumps will throw a UnicodeDecodeError so return raw content
-            if "image" in resp.headers["Content-Type"]:
+            if resp.headers.get("Content-Type") and "image" in resp.headers["Content-Type"]:
                 return resp.content, True
             return json.dumps(json.loads(resp.content), ensure_ascii=False), False
         except json.JSONDecodeError:

tests/integration/buildcmd/test_build_cmd.py

@@ -137,6 +137,9 @@ def test_with_default_requirements(self, runtime, use_container):
         ]
     )
     def test_with_dockerfile_extension(self, runtime, use_container):
+        if not runtime_supported_by_docker(f"python{runtime}") and IS_WINDOWS:
+            self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG)
+
         _tag = uuid4().hex
         overrides = {
             "Runtime": runtime,
@@ -1230,6 +1233,9 @@ def test_dotnet_in_process(self, runtime, code_uri, mode, architecture="x86_64")
         command_result = run_command(cmdlist, cwd=self.working_dir, env=newenv)
         self.assertEqual(command_result.process.returncode, 0)
 
+        if not runtime_supported_by_docker(runtime) and IS_WINDOWS:
+            self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG)
+
         self._verify_built_artifact(
             self.default_build_dir,
             self.FUNCTION_LOGICAL_ID,
@@ -1280,6 +1286,9 @@ def test_dotnet_in_process(self, runtime, code_uri, mode, architecture="x86_64")
     )
     @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
     def test_dotnet_in_container_mount_with_write_explicit(self, runtime, code_uri, mode, architecture="x86_64"):
+        if not runtime_supported_by_docker(runtime) and IS_WINDOWS:
+            self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG)
+
         overrides = {
             "Runtime": runtime,
             "CodeUri": code_uri,
@@ -1360,6 +1369,9 @@ def test_dotnet_in_container_mount_with_write_interactive(
         mode,
         architecture="x86_64",
     ):
+        if not runtime_supported_by_docker(runtime) and IS_WINDOWS:
+            self.skipTest(RUNTIME_NOT_SUPPORTED_BY_DOCKER_MSG)
+
         overrides = {
             "Runtime": runtime,
             "CodeUri": code_uri,