[python_lambda] simplify installation of datadog_lambda

Author: florentinl

utils/build/build.sh

@@ -217,10 +217,6 @@ build() {
 
                 DOCKERFILE=utils/build/docker/${TEST_LIBRARY}/${WEBLOG_VARIANT}.Dockerfile
 
-                if [[ $TEST_LIBRARY == python_lambda ]]; then
-                    ./utils/build/docker/python_lambda/build_lambda_layer.sh
-                fi
-
                 docker buildx build \
                     --build-arg BUILDKIT_INLINE_CACHE=1 \
                     --load \

utils/build/docker/python_lambda/apigw-rest.Dockerfile

@@ -1,13 +1,13 @@
 FROM public.ecr.aws/lambda/python:3.13
 
-RUN dnf install -y unzip
+RUN dnf install -y unzip findutils
 
 # Add the Datadog Extension
 RUN mkdir -p /opt/extensions
 COPY --from=public.ecr.aws/datadog/lambda-extension:latest /opt/. /opt/
 
-COPY binaries/* /binaries/
-RUN unzip /binaries/*.zip -d /opt
+COPY utils/build/docker/python_lambda/install_datadog_lambda.sh binaries* /binaries/
+RUN /binaries/install_datadog_lambda.sh
 
 # Setup the aws_lambda handler
 COPY utils/build/docker/python_lambda/function/. ${LAMBDA_TASK_ROOT}

utils/build/docker/python_lambda/build_lambda_layer.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -eu
+
+cd /binaries
+
+if [ "$(find . -maxdepth 1 -name "*.zip" | wc -l)" = "1" ]; then
+    path=$(readlink -f "$(find . -maxdepth 1 -name "*.zip")")
+    echo "Install datadog_lambda from ${path}"
+    unzip "${path}" -d /opt
+else
+    echo "Fetching from latest GitHub release"
+    curl -fsSLO https://github.com/DataDog/datadog-lambda-python/releases/latest/download/datadog_lambda_py-amd64-3.13.zip
+
+    if [ ! -f datadog_lambda_py-amd64-3.13.zip ]; then
+        echo "Failed to download datadog_lambda_py-amd64-3.13.zip"
+        exit 1
+    fi
+fi

utils/build/docker/python_lambda/install_datadog_lambda.sh

@@ -297,10 +297,16 @@ elif [ "$TARGET" = "waf_rule_set" ]; then
         -H "Accept: application/vnd.github.v3.raw" \
         https://api.github.com/repos/DataDog/appsec-event-rules/contents/build/recommended.json
 elif [ "$TARGET" = "python_lambda" ]; then
-    assert_version_is_dev
     assert_target_branch_is_not_set
 
-    get_github_action_artifact "DataDog/datadog-lambda-python" "build_layer.yml" "main" "datadog-lambda-python-3.13-amd64" "datadog_lambda_py-amd64-3.13.zip"
+    if [ $VERSION = 'dev' ]; then
+        get_github_action_artifact "DataDog/datadog-lambda-python" "build_layer.yml" "main" "datadog-lambda-python-3.13-amd64" "datadog_lambda_py-amd64-3.13.zip"
+    elif [ $VERSION = 'prod' ]; then
+        get_github_release_asset "DataDog/datadog-lambda-python" "datadog_lambda_py-amd64-3.13.zip"
+    else
+        echo "Don't know how to load version $VERSION for $TARGET"
+        exit 1
+    fi
 
 else
     echo "Unknown target: $1"