From ebc32664399ac1dac65c6474cc82ef433adc3300 Mon Sep 17 00:00:00 2001 From: Pankaj Agrawal Date: Thu, 6 Jan 2022 16:48:22 +0100 Subject: [PATCH 1/4] chore: action to automate release prep --- .github/workflows/release-prep.yml | 44 +++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index a8de631b5..630601fc8 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -3,20 +3,50 @@ on: workflow_dispatch: inputs: targetRelease: - description: 'Release number to upgrade to. For example X.X.X' + description: 'Release number to upgrade to. For example X.X.X. Follow Semantic Versioning when deciding on next version.' required: true - previousRelease: - description: 'Current latest maven release' - required: false jobs: build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Find and Replace ${{ github.event.inputs.previousRelease }} with ${{ github.event.inputs.targetRelease }} + - name: Get current date + id: date + run: echo "::set-output name=date::$(date +'%Y-%m-%d')" + - name: Set current release version env variable + run: | + echo "CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} uses: jacobtomlinson/gha-find-replace@v2 with: - find: ${{ github.event.inputs.previousRelease }} + find: ${{ env.CURRENT_VERSION }} replace: ${{ github.event.inputs.targetRelease }} - regex: false \ No newline at end of file + regex: false + exclude: CHANGELOG.md + - name: Create changelog placeholder for ${{ github.event.inputs.targetRelease }} + uses: jacobtomlinson/gha-find-replace@v2 + with: + find: '## [Unreleased]' + replace: | + ## [Unreleased] + + ## [${{ github.event.inputs.targetRelease }}] - ${{ steps.date.outputs.date }} + + + + regex: false + include: CHANGELOG.md + - name: Create Release Pull Request + uses: peter-evans/create-pull-request@v3 + with: + commit-message: chore:prep release ${{ github.event.inputs.targetRelease }} + token: ${{ secrets.RELEASE }} + signoff: false + branch: prep-release-${{ github.event.inputs.targetRelease }} + delete-branch: true + title: chore:Prep release ${{ github.event.inputs.targetRelease }} + body: | + This is automated release prep. Remember to update [CHANGELOG.md](https://github.com/awslabs/aws-lambda-powertools-java/blob/prep-release-${{ github.event.inputs.targetRelease }}/CHANGELOG.md) to capture changes in this release. Please review changes carefully before merging. + + * [ ] Updated CHANGELOG.md \ No newline at end of file From bf500cf0a30e57ece7b0ba65deadadb24e7136c9 Mon Sep 17 00:00:00 2001 From: Pankaj Agrawal Date: Thu, 6 Jan 2022 20:00:42 +0100 Subject: [PATCH 2/4] chore(docs): externalise powertools version from docs to macros --- docs/Dockerfile | 2 +- docs/index.md | 12 ++++++------ docs/utilities/batch.md | 4 ++-- docs/utilities/custom_resources.md | 4 ++-- docs/utilities/parameters.md | 6 +++--- docs/utilities/sqs_large_message_handling.md | 4 ++-- docs/utilities/validation.md | 4 ++-- mkdocs.yml | 4 ++++ 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index 7bf267f4f..1524933ab 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -1,2 +1,2 @@ FROM squidfunk/mkdocs-material -RUN pip install mkdocs-git-revision-date-plugin +RUN pip install mkdocs-git-revision-date-plugin mkdocs-macros-plugin \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 86a638652..115edc566 100644 --- a/docs/index.md +++ b/docs/index.md @@ -46,17 +46,17 @@ For more information about the project and available options refer to this [repo software.amazon.lambda powertools-tracing - 1.10.1 + {{ powertools.version }} software.amazon.lambda powertools-logging - 1.10.1 + {{ powertools.version }} software.amazon.lambda powertools-metrics - 1.10.1 + {{ powertools.version }} ... @@ -114,9 +114,9 @@ For more information about the project and available options refer to this [repo } dependencies { - aspect 'software.amazon.lambda:powertools-logging:1.10.1' - aspect 'software.amazon.lambda:powertools-tracing:1.10.1' - aspect 'software.amazon.lambda:powertools-metrics:1.10.1' + aspect 'software.amazon.lambda:powertools-logging:{{ powertools.version }}' + aspect 'software.amazon.lambda:powertools-tracing:{{ powertools.version }}' + aspect 'software.amazon.lambda:powertools-metrics:{{ powertools.version }}' } ``` diff --git a/docs/utilities/batch.md b/docs/utilities/batch.md index 2fbfa73ae..ebb98b08b 100644 --- a/docs/utilities/batch.md +++ b/docs/utilities/batch.md @@ -32,7 +32,7 @@ To install this utility, add the following dependency to your project. software.amazon.lambda powertools-sqs - 1.10.1 + {{ powertools.version }} ... @@ -82,7 +82,7 @@ To install this utility, add the following dependency to your project. dependencies { ... - aspect 'software.amazon.lambda:powertools-sqs:1.10.1' + aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}' } ``` diff --git a/docs/utilities/custom_resources.md b/docs/utilities/custom_resources.md index 3bfd0ef8f..3cf75800f 100644 --- a/docs/utilities/custom_resources.md +++ b/docs/utilities/custom_resources.md @@ -24,7 +24,7 @@ To install this utility, add the following dependency to your project. software.amazon.lambda powertools-cloudformation - 1.10.1 + {{ powertools.version }} ``` @@ -33,7 +33,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { ... - implementation 'software.amazon.lambda:powertools-cloudformation:1.10.1' + implementation 'software.amazon.lambda:powertools-cloudformation:{{ powertools.version }}' } ``` diff --git a/docs/utilities/parameters.md b/docs/utilities/parameters.md index f020d785d..e2d0cb965 100644 --- a/docs/utilities/parameters.md +++ b/docs/utilities/parameters.md @@ -24,7 +24,7 @@ To install this utility, add the following dependency to your project. software.amazon.lambda powertools-parameters - 1.10.1 + {{ powertools.version }} ``` === "Gradle" @@ -32,7 +32,7 @@ To install this utility, add the following dependency to your project. ```groovy dependencies { ... - aspect 'software.amazon.lambda:powertools-parameters:1.10.1' + aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}' } ``` @@ -433,6 +433,6 @@ If you want to use the ```@Param``` annotation in your project add configuration dependencies { ... - aspect 'software.amazon.lambda:powertools-parameters:1.10.1' + aspect 'software.amazon.lambda:powertools-parameters:{{ powertools.version }}' } ``` \ No newline at end of file diff --git a/docs/utilities/sqs_large_message_handling.md b/docs/utilities/sqs_large_message_handling.md index cb0a0c323..95dc34e35 100644 --- a/docs/utilities/sqs_large_message_handling.md +++ b/docs/utilities/sqs_large_message_handling.md @@ -40,7 +40,7 @@ To install this utility, add the following dependency to your project. software.amazon.lambda powertools-sqs - 1.10.1 + {{ powertools.version }} ... @@ -90,7 +90,7 @@ To install this utility, add the following dependency to your project. dependencies { ... - aspect 'software.amazon.lambda:powertools-sqs:1.10.1' + aspect 'software.amazon.lambda:powertools-sqs:{{ powertools.version }}' } ``` diff --git a/docs/utilities/validation.md b/docs/utilities/validation.md index 526e7c265..862e668c0 100644 --- a/docs/utilities/validation.md +++ b/docs/utilities/validation.md @@ -22,7 +22,7 @@ To install this utility, add the following dependency to your project. com.amazonaws powertools-validation - 1.10.1 + {{ powertools.version }} ... @@ -71,7 +71,7 @@ To install this utility, add the following dependency to your project. } dependencies { - aspect 'software.amazon.lambda:powertools-validation:1.10.1' + aspect 'software.amazon.lambda:powertools-validation:{{ powertools.version }}' } ``` diff --git a/mkdocs.yml b/mkdocs.yml index c99bf7d47..6ab16052d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -65,6 +65,7 @@ copyright: Copyright © 2021 Amazon Web Services plugins: - git-revision-date - search + - macros extra_css: - stylesheets/extra.css @@ -72,6 +73,9 @@ extra_javascript: - javascript/aws-amplify.min.js - javascript/extra.js +extra: + powertools: + version: 1.10.1 repo_url: https://github.com/awslabs/aws-lambda-powertools-java edit_uri: edit/master/docs From d05c9915f7bb59241326f5c658241ab565966608 Mon Sep 17 00:00:00 2001 From: Pankaj Agrawal Date: Thu, 6 Jan 2022 20:12:13 +0100 Subject: [PATCH 3/4] chore: granular find and replace --- .github/workflows/release-prep.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-prep.yml b/.github/workflows/release-prep.yml index 630601fc8..8d0aa0579 100644 --- a/.github/workflows/release-prep.yml +++ b/.github/workflows/release-prep.yml @@ -17,13 +17,34 @@ jobs: - name: Set current release version env variable run: | echo "CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} + - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} in mkdocs.yml + uses: jacobtomlinson/gha-find-replace@v2 + with: + find: 'version: ${{ env.CURRENT_VERSION }}' + replace: 'version: ${{ github.event.inputs.targetRelease }}' + regex: false + include: "mkdocs.yml" + - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} in pom.xml + uses: jacobtomlinson/gha-find-replace@v2 + with: + find: ${{ env.CURRENT_VERSION }} + replace: ${{ github.event.inputs.targetRelease }} + regex: false + include: "**/*pom.xml" + - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} in build.gradle + uses: jacobtomlinson/gha-find-replace@v2 + with: + find: ${{ env.CURRENT_VERSION }} + replace: ${{ github.event.inputs.targetRelease }} + regex: false + include: "**/*build.gradle" + - name: Find and Replace ${{ env.CURRENT_VERSION }} with ${{ github.event.inputs.targetRelease }} in README.md uses: jacobtomlinson/gha-find-replace@v2 with: find: ${{ env.CURRENT_VERSION }} replace: ${{ github.event.inputs.targetRelease }} regex: false - exclude: CHANGELOG.md + include: "README.md" - name: Create changelog placeholder for ${{ github.event.inputs.targetRelease }} uses: jacobtomlinson/gha-find-replace@v2 with: From 2361bf41592bd8b213223839763d0f69f92f56d7 Mon Sep 17 00:00:00 2001 From: pankajagrawal16 Date: Thu, 6 Jan 2022 19:17:30 +0000 Subject: [PATCH 4/4] chore:prep release 1.10.2 --- CHANGELOG.md | 5 +++++ README.md | 6 +++--- example/HelloWorldFunction/build.gradle | 24 ++++++++++++------------ example/HelloWorldFunction/pom.xml | 12 ++++++------ mkdocs.yml | 2 +- powertools-cloudformation/pom.xml | 2 +- powertools-core/pom.xml | 2 +- powertools-logging/pom.xml | 2 +- powertools-metrics/pom.xml | 2 +- powertools-parameters/pom.xml | 2 +- powertools-sqs/pom.xml | 2 +- powertools-test-suite/pom.xml | 2 +- powertools-tracing/pom.xml | 2 +- powertools-validation/pom.xml | 2 +- 14 files changed, 36 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c10a33c0c..523e9b087 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ This project follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) fo ## [Unreleased] +## [1.10.2] - 2022-01-06 + + + + ## [1.10.1] - 2022-01-06 * **Logging**: Upgrade Log4j to version 2.17.1 for [CVE-2021-44832](https://nvd.nist.gov/vuln/detail/CVE-2021-44832) diff --git a/README.md b/README.md index fd3066692..fff63d89c 100644 --- a/README.md +++ b/README.md @@ -17,17 +17,17 @@ Powertools is available in Maven Central. You can use your favourite dependency software.amazon.lambda powertools-tracing - 1.10.1 + 1.10.2 software.amazon.lambda powertools-logging - 1.10.1 + 1.10.2 software.amazon.lambda powertools-metrics - 1.10.1 + 1.10.2 ... diff --git a/example/HelloWorldFunction/build.gradle b/example/HelloWorldFunction/build.gradle index 1f68cbb25..c7c774a33 100644 --- a/example/HelloWorldFunction/build.gradle +++ b/example/HelloWorldFunction/build.gradle @@ -8,23 +8,23 @@ repositories { } dependencies { - implementation 'software.amazon.lambda:powertools-tracing:1.10.1' - aspectpath 'software.amazon.lambda:powertools-tracing:1.10.1' + implementation 'software.amazon.lambda:powertools-tracing:1.10.2' + aspectpath 'software.amazon.lambda:powertools-tracing:1.10.2' - implementation 'software.amazon.lambda:powertools-logging:1.10.1' - aspectpath 'software.amazon.lambda:powertools-logging:1.10.1' + implementation 'software.amazon.lambda:powertools-logging:1.10.2' + aspectpath 'software.amazon.lambda:powertools-logging:1.10.2' - implementation 'software.amazon.lambda:powertools-metrics:1.10.1' - aspectpath 'software.amazon.lambda:powertools-metrics:1.10.1' + implementation 'software.amazon.lambda:powertools-metrics:1.10.2' + aspectpath 'software.amazon.lambda:powertools-metrics:1.10.2' - implementation 'software.amazon.lambda:powertools-sqs:1.10.1' - aspectpath 'software.amazon.lambda:powertools-sqs:1.10.1' + implementation 'software.amazon.lambda:powertools-sqs:1.10.2' + aspectpath 'software.amazon.lambda:powertools-sqs:1.10.2' - implementation 'software.amazon.lambda:powertools-parameters:1.10.1' - aspectpath 'software.amazon.lambda:powertools-parameters:1.10.1' + implementation 'software.amazon.lambda:powertools-parameters:1.10.2' + aspectpath 'software.amazon.lambda:powertools-parameters:1.10.2' - implementation 'software.amazon.lambda:powertools-validation:1.10.1' - aspectpath 'software.amazon.lambda:powertools-validation:1.10.1' + implementation 'software.amazon.lambda:powertools-validation:1.10.2' + aspectpath 'software.amazon.lambda:powertools-validation:1.10.2' implementation 'com.amazonaws:aws-lambda-java-core:1.2.1' implementation 'com.amazonaws:aws-lambda-java-events:3.1.0' diff --git a/example/HelloWorldFunction/pom.xml b/example/HelloWorldFunction/pom.xml index 32dd86849..5c6000a5f 100644 --- a/example/HelloWorldFunction/pom.xml +++ b/example/HelloWorldFunction/pom.xml @@ -16,32 +16,32 @@ software.amazon.lambda powertools-tracing - 1.10.1 + 1.10.2 software.amazon.lambda powertools-logging - 1.10.1 + 1.10.2 software.amazon.lambda powertools-metrics - 1.10.1 + 1.10.2 software.amazon.lambda powertools-parameters - 1.10.1 + 1.10.2 software.amazon.lambda powertools-validation - 1.10.1 + 1.10.2 software.amazon.lambda powertools-sqs - 1.10.1 + 1.10.2 com.amazonaws diff --git a/mkdocs.yml b/mkdocs.yml index 6ab16052d..4e65aa01e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -75,7 +75,7 @@ extra_javascript: extra: powertools: - version: 1.10.1 + version: 1.10.2 repo_url: https://github.com/awslabs/aws-lambda-powertools-java edit_uri: edit/master/docs diff --git a/powertools-cloudformation/pom.xml b/powertools-cloudformation/pom.xml index b0cd878b1..e4b96bc33 100644 --- a/powertools-cloudformation/pom.xml +++ b/powertools-cloudformation/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Cloudformation diff --git a/powertools-core/pom.xml b/powertools-core/pom.xml index 8e540b11b..addb29c51 100644 --- a/powertools-core/pom.xml +++ b/powertools-core/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Core diff --git a/powertools-logging/pom.xml b/powertools-logging/pom.xml index a1724509c..32f40384f 100644 --- a/powertools-logging/pom.xml +++ b/powertools-logging/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Logging diff --git a/powertools-metrics/pom.xml b/powertools-metrics/pom.xml index 4bcba6d25..8e1cd3056 100644 --- a/powertools-metrics/pom.xml +++ b/powertools-metrics/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Metrics diff --git a/powertools-parameters/pom.xml b/powertools-parameters/pom.xml index cf8c50cb7..653a9e5a0 100644 --- a/powertools-parameters/pom.xml +++ b/powertools-parameters/pom.xml @@ -7,7 +7,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 powertools-parameters diff --git a/powertools-sqs/pom.xml b/powertools-sqs/pom.xml index dd71b305b..8f73de92c 100644 --- a/powertools-sqs/pom.xml +++ b/powertools-sqs/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library SQS diff --git a/powertools-test-suite/pom.xml b/powertools-test-suite/pom.xml index 0aa20e009..07ac1c969 100644 --- a/powertools-test-suite/pom.xml +++ b/powertools-test-suite/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Test Suite diff --git a/powertools-tracing/pom.xml b/powertools-tracing/pom.xml index b18243f29..948a87dbf 100644 --- a/powertools-tracing/pom.xml +++ b/powertools-tracing/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java library Tracing diff --git a/powertools-validation/pom.xml b/powertools-validation/pom.xml index 3f44182be..3253fe5b7 100644 --- a/powertools-validation/pom.xml +++ b/powertools-validation/pom.xml @@ -10,7 +10,7 @@ powertools-parent software.amazon.lambda - 1.10.1 + 1.10.2 AWS Lambda Powertools Java validation library