diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index d4cb1e0..23ca4a5 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -21,7 +21,7 @@ jobs: - name: Get root directories id: dirs - uses: clowdhaus/terraform-composite-actions/directories@v1.4.0 + uses: clowdhaus/terraform-composite-actions/directories@v1.4.1 preCommitMinVersions: name: Min TF pre-commit @@ -36,14 +36,14 @@ jobs: - name: Terraform min/max versions id: minMax - uses: clowdhaus/terraform-min-max@v1.0.4 + uses: clowdhaus/terraform-min-max@v1.0.7 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.4.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.4.1 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*' @@ -51,7 +51,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.4.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.4.1 with: terraform-version: ${{ steps.minMax.outputs.minVersion }} args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)' @@ -69,10 +69,10 @@ jobs: - name: Terraform min/max versions id: minMax - uses: clowdhaus/terraform-min-max@v1.0.4 + uses: clowdhaus/terraform-min-max@v1.0.7 - name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }} - uses: clowdhaus/terraform-composite-actions/pre-commit@v1.4.0 + uses: clowdhaus/terraform-composite-actions/pre-commit@v1.4.1 with: terraform-version: ${{ steps.minMax.outputs.maxVersion }} terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }} diff --git a/.github/workflows/semantic-releaser.yml b/.github/workflows/semantic-releaser.yml index 804a5fc..af82fe8 100644 --- a/.github/workflows/semantic-releaser.yml +++ b/.github/workflows/semantic-releaser.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Release uses: cycjimmy/semantic-release-action@v2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 093121e..ba45548 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.64.1 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.2.0 hooks: - id: check-merge-conflict - id: end-of-file-fixer diff --git a/README.md b/README.md index a2739e5..18e5f4c 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,8 @@ Examples codified under the [`examples`](https://github.com/clowdhaus/terraform- | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 3.30 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | ## Providers diff --git a/eject.sh b/eject.sh index d7ff1f5..583d6f5 100755 --- a/eject.sh +++ b/eject.sh @@ -10,9 +10,9 @@ MODULE=$1; MODULE_UNDER=$(echo $MODULE | sed -e 's/-/_/g'); MODULE_EXPANDED=$(echo $MODULE | sed -e 's/-/ /g' -e 's/\b\(.\)/\u\1/g'); -rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE}/g" -rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE_UNDER}/g" -rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE_EXPANDED}/g" +rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE}/g" || true +rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE_UNDER}/g" || true +rg '' --files-with-matches -t md -t tf | xargs sed -i "s//${MODULE_EXPANDED}/g" || true # Remove "howto" section on main README.md sed -i '//d' README.md diff --git a/examples/complete/README.md b/examples/complete/README.md index 8c97b3d..be44b98 100644 --- a/examples/complete/README.md +++ b/examples/complete/README.md @@ -21,21 +21,21 @@ Note that this example may create resources which will incur monetary charges on | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | -| [aws](#requirement\_aws) | >= 3.30 | +| [terraform](#requirement\_terraform) | >= 1.0 | +| [aws](#requirement\_aws) | >= 4.0 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.30 | +| [aws](#provider\_aws) | >= 4.0 | ## Modules | Name | Source | Version | |------|--------|---------| -| [](#module\_) | ../.. | n/a | -| [_disabled](#module\_\_disabled) | ../.. | n/a | +| [](#module\_) | ../.. | n/a | +| [\_disabled](#module\_\_disabled) | ../.. | n/a | | [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 | ## Resources diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index b28ff8f..d8dd1a4 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.30" + version = ">= 4.0" } } } diff --git a/versions.tf b/versions.tf index b28ff8f..d8dd1a4 100644 --- a/versions.tf +++ b/versions.tf @@ -1,10 +1,10 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.0" required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.30" + version = ">= 4.0" } } }