Skip to content

Commit 44a2bd2

Browse files
jeromevdljeromevdl
committed
merge v2 in branch
2 parents 3b52fb7 + a5c22c4 commit 44a2bd2

File tree

97 files changed

+3068
-1582
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3068
-1582
lines changed

‎.github/dependabot.yml

+9
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,12 @@ updates:
1111
# Ignore Mockito 5.X.X as it does not support Java 8
1212
- dependency-name: "org.mockito:mockito-*"
1313
update-types: ["version-update:semver-major"]
14+
15+
- package-ecosystem: "maven"
16+
directory: "/"
17+
target-branch: "v2"
18+
schedule:
19+
interval: "weekly"
20+
labels:
21+
- "maven"
22+
- "dependencies"

‎.github/workflows/pr_artifacts_size.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
jobs:
2828
codecheck:
2929
runs-on: ubuntu-latest
30+
permissions:
31+
pull-requests: write
32+
issues: read
3033
steps:
3134
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
3235
- name: Setup java JDK 11
@@ -62,4 +65,4 @@ jobs:
6265
comment-id: ${{ steps.find-comment.outputs.comment-id }}
6366
issue-number: ${{ github.event.pull_request.number }}
6467
body-path: 'report.md'
65-
edit-mode: replace
68+
edit-mode: replace

‎.github/workflows/pr_build.yml

+9-39
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- v2
87
paths:
98
- 'powertools-batch/**'
109
- 'powertools-cloudformation/**'
11-
- 'powertools-core/**' # not in v2
12-
- 'powertools-common/**' # v2 only
10+
- 'powertools-core/**'
1311
- 'powertools-e2e-tests/**'
1412
- 'powertools-idempotency/**'
1513
- 'powertools-large-messages/**'
1614
- 'powertools-logging/**'
1715
- 'powertools-metrics/**'
1816
- 'powertools-parameters/**'
1917
- 'powertools-serialization/**'
18+
- 'powertools-sqs/**'
19+
- 'powertools-test-suite/**'
2020
- 'powertools-tracing/**'
2121
- 'powertools-validation/**'
2222
- 'examples/**'
@@ -26,18 +26,19 @@ on:
2626
push:
2727
branches:
2828
- main
29-
- v2
3029
paths:
3130
- 'powertools-batch/**'
3231
- 'powertools-cloudformation/**'
3332
- 'powertools-core/**'
3433
- 'powertools-e2e-tests/**'
3534
- 'powertools-idempotency/**'
3635
- 'powertools-large-messages/**'
36+
- 'powertools-logging/**'
3737
- 'powertools-metrics/**'
3838
- 'powertools-parameters/**'
3939
- 'powertools-serialization/**'
4040
- 'powertools-sqs/**'
41+
- 'powertools-test-suite/**'
4142
- 'powertools-tracing/**'
4243
- 'powertools-validation/**'
4344
- 'examples/**'
@@ -67,46 +68,15 @@ jobs:
6768
java-version: ${{ matrix.java }}
6869
cache: 'maven'
6970
- name: Build with Maven
70-
if: ${{ matrix.java == '8' }} # If 8 exclude the examples directory
71-
run: mvn -B install --file pom.xml -pl '!software.amazon.lambda.examples:powertools-examples-idempotency,!software.amazon.lambda.examples:powertools-examples-batch,!software.amazon.lambda.examples:powertools-examples-cloudformation,!software.amazon.lambda.examples:powertools-examples-core-utilities-cdk,!software.amazon.lambda.examples:powertools-examples-core-utilities-sam,!software.amazon.lambda.examples:powertools-examples-core-utilities-serverless,!software.amazon.lambda.examples:powertools-examples-core-utilities-terraform,!software.amazon.lambda.examples:powertools-examples-parameters,!software.amazon.lambda.examples:powertools-examples-serialization,!software.amazon.lambda.examples:powertools-examples-validation,!software.amazon.lambda.examples:cdk,!software.amazon.lambda:powertools-examples'
72-
- name: Build with Maven
73-
if: ${{ matrix.java != '8' }} # If not 8 don't exclude the examples directory
7471
run: mvn -B install --file pom.xml
7572
- name: Build Gradle Example - Java
76-
if: ${{ matrix.java != '8' }}
77-
working-directory: examples/powertools-examples-core-utilities/gradle
73+
if: ${{ matrix.java == '8' }} # Gradle example can only be built on Java 8
74+
working-directory: examples/powertools-examples-core/gradle
7875
run: ./gradlew build
7976
- name: Build Gradle Example - Kotlin
80-
if: ${{ matrix.java != '8' }}
81-
working-directory: examples/powertools-examples-core-utilities/kotlin
77+
if: ${{ matrix.java == '8' }} # Gradle example can only be built on Java 8
78+
working-directory: examples/powertools-examples-core/kotlin
8279
run: ./gradlew build
83-
- name: Setup Terraform
84-
if: ${{ matrix.java == '11' }}
85-
uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 #v2.0.3
86-
- name: Setup AWS credentials
87-
if: ${{ matrix.java == '11' }}
88-
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
89-
with:
90-
role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }}
91-
aws-region: ${{ env.AWS_REGION }}
92-
- name: Terraform validate
93-
working-directory: examples/powertools-examples-core-utilities/terraform
94-
if: ${{ matrix.java == '11' }}
95-
run: |
96-
terraform -version
97-
terraform init -backend=false
98-
terraform validate
99-
terraform plan
100-
- name: Setup Terraform lint
101-
if: ${{ matrix.java == '11' }}
102-
uses: terraform-linters/setup-tflint@a5a1af8c6551fb10c53f1cd4ba62359f1973746f # v3.1.1
103-
- name: Terraform lint
104-
working-directory: examples/powertools-examples-core-utilities/terraform
105-
if: ${{ matrix.java == '11' }}
106-
run: |
107-
tflint --version
108-
tflint --init
109-
tflint -f compact
11080
- name: Upload coverage to Codecov
11181
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
11282
if: ${{ matrix.java == '11' }} # publish results once

