Merge branch 'main' into use-pull_request_target

suzuki-shunsuke · Nov 11, 2023 · a78e85a · a78e85a
2 parents 1cd6f87 + 1e2c732
commit a78e85a
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 38 deletions.
diff --git a/.github/workflows/apply.yaml b/.github/workflows/apply.yaml
@@ -51,7 +51,7 @@ jobs:
         with:
           aqua_version: v2.16.4
 
-      - uses: suzuki-shunsuke/tfaction/export-secrets@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/export-secrets@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           secrets: ${{ toJSON(secrets) }}
 
@@ -65,7 +65,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
 
-      - uses: suzuki-shunsuke/tfaction/setup@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/setup@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{ steps.generate_token.outputs.token }}
           ssh_key: ${{ secrets.TERRAFORM_PRIVATE_MODULE_SSH_KEY }} # This isn't needed if you don't use SSH key to checkout private Terraform Modules
@@ -74,12 +74,12 @@ jobs:
         with:
           github_app_token: ${{ steps.generate_token.outputs.token }}
 
-      - uses: suzuki-shunsuke/tfaction/create-follow-up-pr@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/create-follow-up-pr@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         if: failure()
         with:
           github_app_token: ${{ steps.generate_token.outputs.token }}
 
-      - uses: suzuki-shunsuke/tfaction/update-drift-issue@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/update-drift-issue@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         if: always()
         with:
           status: ${{job.status}}

diff --git a/.github/workflows/release-module.yaml b/.github/workflows/release-module.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           aqua_version: v2.16.4
 
-      - uses: suzuki-shunsuke/tfaction/release-module@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/release-module@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           version: ${{ github.event.inputs.version }}
           module_path: ${{ github.event.inputs.module_path }}
diff --git a/.github/workflows/scaffold-module.yaml b/.github/workflows/scaffold-module.yaml
@@ -26,7 +26,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - uses: suzuki-shunsuke/tfaction/scaffold-module@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/scaffold-module@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_token: ${{ steps.generate_token.outputs.token }}
           module_path: ${{ github.event.inputs.module_path }}
diff --git a/.github/workflows/scaffold-tfmigrate.yaml b/.github/workflows/scaffold-tfmigrate.yaml
@@ -37,7 +37,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{steps.generate_token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/scaffold-tfmigrate@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/scaffold-tfmigrate@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{steps.generate_token.outputs.token}}
           migration_name: ${{github.event.inputs.migration_name}}

diff --git a/.github/workflows/scaffold-working-directory.yaml b/.github/workflows/scaffold-working-directory.yaml
@@ -22,7 +22,7 @@ jobs:
         with:
           aqua_version: v2.16.4
 
-      - uses: suzuki-shunsuke/tfaction/scaffold-working-dir@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/scaffold-working-dir@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
 
       - name: Generate token
         id: generate_token
@@ -31,6 +31,6 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - uses: suzuki-shunsuke/tfaction/create-scaffold-pr@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/create-scaffold-pr@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{ steps.generate_token.outputs.token }}
diff --git a/.github/workflows/schedule-detect-drifts.yaml b/.github/workflows/schedule-detect-drifts.yaml
@@ -49,32 +49,32 @@ jobs:
         env:
           GITHUB_TOKEN: ${{github.token}}
 
-      - uses: suzuki-shunsuke/tfaction/set-drift-env@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/set-drift-env@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           issue: ${{toJSON(matrix.issue)}}
 
-      - uses: suzuki-shunsuke/tfaction/setup@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/setup@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_token: ${{steps.generate_token.outputs.token}}
           github_app_token: ${{steps.generate_token.outputs.token}}
         env:
           GITHUB_TOKEN: ${{steps.generate_token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/test@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/test@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_token: ${{steps.generate_token.outputs.token}}
           github_app_token: ${{steps.generate_token.outputs.token}}
         env:
           GITHUB_TOKEN: ${{steps.generate_token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/terraform-plan@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/terraform-plan@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_token: ${{steps.generate_token.outputs.token}}
           github_app_token: ${{steps.generate_token.outputs.token}}
         env:
           GITHUB_TOKEN: ${{steps.generate_token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/update-drift-issue@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/update-drift-issue@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         if: always()
         with:
           status: ${{job.status}}

diff --git a/.github/workflows/sync-drift-issue-description.yaml b/.github/workflows/sync-drift-issue-description.yaml
@@ -14,4 +14,4 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: suzuki-shunsuke/tfaction/sync-drift-issue-description@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/sync-drift-issue-description@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
diff --git a/.github/workflows/wc-enable-automerge.yaml b/.github/workflows/wc-enable-automerge.yaml
@@ -20,8 +20,8 @@ jobs:
           private_key: ${{secrets.gh_app_private_key}}
           permissions: >-
             {"pull_requests": "write", "contents": "write"}
-          repositories: >-
-            ["${{github.repository}}"]
+          # repositories: >-
+          #   ["${{github.repository}}"]
 
       - run: gh -R "$GITHUB_REPOSITORY" pr merge --squash --auto --delete-branch "$PR_NUMBER"
         env:

diff --git a/.github/workflows/wc-test.yaml b/.github/workflows/wc-test.yaml
@@ -86,7 +86,7 @@ jobs:
         env:
           AQUA_GITHUB_TOKEN: ${{steps.token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/test-module@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/test-module@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{steps.token.outputs.token}}
 
@@ -121,7 +121,7 @@ jobs:
         env:
           AQUA_GITHUB_TOKEN: ${{steps.token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/export-secrets@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/export-secrets@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           secrets: ${{secrets.secrets}}
 
@@ -130,12 +130,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{steps.token.outputs.token}}
 
-      - uses: suzuki-shunsuke/tfaction/setup@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/setup@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{steps.token.outputs.token}}
           ssh_key: ${{secrets.terraform_private_module_ssh_key}} # This isn't needed if you don't use SSH key to checkout private Terraform Modules
 
-      - uses: suzuki-shunsuke/tfaction/get-target-config@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/get-target-config@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         id: target-config
 
       - run: |
@@ -152,7 +152,7 @@ jobs:
               - name: registry.terraform.io/integrations/github
           GITHUB_TOKEN: ${{steps.token.outputs.token}} # For github-comment
 
-      - uses: suzuki-shunsuke/tfaction/test@26effa08b92b77b5cfe04e2a25c15845fd00b04f # v0.7.2
+      - uses: suzuki-shunsuke/tfaction/test@5731fade20e41c1905c04095f0e3d68fac14a636 # v0.7.3
         with:
           github_app_token: ${{steps.token.outputs.token}}
 

diff --git a/aws/terraform-ci/.terraform.lock.hcl b/aws/terraform-ci/.terraform.lock.hcl
diff --git a/github/services/bar/aqua/aqua.yaml b/github/services/bar/aqua/aqua.yaml
@@ -8,6 +8,6 @@ checksum:
 #   - all
 registries:
 - type: standard
-  ref: v4.80.1 # renovate: depName=aquaproj/aqua-registry
+  ref: v4.82.0 # renovate: depName=aquaproj/aqua-registry
 packages:
   - import: imports/*.yaml