diff --git a/.github/workflows/label-base-deploy--resolver.yaml b/.github/workflows/label-base-deploy--resolver.yaml index 2c35809b..3bd1aae0 100644 --- a/.github/workflows/label-base-deploy--resolver.yaml +++ b/.github/workflows/label-base-deploy--resolver.yaml @@ -109,7 +109,7 @@ jobs: - target: stack: terragrunt-shared fail-fast: false - uses: ./.github/workflows/reusable--terragrunt-executor.yaml + uses: ./.github/workflows/reusable--terragrunt-runner.yaml with: service-name: ${{ matrix.target.service }} environment: ${{ matrix.target.environment }} diff --git a/.github/workflows/release--deploy.yaml b/.github/workflows/release--deploy.yaml index ff758128..eb1463b2 100644 --- a/.github/workflows/release--deploy.yaml +++ b/.github/workflows/release--deploy.yaml @@ -57,7 +57,7 @@ jobs: matrix: target: ${{ fromJson(needs.resolve.outputs.targets) }} fail-fast: false - uses: ./.github/workflows/reusable--terragrunt-executor.yaml + uses: ./.github/workflows/reusable--terragrunt-runner.yaml with: service-name: ${{ matrix.target.service }} environment: ${{ matrix.target.environment }} diff --git a/.github/workflows/release--plan.yaml b/.github/workflows/release--plan.yaml index c5cc0334..d2caabaa 100644 --- a/.github/workflows/release--plan.yaml +++ b/.github/workflows/release--plan.yaml @@ -45,7 +45,7 @@ jobs: matrix: target: ${{ fromJson(needs.resolve.outputs.targets) }} fail-fast: false - uses: ./.github/workflows/reusable--terragrunt-executor.yaml + uses: ./.github/workflows/reusable--terragrunt-runner.yaml with: service-name: ${{ matrix.target.service }} environment: ${{ matrix.target.environment }} diff --git a/.github/workflows/reusable--terragrunt-executor.yaml b/.github/workflows/reusable--terragrunt-runner.yaml similarity index 96% rename from .github/workflows/reusable--terragrunt-executor.yaml rename to .github/workflows/reusable--terragrunt-runner.yaml index 41c451e5..35342ff3 100644 --- a/.github/workflows/reusable--terragrunt-executor.yaml +++ b/.github/workflows/reusable--terragrunt-runner.yaml @@ -1,5 +1,5 @@ # Runs terragrunt plan or apply in one working directory and reports the result with tfcmt. -name: 'Reusable - Terragrunt Executor' +name: 'Reusable - Terragrunt Runner' on: workflow_call: @@ -48,8 +48,8 @@ on: description: 'GitHub App private key for authentication' jobs: - execute-terragrunt: - name: 'Execute Terragrunt' + run-terragrunt: + name: 'Run Terragrunt' if: inputs.action-type != '' runs-on: ubuntu-latest environment: ${{ inputs.github-environment }} @@ -80,7 +80,7 @@ jobs: with: aqua_version: v2.64.0 - - name: Execute Terragrunt + - name: Run Terragrunt working-directory: ${{ inputs.working-directory }} env: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} diff --git a/README-ja.md b/README-ja.md index 48775298..a43ab27f 100644 --- a/README-ja.md +++ b/README-ja.md @@ -63,8 +63,8 @@ | Stack | Path convention | Tooling | |-------|-----------------|---------| -| AWS infrastructure | `aws/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-executor.yaml](.github/workflows/reusable--terragrunt-executor.yaml)) | -| GitHub configuration | `github/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-executor.yaml](.github/workflows/reusable--terragrunt-executor.yaml)) | +| AWS infrastructure | `aws/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-runner.yaml](.github/workflows/reusable--terragrunt-runner.yaml)) | +| GitHub configuration | `github/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-runner.yaml](.github/workflows/reusable--terragrunt-runner.yaml)) | | Kubernetes platform | `kubernetes/components/{service}/{environment}` | Helmfile → Kustomize hydration ([reusable--kubernetes-hydrator.yaml](.github/workflows/reusable--kubernetes-hydrator.yaml) / [reusable--kubernetes-builder.yaml](.github/workflows/reusable--kubernetes-builder.yaml)) → Flux CD | ### Environments and Authentication @@ -102,7 +102,7 @@ flowchart LR subgraph Terragrunt ReleaseTrigger[release--deploy] - TG[reusable--terragrunt-executor] + TG[reusable--terragrunt-runner] Plan[terragrunt plan] Apply[terragrunt apply] PRComment[(PR comment)] diff --git a/README.md b/README.md index b13a7ab8..9dfc5027 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,8 @@ A PR labeled by `panicboat/deploy-actions` is resolved against [workflow-config. | Stack | Path convention | Tooling | |-------|-----------------|---------| -| AWS infrastructure | `aws/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-executor.yaml](.github/workflows/reusable--terragrunt-executor.yaml)) | -| GitHub configuration | `github/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-executor.yaml](.github/workflows/reusable--terragrunt-executor.yaml)) | +| AWS infrastructure | `aws/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-runner.yaml](.github/workflows/reusable--terragrunt-runner.yaml)) | +| GitHub configuration | `github/{service}/{environment}` | Terragrunt + OpenTofu ([reusable--terragrunt-runner.yaml](.github/workflows/reusable--terragrunt-runner.yaml)) | | Kubernetes platform | `kubernetes/components/{service}/{environment}` | Helmfile → Kustomize hydration ([reusable--kubernetes-hydrator.yaml](.github/workflows/reusable--kubernetes-hydrator.yaml) / [reusable--kubernetes-builder.yaml](.github/workflows/reusable--kubernetes-builder.yaml)) → Flux CD | ### Environments and authentication @@ -102,7 +102,7 @@ flowchart LR subgraph Terragrunt ReleaseTrigger[release--deploy] - TG[reusable--terragrunt-executor] + TG[reusable--terragrunt-runner] Plan[terragrunt plan] Apply[terragrunt apply] PRComment[(PR comment)]