‎.github/workflows/pr_build_v2.yml

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Build
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- v2
7+
paths:
8+
- 'powertools-batch/**'
9+
- 'powertools-cloudformation/**'
10+
- 'powertools-common/**'
11+
- 'powertools-e2e-tests/**'
12+
- 'powertools-idempotency/**'
13+
- 'powertools-large-messages/**'
14+
- 'powertools-logging/**'
15+
- 'powertools-metrics/**'
16+
- 'powertools-parameters/**'
17+
- 'powertools-serialization/**'
18+
- 'powertools-tracing/**'
19+
- 'powertools-validation/**'
20+
- 'examples/**'
21+
- 'pom.xml'
22+
- 'examples/pom.xml'
23+
- '.github/workflows/**'
24+
push:
25+
branches:
26+
- v2
27+
paths:
28+
- 'powertools-batch/**'
29+
- 'powertools-cloudformation/**'
30+
- 'powertools-common/**'
31+
- 'powertools-e2e-tests/**'
32+
- 'powertools-idempotency/**'
33+
- 'powertools-large-messages/**'
34+
- 'powertools-logging/**'
35+
- 'powertools-metrics/**'
36+
- 'powertools-parameters/**'
37+
- 'powertools-serialization/**'
38+
- 'powertools-tracing/**'
39+
- 'powertools-validation/**'
40+
- 'examples/**'
41+
- 'pom.xml'
42+
- 'examples/pom.xml'
43+
- '.github/workflows/**'
44+
jobs:
45+
build-corretto:
46+
runs-on: ubuntu-latest
47+
strategy:
48+
max-parallel: 5
49+
matrix:
50+
java: [11, 17, 21]
51+
name: Java ${{ matrix.java }}
52+
env:
53+
JAVA: ${{ matrix.java }}
54+
AWS_REGION: eu-west-1
55+
permissions:
56+
id-token: write # needed to interact with GitHub's OIDC Token endpoint.
57+
contents: read
58+
steps:
59+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
60+
- name: Setup java
61+
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
62+
with:
63+
distribution: 'corretto'
64+
java-version: ${{ matrix.java }}
65+
cache: 'maven'
66+
- name: Build with Maven
67+
run: mvn -B install --file pom.xml
68+
- name: Build Gradle Example - Java
69+
working-directory: examples/powertools-examples-core-utilities/gradle
70+
run: ./gradlew build
71+
- name: Build Gradle Example - Kotlin
72+
working-directory: examples/powertools-examples-core-utilities/kotlin
73+
run: ./gradlew build
74+
- name: Upload coverage to Codecov
75+
uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
76+
if: ${{ matrix.java == '11' }} # publish results once
77+
with:
78+
files: ./powertools-cloudformation/target/site/jacoco/jacoco.xml,./powertools-core/target/site/jacoco/jacoco.xml,./powertools-idempotency/target/site/jacoco/jacoco.xml,./powertools-logging/target/site/jacoco/jacoco.xml,./powertools-metrics/target/site/jacoco/jacoco.xml,./powertools-parameters/target/site/jacoco/jacoco.xml,./powertools-serialization/target/site/jacoco/jacoco.xml,./powertools-sqs/target/site/jacoco/jacoco.xml,./powertools-tracing/target/site/jacoco/jacoco.xml,./powertools-validation/target/site/jacoco/jacoco.xml,./powertools-large-messages/target/site/jacoco/jacoco.xml,./powertools-batch/target/site/jacoco/jacoco.xml
79+
savepr:
80+
runs-on: ubuntu-latest
81+
name: Save PR number if running on PR by dependabot
82+
if: github.actor == 'dependabot[bot]'
83+
steps:
84+
- name: Create Directory and save issue
85+
run: |
86+
mkdir -p ./pr
87+
echo ${{ github.event.number }}
88+
echo ${{ github.event.number }} > ./pr/NR
89+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
90+
name: Upload artifact
91+
with:
92+
name: pr
93+
path: pr/

