From d27c71ecd7b962f14957ace66ba43b78ba7969c6 Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 14:46:04 -0400 Subject: [PATCH 1/5] initial commit --- .github/workflows/system-tests.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index fe9c6c37571..125e50c65fc 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -188,6 +188,22 @@ jobs: - APPSEC_BLOCKING_FULL_DENYLIST - APPSEC_REQUEST_BLOCKING include: + - library: ruby + app: rack + scenario: INTEGRATIONS + env: + AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }} + AWS_REGION: us-east-1 + AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` + - library: ruby + app: rack + scenario: CROSSED_TRACING_LIBRARIES + env: + AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }} + AWS_REGION: us-east-1 + AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - library: ruby app: rack scenario: REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD From aea6cd817ce268c785eced88e3ffc20a5745de0d Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 14:52:37 -0400 Subject: [PATCH 2/5] use test branch --- .github/workflows/system-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index 125e50c65fc..60bbf9a9672 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -11,7 +11,7 @@ on: env: REGISTRY: ghcr.io REPO: ghcr.io/datadog/dd-trace-rb - ST_REF: main + ST_REF: conti/fix-php-errors # delete later FORCE_TESTS: -F tests/appsec/waf/test_addresses.py::Test_GraphQL -F tests/appsec/test_blocking_addresses.py::Test_BlockingGraphqlResolvers FORCE_TESTS_SCENARIO: GRAPHQL_APPSEC From 23692506bb9291c49f226ced987d19003477f68f Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 15:51:53 -0400 Subject: [PATCH 3/5] re run --- .github/workflows/system-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index 60bbf9a9672..1288048abe2 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -192,16 +192,16 @@ jobs: app: rack scenario: INTEGRATIONS env: - AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }} AWS_REGION: us-east-1 AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - library: ruby app: rack scenario: CROSSED_TRACING_LIBRARIES env: - AWS_ACCESS_KEY_ID: ${{ secrets.IDM_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.IDM_AWS_SECRET_ACCESS_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }} AWS_REGION: us-east-1 AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - library: ruby From 1286bfb58a13a818dfcc97afdbee618e354bfe7f Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 15:54:35 -0400 Subject: [PATCH 4/5] fix again --- .github/workflows/system-tests.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index 1288048abe2..d9d974721b6 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -191,19 +191,9 @@ jobs: - library: ruby app: rack scenario: INTEGRATIONS - env: - AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }} - AWS_REGION: us-east-1 - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - library: ruby app: rack scenario: CROSSED_TRACING_LIBRARIES - env: - AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }} - AWS_REGION: us-east-1 - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - library: ruby app: rack scenario: REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD @@ -300,6 +290,10 @@ jobs: ./run.sh ++docker ${{ matrix.scenario }} ${{matrix.scenario == env.FORCE_TESTS_SCENARIO && env.FORCE_TESTS || ''}} env: DD_API_KEY: ${{ secrets.DD_APPSEC_SYSTEM_TESTS_API_KEY }} + AWS_ACCESS_KEY_ID: ${{ secrets.SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY }} + AWS_REGION: us-east-1 + AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - name: Archive logs uses: actions/upload-artifact@v4 if: ${{ always() }} From 8e76cd7fa752e41723eee5c275350d4e6835ead3 Mon Sep 17 00:00:00 2001 From: William Conti <58711692+wconti27@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:20:13 -0400 Subject: [PATCH 5/5] Update .github/workflows/system-tests.yml --- .github/workflows/system-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml index d9d974721b6..5a58e401e51 100644 --- a/.github/workflows/system-tests.yml +++ b/.github/workflows/system-tests.yml @@ -11,7 +11,7 @@ on: env: REGISTRY: ghcr.io REPO: ghcr.io/datadog/dd-trace-rb - ST_REF: conti/fix-php-errors # delete later + ST_REF: main FORCE_TESTS: -F tests/appsec/waf/test_addresses.py::Test_GraphQL -F tests/appsec/test_blocking_addresses.py::Test_BlockingGraphqlResolvers FORCE_TESTS_SCENARIO: GRAPHQL_APPSEC