Skip to content

Commit f9381c9

Browse files
certara-mchamberlandcertara-mchamberland
authored
Merge branch 'master' into feature/subnet_to_az_mappings
2 parents fd46d7a + b1f2125 commit f9381c9

File tree

17 files changed

+55
-56
lines changed

17 files changed

+55
-56
lines changed

‎.github/workflows/pr-title.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
# Please look up the latest version from
1616
# https://github.com/amannn/action-semantic-pull-request/releases
17-
- uses: amannn/action-semantic-pull-request@v5.4.0
17+
- uses: amannn/action-semantic-pull-request@v5.5.3
1818
env:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:

‎.github/workflows/pre-commit.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- master
88

99
env:
10-
TERRAFORM_DOCS_VERSION: v0.16.0
11-
TFLINT_VERSION: v0.50.3
10+
TERRAFORM_DOCS_VERSION: v0.19.0
11+
TFLINT_VERSION: v0.53.0
1212

1313
jobs:
1414
collectInputs:
@@ -45,14 +45,14 @@ jobs:
4545

4646
- name: Terraform min/max versions
4747
id: minMax
48-
uses: clowdhaus/terraform-min-max@v1.3.0
48+
uses: clowdhaus/terraform-min-max@v1.3.1
4949
with:
5050
directory: ${{ matrix.directory }}
5151

5252
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
5353
# Run only validate pre-commit check on min version supported
5454
if: ${{ matrix.directory != '.' }}
55-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
55+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
5656
with:
5757
terraform-version: ${{ steps.minMax.outputs.minVersion }}
5858
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -61,7 +61,7 @@ jobs:
6161
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
6262
# Run only validate pre-commit check on min version supported
6363
if: ${{ matrix.directory == '.' }}
64-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
64+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
6565
with:
6666
terraform-version: ${{ steps.minMax.outputs.minVersion }}
6767
tflint-version: ${{ env.TFLINT_VERSION }}
@@ -88,10 +88,10 @@ jobs:
8888

8989
- name: Terraform min/max versions
9090
id: minMax
91-
uses: clowdhaus/terraform-min-max@v1.3.0
91+
uses: clowdhaus/terraform-min-max@v1.3.1
9292

9393
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
94-
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.9.0
94+
uses: clowdhaus/terraform-composite-actions/pre-commit@v1.11.1
9595
with:
9696
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
9797
tflint-version: ${{ env.TFLINT_VERSION }}

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.92.1
3+
rev: v1.96.1
44
hooks:
55
- id: terraform_fmt
66
- id: terraform_docs
@@ -21,10 +21,9 @@ repos:
2121
- '--args=--only=terraform_required_providers'
2222
- '--args=--only=terraform_standard_module_structure'
2323
- '--args=--only=terraform_workspace_remote'
24-
- '--args=--only=terraform_unused_required_providers'
2524
- id: terraform_validate
2625
- repo: https://github.com/pre-commit/pre-commit-hooks
27-
rev: v4.6.0
26+
rev: v5.0.0
2827
hooks:
2928
- id: check-merge-conflict
3029
- id: end-of-file-fixer

‎README.md‎

Lines changed: 19 additions & 19 deletions
Large diffs are not rendered by default.

‎examples/complete/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $ terraform apply
1616

1717
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
1818

19-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
19+
<!-- BEGIN_TF_DOCS -->
2020
## Requirements
2121

