Merge branch 'develop' into dependabot/pip/develop/black-26.5.1

valerena · web-flow · commit 58bf46a01738 · 2026-06-23T17:51:51.000-07:00
diff --git a/.github/workflows/sync-to-mirror-repo.yml b/.github/workflows/sync-to-mirror-repo.yml
diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -16,7 +16,7 @@ if [ "$python_version" = "" ]; then
 fi
 
 if [ "$openssl_version" = "" ]; then
-    openssl_version="3.3.3";
+    openssl_version="3.3.7";
 fi
 
 if [ "$zlib_version" = "" ]; then
@@ -38,7 +38,7 @@ fi
 
 set -eux
 
-yum install -y libffi-devel perl-IPC-Cmd
+yum install -y libffi-devel perl-IPC-Cmd perl-Time-Piece
 
 echo "Making Folders"
 mkdir -p .build/src
diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh
@@ -30,7 +30,7 @@ if [ "$python_library_zip_filename" = "" ]; then
 fi
 
 if [ "$openssl_version" = "" ]; then
-    openssl_version="3.3.1";
+    openssl_version="3.3.7";
 fi
 
 if [ "$python_version" = "" ]; then
diff --git a/pyproject.toml b/pyproject.toml
@@ -81,7 +81,7 @@ dev = [
     "types-docutils==0.22.3.20260518",
     "types-jsonschema==4.26.0.20260508",
     "types-pyOpenSSL==24.1.0.20240722",
-    "types-requests==2.33.0.20260513",
+    "types-requests==2.33.0.20260518",
     "types-urllib3==1.26.25.14",
     "pytest==9.0.3",
     "parameterized==0.9.0",
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -196,9 +196,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.51.4 \
-    --hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
-    --hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
+cfn-lint==1.51.5 \
+    --hash=sha256:018a00f1f9eeadc196afbdc0ac8c6221c29411747c8dcff2f431d48d4080c83b \
+    --hash=sha256:e17c11a1485a2586c5ddf48d0041f8fa3da3038612fd7dbc559ec87935f53452
     # via aws-sam-cli (pyproject.toml)
 charset-normalizer==3.4.7 \
     --hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
@@ -196,9 +196,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.51.4 \
-    --hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
-    --hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
+cfn-lint==1.51.5 \
+    --hash=sha256:018a00f1f9eeadc196afbdc0ac8c6221c29411747c8dcff2f431d48d4080c83b \
+    --hash=sha256:e17c11a1485a2586c5ddf48d0041f8fa3da3038612fd7dbc559ec87935f53452
     # via aws-sam-cli (pyproject.toml)
 charset-normalizer==3.4.7 \
     --hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \
diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt
@@ -196,9 +196,9 @@ cffi==2.0.0 \
     --hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
     --hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
     # via cryptography
-cfn-lint==1.51.4 \
-    --hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
-    --hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
+cfn-lint==1.51.5 \
+    --hash=sha256:018a00f1f9eeadc196afbdc0ac8c6221c29411747c8dcff2f431d48d4080c83b \
+    --hash=sha256:e17c11a1485a2586c5ddf48d0041f8fa3da3038612fd7dbc559ec87935f53452
     # via aws-sam-cli (pyproject.toml)
 charset-normalizer==3.4.7 \
     --hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \
diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.161.1"
+__version__ = "1.162.1"
diff --git a/samcli/runtime_config.json b/samcli/runtime_config.json
@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "c7285973a74a5b4d8008f30a8781ee69af8c949d"
+    "app_template_repo_commit": "80d473d44a1bbf346f7f902d79fef40c4743a312"
 }
diff --git a/tests/integration/testdata/buildcmd/terraform/image_based_lambda_functions_local_backend/hello_world/Dockerfile b/tests/integration/testdata/buildcmd/terraform/image_based_lambda_functions_local_backend/hello_world/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/golang:1.16 as build-image
+FROM public.ecr.aws/docker/library/golang:1.16 as build-image
 
 RUN go env -w GOPROXY=direct
 
diff --git a/tests/integration/testdata/buildcmd/terraform/image_based_lambda_functions_s3_backend/hello_world/Dockerfile b/tests/integration/testdata/buildcmd/terraform/image_based_lambda_functions_s3_backend/hello_world/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/golang:1.16 as build-image
+FROM public.ecr.aws/docker/library/golang:1.16 as build-image
 
 RUN go env -w GOPROXY=direct
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "app_template_repo_commit": "c7285973a74a5b4d8008f30a8781ee69af8c949d"`
	`2`	`+ "app_template_repo_commit": "80d473d44a1bbf346f7f902d79fef40c4743a312"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM public.ecr.aws/bitnami/golang:1.16 as build-image`
	`1`	`+FROM public.ecr.aws/docker/library/golang:1.16 as build-image`
`2`	`2`
`3`	`3`	`RUN go env -w GOPROXY=direct`
`4`	`4`