diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05062447..1a00783c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - "main" + - "christophe-papazian/system-tests-for-incident-46261" pull_request: schedule: - cron: '0 0,12 * * *' # Runs every day at midnight and noon utc diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml index 7368a517..8008c41f 100644 --- a/.github/workflows/build_layer.yml +++ b/.github/workflows/build_layer.yml @@ -5,6 +5,7 @@ on: push: branches: - "main" + - "christophe-papazian/system-tests-for-incident-46261" jobs: build: diff --git a/datadog_lambda/asm.py b/datadog_lambda/asm.py index 6c65a946..29648021 100644 --- a/datadog_lambda/asm.py +++ b/datadog_lambda/asm.py @@ -223,7 +223,9 @@ def get_asm_blocked_response( content = "" else: content_type = blocked.get("content-type", "application/json") - content = http_utils._get_blocked_template(content_type) + content = http_utils._get_blocked_template( + content_type, blocked.get("block_id", "default") + ) response = { "statusCode": blocked.get("status_code", 403), diff --git a/pyproject.toml b/pyproject.toml index 2c59df99..107c4a21 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ classifiers = [ python = ">=3.8.0,<4" datadog = ">=0.51.0,<1.0.0" wrapt = "^1.11.2" -ddtrace = ">=3.16.2,<4" +ddtrace = {git = "https://github.com/DataDog/dd-trace-py.git", branch = "3.19"} ujson = ">=5.9.0" botocore = { version = "^1.34.0", optional = true } requests = { version ="^2.22.0", optional = true }