Skip to content

Commit

Permalink
chore: update versions in use to latest defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
bryantbiggs committed Apr 9, 2022
1 parent 1e2c498 commit 5991bb4
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,22 +36,22 @@ 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 }}/*'

- 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)'
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/semantic-releaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ Examples codified under the [`examples`](https://github.com/clowdhaus/terraform-

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.30 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |

## Providers

Expand Down
6 changes: 3 additions & 3 deletions eject.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<TODO>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO>/${MODULE}/g"
rg '<TODO_UNDER>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO_UNDER>/${MODULE_UNDER}/g"
rg '<TODO_EXPANDED>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO_EXPANDED>/${MODULE_EXPANDED}/g"
rg '<TODO>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO>/${MODULE}/g" || true
rg '<TODO_UNDER>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO_UNDER>/${MODULE_UNDER}/g" || true
rg '<TODO_EXPANDED>' --files-with-matches -t md -t tf | xargs sed -i "s/<TODO_EXPANDED>/${MODULE_EXPANDED}/g" || true

# Remove "howto" section on main README.md
sed -i '/<!--START/,/END--->/d' README.md
Expand Down
10 changes: 5 additions & 5 deletions examples/complete/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ Note that this example may create resources which will incur monetary charges on

| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.30 |
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.30 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.0 |

## Modules

| Name | Source | Version |
|------|--------|---------|
| <a name="module_<TODO_UNDER>"></a> [<TODO_UNDER>](#module\_<TODO_UNDER>) | ../.. | n/a |
| <a name="module_<TODO_UNDER>_disabled"></a> [<TODO_UNDER>_disabled](#module\_<TODO_UNDER>\_disabled) | ../.. | n/a |
| <a name="module_<TODO_UNDER>"></a> [<TODO\_UNDER>](#module\_<TODO\_UNDER>) | ../.. | n/a |
| <a name="module_<TODO_UNDER>_disabled"></a> [<TODO\_UNDER>\_disabled](#module\_<TODO\_UNDER>\_disabled) | ../.. | n/a |
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |

## Resources
Expand Down
4 changes: 2 additions & 2 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
4 changes: 2 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -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"
}
}
}

0 comments on commit 5991bb4

Please sign in to comment.