From b741d83e2ab619cc6d383d58eaf12409dee7e3f0 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 18 Jul 2024 08:31:36 -0700 Subject: [PATCH 1/4] Bump to version 1.9 for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6259340..2e0e38c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8 +1.9 From c3fbb4b28e00f66ffb0887d9454cc05f41640d9a Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 18 Jul 2024 08:43:03 -0700 Subject: [PATCH 2/4] Fix release workflow Give missing permissions for the release workflow --- .github/workflows/release.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 69db5d2..370d74a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,6 +13,10 @@ on: - 'true' - 'false' +permissions: + id-token: write + contents: read + env: AWS_PUBLIC_ECR_REGION: us-east-1 AWS_PRIVATE_ECR_REGION: us-west-2 From b3554fe3ff0e9ae023328a6cbfce8562e887b218 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 18 Jul 2024 08:57:50 -0700 Subject: [PATCH 3/4] Fix release workflow Properly give coordinates to release image --- .github/workflows/release.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 370d74a..98764c2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,6 +21,7 @@ env: AWS_PUBLIC_ECR_REGION: us-east-1 AWS_PRIVATE_ECR_REGION: us-west-2 PUBLIC_REGISTRY: public.ecr.aws + PUBLIC_REPO: aws-observability STAGING_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com RELEASE_IMAGE_NAME: aws-sigv4-proxy STAGING_IMAGE_NAME: aws-sigv4-proxy-staging @@ -70,9 +71,9 @@ jobs: if: ${{ inputs.dryrunMode == 'true' }} run: | docker buildx imagetools create \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:latest \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:latest \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ ${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} --dry-run @@ -88,9 +89,9 @@ jobs: if: ${{ inputs.dryrunMode == 'false' }} run: | docker buildx imagetools create \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:latest \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \ - --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:latest \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \ + --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ ${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} - name: Create release From 99fc2c8ef4c575742c28bdb4008fe818c8557f47 Mon Sep 17 00:00:00 2001 From: Raphael Philipe Mendes da Silva Date: Thu, 18 Jul 2024 09:14:20 -0700 Subject: [PATCH 4/4] Fix issues in release workflow Fix typo when running workflow as dry-run. --- .github/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 98764c2..46630d5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -74,7 +74,7 @@ jobs: --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:latest \ --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.release-version }} \ --tag ${{ env.PUBLIC_REGISTRY }}/${{ env.PUBLIC_REPO }}/${{ env.RELEASE_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ - ${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} + ${{ env.STAGING_REGISTRY }}/${{ env.STAGING_IMAGE_NAME }}:${{ steps.release-info.outputs.commit-short-sha }} \ --dry-run - name: Create release - dryrun @@ -83,7 +83,7 @@ jobs: echo gh release create --target "$GITHUB_REF_NAME" \ --title "Release v${{ steps.release-info.outputs.release-version }}" \ --draft \ - "v${{ steps.release-info.outputs.release-version }}" \ + "v${{ steps.release-info.outputs.release-version }}" - name: Push image to public ecr if: ${{ inputs.dryrunMode == 'false' }} @@ -102,4 +102,4 @@ jobs: gh release create --target "$GITHUB_REF_NAME" \ --title "Release v${{ steps.release-info.outputs.release-version }}" \ --draft \ - "v${{ steps.release-info.outputs.release-version }}" \ + "v${{ steps.release-info.outputs.release-version }}"