2222
| Name | Version |
@@ -165,4 +165,4 @@ No inputs.
165165
| <a name="output_vpc_main_route_table_id"></a> [vpc\_main\_route\_table\_id](#output\_vpc\_main\_route\_table\_id) | The ID of the main route table associated with this VPC |
166166
| <a name="output_vpc_owner_id"></a> [vpc\_owner\_id](#output\_vpc\_owner\_id) | The ID of the AWS account that owns the VPC |
167167
| <a name="output_vpc_secondary_cidr_blocks"></a> [vpc\_secondary\_cidr\_blocks](#output\_vpc\_secondary\_cidr\_blocks) | List of secondary CIDR blocks of the VPC |
168-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
168+
<!-- END_TF_DOCS -->

‎examples/ipam/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $ terraform destroy
2424

2525
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
2626

27-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
27+
<!-- BEGIN_TF_DOCS -->
2828
## Requirements
2929

3030
| Name | Version |
@@ -171,4 +171,4 @@ No inputs.
171171
| <a name="output_vpc_main_route_table_id"></a> [vpc\_main\_route\_table\_id](#output\_vpc\_main\_route\_table\_id) | The ID of the main route table associated with this VPC |
172172
| <a name="output_vpc_owner_id"></a> [vpc\_owner\_id](#output\_vpc\_owner\_id) | The ID of the AWS account that owns the VPC |
173173
| <a name="output_vpc_secondary_cidr_blocks"></a> [vpc\_secondary\_cidr\_blocks](#output\_vpc\_secondary\_cidr\_blocks) | List of secondary CIDR blocks of the VPC |
174-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
174+
<!-- END_TF_DOCS -->

‎examples/ipv6-dualstack/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ terraform apply
1414

1515
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
1616

17-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
17+
<!-- BEGIN_TF_DOCS -->
1818
## Requirements
1919

2020
| Name | Version |
@@ -155,4 +155,4 @@ No inputs.
155155
| <a name="output_vpc_main_route_table_id"></a> [vpc\_main\_route\_table\_id](#output\_vpc\_main\_route\_table\_id) | The ID of the main route table associated with this VPC |
156156
| <a name="output_vpc_owner_id"></a> [vpc\_owner\_id](#output\_vpc\_owner\_id) | The ID of the AWS account that owns the VPC |
157157
| <a name="output_vpc_secondary_cidr_blocks"></a> [vpc\_secondary\_cidr\_blocks](#output\_vpc\_secondary\_cidr\_blocks) | List of secondary CIDR blocks of the VPC |
158-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
158+
<!-- END_TF_DOCS -->

‎examples/ipv6-only/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $ terraform apply
1414

1515
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
1616

17-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
17+
<!-- BEGIN_TF_DOCS -->
1818
## Requirements
1919

2020
| Name | Version |
@@ -155,4 +155,4 @@ No inputs.
155155
| <a name="output_vpc_main_route_table_id"></a> [vpc\_main\_route\_table\_id](#output\_vpc\_main\_route\_table\_id) | The ID of the main route table associated with this VPC |
156156
| <a name="output_vpc_owner_id"></a> [vpc\_owner\_id](#output\_vpc\_owner\_id) | The ID of the AWS account that owns the VPC |
157157
| <a name="output_vpc_secondary_cidr_blocks"></a> [vpc\_secondary\_cidr\_blocks](#output\_vpc\_secondary\_cidr\_blocks) | List of secondary CIDR blocks of the VPC |
158-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
158+
<!-- END_TF_DOCS -->

‎examples/issues/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $ terraform apply
1919

2020
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
2121

22-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
22+
<!-- BEGIN_TF_DOCS -->
2323
## Requirements
2424

2525
| Name | Version |
@@ -73,4 +73,4 @@ No inputs.
7373
| <a name="output_issue_46_private_subnets"></a> [issue\_46\_private\_subnets](#output\_issue\_46\_private\_subnets) | List of IDs of private subnets |
7474
| <a name="output_issue_46_public_subnets"></a> [issue\_46\_public\_subnets](#output\_issue\_46\_public\_subnets) | List of IDs of public subnets |
7575
| <a name="output_issue_46_vpc_id"></a> [issue\_46\_vpc\_id](#output\_issue\_46\_vpc\_id) | The ID of the VPC |
76-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
76+
<!-- END_TF_DOCS -->

‎examples/manage-default-vpc/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $ terraform apply
1616

1717
Run `terraform destroy` when you don't need these resources.
1818

19-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
19+
<!-- BEGIN_TF_DOCS -->
2020
## Requirements
2121

2222
| Name | Version |
@@ -153,4 +153,4 @@ No inputs.
153153
| <a name="output_vpc_main_route_table_id"></a> [vpc\_main\_route\_table\_id](#output\_vpc\_main\_route\_table\_id) | The ID of the main route table associated with this VPC |
154154
| <a name="output_vpc_owner_id"></a> [vpc\_owner\_id](#output\_vpc\_owner\_id) | The ID of the AWS account that owns the VPC |
155155
| <a name="output_vpc_secondary_cidr_blocks"></a> [vpc\_secondary\_cidr\_blocks](#output\_vpc\_secondary\_cidr\_blocks) | List of secondary CIDR blocks of the VPC |
156-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
156+
<!-- END_TF_DOCS -->

0 commit comments

Comments
 (0)