‎.github/workflows/pr_iac_lint.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Validate IaC
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- v2
8+
pull_request:
9+
branches:
10+
- main
11+
- v2
12+
paths:
13+
- 'examples/**'
14+
jobs:
15+
linter:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
project: ["sam", "gradle", "kotlin"]
20+
steps:
21+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
22+
- name: Setup java JDK
23+
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
24+
with:
25+
distribution: 'corretto'
26+
java-version: 11
27+
- name: Build Project
28+
working-directory: .
29+
run: |
30+
mvn install -DskipTests
31+
- name: Run SAM validator to check syntax of IaC templates - Java
32+
working-directory: examples/powertools-examples-core-utilities//${{ matrix.project }}
33+
run: |
34+
sam build
35+
sam validate --lint
36+
- name: Setup Terraform
37+
uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 #v2.0.3
38+
- name: Run Terraform validator to check syntax of IaC templates and produce a plan of changes
39+
working-directory: examples/powertools-examples-core-utilities/terraform
40+
run: |
41+
mvn install
42+
terraform -version
43+
terraform init -backend=false
44+
terraform validate
45+
- name: Setup Terraform lint
46+
uses: terraform-linters/setup-tflint@a5a1af8c6551fb10c53f1cd4ba62359f1973746f # v3.1.1
47+
- name: Run Terraform lint to check for best practices, errors, deprecated syntax etc.
48+
working-directory: examples/powertools-examples-core-utilities/terraform
49+
run: |
50+
tflint --version
51+
tflint --init
52+
tflint -f compact

‎.github/workflows/run-e2e-tests-v2.yml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Run end-to-end tests
2+
3+
on:
4+
workflow_dispatch:
5+
6+
push:
7+
branches:
8+
- v2
9+
paths: # add other modules when there are under e2e tests
10+
- 'powertools-e2e-tests/**'
11+
- 'powertools-batch/**'
12+
- 'powertools-core/**'
13+
- 'powertools-common/**'
14+
- 'powertools-idempotency/**'
15+
- 'powertools-large-message/**'
16+
- 'powertools-logging/**'
17+
- 'powertools-metrics/**'
18+
- 'powertools-parameters/**'
19+
- 'powertools-serialization/**'
20+
- 'powertools-tracing/**'
21+
- 'pom.xml'
22+
- '.github/workflows/**'
23+
24+
pull_request:
25+
branches:
26+
- v2
27+
paths:
28+
- 'powertools-e2e-tests/**'
29+
30+
jobs:
31+
e2e:
32+
runs-on: ubuntu-latest
33+
strategy:
34+
max-parallel: 4
35+
matrix:
36+
java: [ 11, 17, 21 ]
37+
name: End-to-end tests java${{ matrix.java }}
38+
env:
39+
AWS_DEFAULT_REGION: eu-west-1
40+
JAVA_VERSION: ${{ matrix.java }}
41+
permissions:
42+
id-token: write # needed to interact with GitHub's OIDC Token endpoint.
43+
contents: read
44+
steps:
45+
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
46+
- name: Setup java
47+
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
48+
with:
49+
distribution: 'corretto'
50+
java-version: ${{ matrix.java }}
51+
cache: maven
52+
- name: Setup AWS credentials
53+
uses: aws-actions/configure-aws-credentials@5fd3084fc36e372ff1fff382a39b10d03659f355 # v2.2.0
54+
with:
55+
role-to-assume: ${{ secrets.AWS_ROLE_ARN_TO_ASSUME }}
56+
aws-region: ${{ env.AWS_DEFAULT_REGION }}
57+
- name: Run e2e test with Maven
58+
run: mvn -DskipTests install --file pom.xml && mvn -Pe2e -B verify --file powertools-e2e-tests/pom.xml

‎.github/workflows/run-e2e-tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
push:
77
branches:
88
- main
9-
- v2
109
paths: # add other modules when there are under e2e tests
1110
- 'powertools-e2e-tests/**'
1211
- 'powertools-batch/**'

0 commit comments

Comments
 (0)