From b7c5fdab77c41361af7b5130256a2afdf2bc1488 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Wed, 31 May 2023 23:56:39 +0200
Subject: [PATCH] Move lambda package building to public.ecr.aws/lambda/python
 for compatibility

---
 tests/ci/lambda_shared_package/pyproject.toml         | 5 +++--
 tests/ci/team_keys_lambda/build_and_deploy_archive.sh | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/ci/lambda_shared_package/pyproject.toml b/tests/ci/lambda_shared_package/pyproject.toml
index bbf74cc0649..dff36b89fbb 100644
--- a/tests/ci/lambda_shared_package/pyproject.toml
+++ b/tests/ci/lambda_shared_package/pyproject.toml
@@ -6,13 +6,14 @@ build-backend = "setuptools.build_meta"
 name = "lambda_shared"
 version = "0.0.1"
 dependencies = [
-  "requests < 2.30",
+  "requests",
+  "urllib3 < 2"
 ]
 
 [project.optional-dependencies]
 token = [
   "PyJWT",
-  "cryptography<38",
+  "cryptography",
 ]
 dev = [
   "boto3",
diff --git a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
index 89a2d514965..02d5638cf18 100644
--- a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
+++ b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
@@ -12,7 +12,7 @@ DRY_RUN=${DRY_RUN:-}
 PY_VERSION=${PY_VERSION:-3.10}
 PY_EXEC="python${PY_VERSION}"
 # Image to build the lambda zip package
-DOCKER_IMAGE="python:${PY_VERSION}-slim"
+DOCKER_IMAGE="public.ecr.aws/lambda/python:${PY_VERSION}"
 # Rename the_lambda_name directory to the-lambda-name lambda in AWS
 LAMBDA_NAME=${DIR_NAME//_/-}
 # The name of directory with lambda code
@@ -23,9 +23,9 @@ cp app.py "$PACKAGE"
 if [ -f requirements.txt ]; then
   VENV=lambda-venv
   rm -rf "$VENV" lambda-package.zip
-  docker run --rm --user="${UID}" -e HOME=/tmp \
+  docker run --rm --user="${UID}" -e HOME=/tmp --entrypoint=/bin/bash \
     --volume="${WORKDIR}/..:/ci" --workdir="/ci/${DIR_NAME}" "${DOCKER_IMAGE}" \
-    /bin/bash -exc "
+    -exc "
       '$PY_EXEC' -m venv '$VENV' &&
       source '$VENV/bin/activate' &&
       pip install -r requirements.txt