update aws creds action

Signed-off-by: David van der Spek <[email protected]>
pluralsh · Sep 12, 2023 · 53795bd · 53795bd
1 parent 0b8d8d9
commit 53795bd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
@@ -108,18 +108,18 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         if: always()
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
           role-session-name: PluralCLI
-      # - name: Manually cleanup buildx
-      #   if: always()
-      #   run: |
-      #     docker buildx stop ${{ steps.builder.outputs.name }}
-      #     sleep 10
-      #     docker buildx rm ${{ steps.builder.outputs.name }}
+      - name: Manually cleanup buildx
+        if: always()
+        run: |
+          docker buildx stop ${{ steps.builder.outputs.name }}
+          sleep 10
+          docker buildx rm ${{ steps.builder.outputs.name }}
   cloud:
     name: Build cloud image
     runs-on: ubuntu-latest
@@ -133,7 +133,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
@@ -222,18 +222,18 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         if: always()
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
           role-session-name: PluralCLI
-      # - name: Manually cleanup buildx
-      #   if: always()
-      #   run: |
-      #     docker buildx stop ${{ steps.builder.outputs.name }}
-      #     sleep 10
-      #     docker buildx rm ${{ steps.builder.outputs.name }}
+      - name: Manually cleanup buildx
+        if: always()
+        run: |
+          docker buildx stop ${{ steps.builder.outputs.name }}
+          sleep 10
+          docker buildx rm ${{ steps.builder.outputs.name }}
   dind:
     name: Build dind image
     runs-on: ubuntu-latest
@@ -247,7 +247,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
@@ -336,18 +336,18 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         if: always()
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
           role-session-name: PluralCLI
-      # - name: Manually cleanup buildx
-      #   if: always()
-      #   run: |
-      #     docker buildx stop ${{ steps.builder.outputs.name }}
-      #     sleep 10
-      #     docker buildx rm ${{ steps.builder.outputs.name }}
+      - name: Manually cleanup buildx
+        if: always()
+        run: |
+          docker buildx stop ${{ steps.builder.outputs.name }}
+          sleep 10
+          docker buildx rm ${{ steps.builder.outputs.name }}
   trivy-scan:
     name: Trivy fs scan
     runs-on: ubuntu-latest

diff --git a/.github/workflows/goreleaser-cd.yml b/.github/workflows/goreleaser-cd.yml
@@ -134,7 +134,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::312272277431:role/github-actions/buildx-deployments
@@ -235,7 +235,7 @@ jobs:
         with:
           sarif_file: 'trivy-results.sarif'
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         if: always()
         with:
           aws-region: us-east-2
@@ -258,7 +258,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-east-2
           role-to-assume: arn:aws:iam::654897662046:role/github-actions/plural-cli-amis-packer