diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml new file mode 100644 index 0000000..d887a66 --- /dev/null +++ b/.github/workflows/lock.yml @@ -0,0 +1,21 @@ +name: 'Lock Threads' + +on: + schedule: + - cron: '50 1 * * *' + +jobs: + lock: + runs-on: ubuntu-latest + steps: + - uses: dessant/lock-threads@v3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + issue-comment: > + I'm going to lock this issue because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues. + If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. + issue-inactive-days: '30' + pr-comment: > + I'm going to lock this pull request because it has been closed for _30 days_ ⏳. This helps our maintainers find and focus on the active issues. + If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further. + pr-inactive-days: '30' diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml index 168011c..cb32a0f 100644 --- a/.github/workflows/pr-title.yml +++ b/.github/workflows/pr-title.yml @@ -14,7 +14,7 @@ jobs: steps: # Please look up the latest version from # https://github.com/amannn/action-semantic-pull-request/releases - - uses: amannn/action-semantic-pull-request@v3.4.6 + - uses: amannn/action-semantic-pull-request@v5.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index b8f1b8a..b2afafb 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,7 +3,6 @@ name: Pre-Commit on: pull_request: branches: - - main - master env: @@ -17,11 +16,11 @@ jobs: directories: ${{ steps.dirs.outputs.directories }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Get root directories id: dirs - uses: clowdhaus/terraform-composite-actions/directories@v1.3.0 + uses: clowdhaus/terraform-composite-actions/directories@v1.8.0 preCommitMinVersions: name: Min TF pre-commit @@ -32,18 +31,18 @@ jobs: directory: ${{ fromJson(needs.collectInputs.outputs.directories) }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Terraform min/max versions id: minMax - uses: clowdhaus/terraform-min-max@v1.0.3 + uses: clowdhaus/terraform-min-max@v1.2.1 with: directory: ${{ matrix.directory }} - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }} # Run only validate pre-commit check on min version supported if: ${{ matrix.directory != '.' }} - uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*' @@ -51,7 +50,7 @@ jobs: - name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }} # Run only validate pre-commit check on min version supported if: ${{ matrix.directory == '.' }} - uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)' @@ -62,17 +61,18 @@ jobs: needs: collectInputs steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{github.event.pull_request.head.repo.full_name}} - name: Terraform min/max versions id: minMax - uses: clowdhaus/terraform-min-max@v1.0.3 + uses: clowdhaus/terraform-min-max@v1.2.1 - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }} - uses: clowdhaus/terraform-composite-actions/pre-commit@v1.3.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.8.0 with: terraform-version: ${{ steps.minMax.outputs.maxVersion }} terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }} + install-hcledit: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8a26ca..d2556e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ on: workflow_dispatch: push: branches: - - main - master paths: - '**/*.tpl' @@ -20,7 +19,7 @@ jobs: if: github.repository_owner == 'terraform-aws-modules' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: persist-credentials: false fetch-depth: 0 diff --git a/.github/workflows/stale-actions.yaml b/.github/workflows/stale-actions.yaml index c09ae1d..5037995 100644 --- a/.github/workflows/stale-actions.yaml +++ b/.github/workflows/stale-actions.yaml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-latest steps: - - uses: actions/stale@v4 + - uses: actions/stale@v6 with: repo-token: ${{ secrets.GITHUB_TOKEN }} # Staling issues and PR's diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 093121e..74f3751 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: v1.62.3 + rev: v1.76.0 hooks: - id: terraform_fmt - id: terraform_validate @@ -23,7 +23,7 @@ repos: - '--args=--only=terraform_standard_module_structure' - '--args=--only=terraform_workspace_remote' - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.3.0 hooks: - id: check-merge-conflict - id: end-of-file-fixer diff --git a/examples/complete/README.md b/examples/complete/README.md index 06543b9..ba1fc50 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -21,15 +21,15 @@ Run `terraform destroy` when you don't need these resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.6 | -| [aws](#requirement\_aws) | >= 3 | -| [local](#requirement\_local) | >= 1 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [local](#requirement\_local) | >= 1.0 | ## Providers | Name | Version | |------|---------| -| [local](#provider\_local) | >= 1 | +| [local](#provider\_local) | >= 1.0 | ## Modules diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 52cfde9..76b1801 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,8 +1,15 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" - local = ">= 1" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + + local = { + source = "hashicorp/local" + version = ">= 1.0" + } } } diff --git a/examples/cost-modules-tf/README.md b/examples/cost-modules-tf/README.md index 87ab912..6008a22 100644 --- a/examples/cost-modules-tf/README.md +++ b/examples/cost-modules-tf/README.md @@ -19,15 +19,15 @@ Run `terraform destroy` when you don't need these resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.6 | -| [aws](#requirement\_aws) | >= 3 | -| [local](#requirement\_local) | >= 1 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [local](#requirement\_local) | >= 1.0 | ## Providers | Name | Version | |------|---------| -| [local](#provider\_local) | >= 1 | +| [local](#provider\_local) | >= 1.0 | | [terraform](#provider\_terraform) | n/a | ## Modules diff --git a/examples/cost-modules-tf/versions.tf b/examples/cost-modules-tf/versions.tf index 52cfde9..76b1801 100644 --- a/examples/cost-modules-tf/versions.tf +++ b/examples/cost-modules-tf/versions.tf @@ -1,8 +1,15 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" - local = ">= 1" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + + local = { + source = "hashicorp/local" + version = ">= 1.0" + } } } diff --git a/examples/fixtures/all-resources/versions.tf b/examples/fixtures/all-resources/versions.tf index f09af83..d8dd1a4 100644 --- a/examples/fixtures/all-resources/versions.tf +++ b/examples/fixtures/all-resources/versions.tf @@ -1,7 +1,10 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } } } diff --git a/examples/fixtures/combinations/versions.tf b/examples/fixtures/combinations/versions.tf index eb4e36b..d8dd1a4 100644 --- a/examples/fixtures/combinations/versions.tf +++ b/examples/fixtures/combinations/versions.tf @@ -1,7 +1,10 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.0" required_providers { - aws = ">= 3" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } } } diff --git a/examples/pricing-dev/README.md b/examples/pricing-dev/README.md index 7bae498..fec96d8 100644 --- a/examples/pricing-dev/README.md +++ b/examples/pricing-dev/README.md @@ -17,15 +17,15 @@ Run `terraform destroy` when you don't need these resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3 | -| [local](#requirement\_local) | >= 1 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [local](#requirement\_local) | >= 1.0 | ## Providers | Name | Version | |------|---------| -| [local](#provider\_local) | >= 1 | +| [local](#provider\_local) | >= 1.0 | ## Modules diff --git a/examples/pricing-dev/versions.tf b/examples/pricing-dev/versions.tf index 10ba0d9..76b1801 100644 --- a/examples/pricing-dev/versions.tf +++ b/examples/pricing-dev/versions.tf @@ -1,8 +1,15 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.0" required_providers { - aws = ">= 3" - local = ">= 1" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + + local = { + source = "hashicorp/local" + version = ">= 1.0" + } } } diff --git a/examples/pricing-resources/README.md b/examples/pricing-resources/README.md index b63a1e2..922896d 100644 --- a/examples/pricing-resources/README.md +++ b/examples/pricing-resources/README.md @@ -21,8 +21,8 @@ Run `terraform destroy` when you don't need these resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.6 | -| [aws](#requirement\_aws) | >= 3 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | ## Providers diff --git a/examples/pricing-resources/versions.tf b/examples/pricing-resources/versions.tf index f09af83..d8dd1a4 100644 --- a/examples/pricing-resources/versions.tf +++ b/examples/pricing-resources/versions.tf @@ -1,7 +1,10 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } } } diff --git a/examples/pricing-terraform-state-and-plan/README.md b/examples/pricing-terraform-state-and-plan/README.md index d105301..478483f 100644 --- a/examples/pricing-terraform-state-and-plan/README.md +++ b/examples/pricing-terraform-state-and-plan/README.md @@ -21,15 +21,15 @@ Run `terraform destroy` when you don't need these resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.6 | -| [aws](#requirement\_aws) | >= 3 | -| [local](#requirement\_local) | >= 1 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [local](#requirement\_local) | >= 1.0 | ## Providers | Name | Version | |------|---------| -| [local](#provider\_local) | >= 1 | +| [local](#provider\_local) | >= 1.0 | | [terraform](#provider\_terraform) | n/a | ## Modules diff --git a/examples/pricing-terraform-state-and-plan/versions.tf b/examples/pricing-terraform-state-and-plan/versions.tf index 52cfde9..76b1801 100644 --- a/examples/pricing-terraform-state-and-plan/versions.tf +++ b/examples/pricing-terraform-state-and-plan/versions.tf @@ -1,8 +1,15 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" - local = ">= 1" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + + local = { + source = "hashicorp/local" + version = ">= 1.0" + } } } diff --git a/modules/cost.modules.tf/README.md b/modules/cost.modules.tf/README.md index 9da2d38..d364f18 100644 --- a/modules/cost.modules.tf/README.md +++ b/modules/cost.modules.tf/README.md @@ -11,17 +11,17 @@ See [repository terraform-cost-estimation](https://github.com/antonbabenko/terra | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.12.6 | -| [aws](#requirement\_aws) | >= 3 | -| [local](#requirement\_local) | >= 1 | -| [null](#requirement\_null) | >= 2 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | +| [local](#requirement\_local) | >= 1.0 | +| [null](#requirement\_null) | >= 2.0 | ## Providers | Name | Version | |------|---------| -| [local](#provider\_local) | >= 1 | -| [null](#provider\_null) | >= 2 | +| [local](#provider\_local) | >= 1.0 | +| [null](#provider\_null) | >= 2.0 | ## Modules diff --git a/modules/cost.modules.tf/versions.tf b/modules/cost.modules.tf/versions.tf index 980f217..e5a3651 100644 --- a/modules/cost.modules.tf/versions.tf +++ b/modules/cost.modules.tf/versions.tf @@ -1,9 +1,20 @@ terraform { - required_version = ">= 0.12.6" + required_version = ">= 1.0" required_providers { - aws = ">= 3" - null = ">= 2" - local = ">= 1" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } + + null = { + source = "hashicorp/null" + version = ">= 2.0" + } + + local = { + source = "hashicorp/local" + version = ">= 1.0" + } } } diff --git a/modules/pricing/README.md b/modules/pricing/README.md index 52b5586..dd4b400 100644 --- a/modules/pricing/README.md +++ b/modules/pricing/README.md @@ -34,14 +34,14 @@ add support for new types of resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | >= 3 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3 | +| [aws](#provider\_aws) | >= 4.0 | ## Modules diff --git a/modules/pricing/versions.tf b/modules/pricing/versions.tf index eb4e36b..d8dd1a4 100644 --- a/modules/pricing/versions.tf +++ b/modules/pricing/versions.tf @@ -1,7 +1,10 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.0" required_providers { - aws = ">= 3" + aws = { + source = "hashicorp/aws" + version = ">= 4.0" + } } }