From 3e3ae659342d9224ad2ff308406bad26a154d1c9 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sat, 3 Jun 2023 23:27:28 +0200 Subject: [PATCH 01/13] add github action for e2e --- .github/workflows/run-e2e-tests.yml | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/run-e2e-tests.yml diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml new file mode 100644 index 000000000..7f9296982 --- /dev/null +++ b/.github/workflows/run-e2e-tests.yml @@ -0,0 +1,47 @@ +name: Run end-to-end tests + +on: + workflow_dispatch: + + push: + branches: [master, e2e-tests-github] + paths: # add other modules when there are under e2e tests + - 'powertools-e2e-tests/**' + - 'powertools-core/**' + - 'powertools-serialization/**' + - 'powertools-logging/**' + - 'powertools-tracing/**' + - 'powertools-idempotency/**' + - 'powertools-metrics/**' + - 'pom.xml' + - '.github/workflows/**' + +jobs: + e2e: + runs-on: ubuntu-latest + strategy: + max-parallel: 2 + matrix: + java: [ 8, 11, 17 ] + name: End-to-end tests ${{ matrix.java }} + env: + JAVA_VERSION: ${{ matrix.java }} + AWS_DEFAULT_REGION: eu-west-1 + permissions: + id-token: write # needed to interact with GitHub's OIDC Token endpoint. + contents: read + steps: + - uses: actions/checkout@v3 + - name: Setup java + uses: actions/setup-java@v2 + with: + distribution: 'corretto' + java-version: ${{ matrix.java }} + cache: maven + - name: Setup AWS credentials + uses: aws-actions/configure-aws-credentials@v1.6.1 + with: + role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }} + aws-region: ${{ env.AWS_DEFAULT_REGION }} + - name: Run e2e test with Maven + run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file From 9dff5d0bb04e32fdbfc434c2021b6023476ece0f Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sat, 3 Jun 2023 23:32:04 +0200 Subject: [PATCH 02/13] java config --- .github/workflows/run-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 7f9296982..6d3e4329a 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -22,7 +22,7 @@ jobs: strategy: max-parallel: 2 matrix: - java: [ 8, 11, 17 ] + java: [ 8, 11 ] name: End-to-end tests ${{ matrix.java }} env: JAVA_VERSION: ${{ matrix.java }} @@ -33,7 +33,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'corretto' java-version: ${{ matrix.java }} From 888cb4e01f3122137c0983661e0c650416269949 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sat, 3 Jun 2023 23:40:24 +0200 Subject: [PATCH 03/13] java version --- .github/workflows/run-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 6d3e4329a..0de7da264 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -44,4 +44,4 @@ jobs: role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }} aws-region: ${{ env.AWS_DEFAULT_REGION }} - name: Run e2e test with Maven - run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file + run: export JAVA_VERSION=${{ matrix.java }} && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file From 5583506733c85a0e209900c41e980f14a02c9591 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sat, 3 Jun 2023 23:49:42 +0200 Subject: [PATCH 04/13] logback version 1.3 compatible jdk8 --- pom.xml | 2 +- powertools-e2e-tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 69c17e963..6556e0d94 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ ch.qos.logback logback-classic - 1.4.7 + 1.3.4 test diff --git a/powertools-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml index 7fa2a40a6..8340e59f6 100644 --- a/powertools-e2e-tests/pom.xml +++ b/powertools-e2e-tests/pom.xml @@ -29,7 +29,7 @@ ch.qos.logback logback-classic - 1.4.7 + 1.3.4 From 100f73e959e3e8784595e33ac34d66d600e4d227 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sun, 4 Jun 2023 22:29:14 +0200 Subject: [PATCH 05/13] random name for ddb table --- .../software/amazon/lambda/powertools/IdempotencyE2ET.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/IdempotencyE2ET.java b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/IdempotencyE2ET.java index 4133f986f..6923c3caa 100644 --- a/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/IdempotencyE2ET.java +++ b/powertools-e2e-tests/src/test/java/software/amazon/lambda/powertools/IdempotencyE2ET.java @@ -10,6 +10,7 @@ import java.time.Year; import java.util.Collections; +import java.util.UUID; import java.util.concurrent.TimeUnit; import static software.amazon.lambda.powertools.testutils.lambda.LambdaInvoker.invokeFunction; @@ -21,11 +22,12 @@ public class IdempotencyE2ET { @BeforeAll @Timeout(value = 5, unit = TimeUnit.MINUTES) public static void setup() { + String random = UUID.randomUUID().toString().substring(0, 6); infrastructure = Infrastructure.builder() .testName(IdempotencyE2ET.class.getSimpleName()) .pathToFunction("idempotency") - .idempotencyTable("idempo") - .environmentVariables(Collections.singletonMap("IDEMPOTENCY_TABLE", "idempo")) + .idempotencyTable("idempo" + random) + .environmentVariables(Collections.singletonMap("IDEMPOTENCY_TABLE", "idempo" + random)) .build(); functionName = infrastructure.deploy(); } From 25affe0ea2073546beede8cd293ec1415421b40d Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sun, 4 Jun 2023 23:23:13 +0200 Subject: [PATCH 06/13] run e2e just on master --- .github/workflows/run-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 0de7da264..5872af17d 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: - branches: [master, e2e-tests-github] + branches: [master] paths: # add other modules when there are under e2e tests - 'powertools-e2e-tests/**' - 'powertools-core/**' From 958f7dfd7ce5ef09249d0a3e6d1df4e3cea7900b Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Mon, 5 Jun 2023 10:14:11 +0200 Subject: [PATCH 07/13] use github env --- .github/workflows/run-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 5872af17d..8c0cfbe88 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -23,7 +23,7 @@ jobs: max-parallel: 2 matrix: java: [ 8, 11 ] - name: End-to-end tests ${{ matrix.java }} + name: End-to-end tests java${{ matrix.java }} env: JAVA_VERSION: ${{ matrix.java }} AWS_DEFAULT_REGION: eu-west-1 @@ -44,4 +44,4 @@ jobs: role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }} aws-region: ${{ env.AWS_DEFAULT_REGION }} - name: Run e2e test with Maven - run: export JAVA_VERSION=${{ matrix.java }} && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file + run: mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml \ No newline at end of file From ec6d71cad438c728c1e5e95c814213b29913fc1d Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Mon, 5 Jun 2023 14:38:47 +0200 Subject: [PATCH 08/13] add java 17 to the e2e --- .github/workflows/run-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 8c0cfbe88..6850976e8 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -20,9 +20,9 @@ jobs: e2e: runs-on: ubuntu-latest strategy: - max-parallel: 2 + max-parallel: 3 matrix: - java: [ 8, 11 ] + java: [ 8, 11, 17 ] name: End-to-end tests java${{ matrix.java }} env: JAVA_VERSION: ${{ matrix.java }} From ff834d2e3cb98788a074fb70caaa205aaf6ae415 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Mon, 5 Jun 2023 15:13:03 +0200 Subject: [PATCH 09/13] logback 1.3.7 --- pom.xml | 2 +- powertools-e2e-tests/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6556e0d94..cfaf6c3d8 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ ch.qos.logback logback-classic - 1.3.4 + 1.3.7 test diff --git a/powertools-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml index 8340e59f6..e901648a8 100644 --- a/powertools-e2e-tests/pom.xml +++ b/powertools-e2e-tests/pom.xml @@ -29,7 +29,7 @@ ch.qos.logback logback-classic - 1.3.4 + 1.3.7 From d24b250c53672939d5c19d3cb0e2eb97608032ec Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Wed, 7 Jun 2023 17:00:49 +0200 Subject: [PATCH 10/13] adding parameters e2e tests --- .github/workflows/run-e2e-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 6850976e8..823094e1a 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -12,6 +12,7 @@ on: - 'powertools-logging/**' - 'powertools-tracing/**' - 'powertools-idempotency/**' + - 'powertools-parameters/**' - 'powertools-metrics/**' - 'pom.xml' - '.github/workflows/**' From 567935e4531ef182f1c6a4f7c7f15bed49d0eb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Van=20Der=20Linden?= <117538+jeromevdl@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:02:02 +0200 Subject: [PATCH 11/13] change master to main --- .github/workflows/run-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 823094e1a..2d9324ef0 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: - branches: [master] + branches: [main] paths: # add other modules when there are under e2e tests - 'powertools-e2e-tests/**' - 'powertools-core/**' From cb4c7daa534b620b439de51bb1d88978a284e1ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Van=20Der=20Linden?= <117538+jeromevdl@users.noreply.github.com> Date: Tue, 20 Jun 2023 15:02:02 +0200 Subject: [PATCH 12/13] Update pom.xml 1.3.8 released on June 13th --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index daa40f823..9dc280464 100644 --- a/pom.xml +++ b/pom.xml @@ -286,7 +286,7 @@ ch.qos.logback logback-classic - 1.3.7 + 1.3.8 test From dd30d2feedeedfb37417fd3696c49519e530abb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Van=20Der=20Linden?= <117538+jeromevdl@users.noreply.github.com> Date: Tue, 20 Jun 2023 16:28:46 +0200 Subject: [PATCH 13/13] Update powertools-e2e-tests/pom.xml --- powertools-e2e-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powertools-e2e-tests/pom.xml b/powertools-e2e-tests/pom.xml index 6ead1324b..eae7d4a22 100644 --- a/powertools-e2e-tests/pom.xml +++ b/powertools-e2e-tests/pom.xml @@ -29,7 +29,7 @@ ch.qos.logback logback-classic - 1.3.7 + 1.3.8