Skip to content

Commit 03112a9

Browse files
authored
Merge pull request #12 from trussworks/deprecate-terraform-versions
deprecate older terraform versions
2 parents 9f00ab7 + d27f481 commit 03112a9

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ on:
1010

1111
jobs:
1212
validate:
13-
uses: trussworks/shared-actions/.github/workflows/validate.yml@main
13+
uses: trussworks/shared-actions/.github/workflows/validate-tf.yml@main

.pre-commit-config.yaml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.0.1
3+
rev: v4.4.0
44
hooks:
55
- id: check-json
66
- id: check-merge-conflict
@@ -10,14 +10,31 @@ repos:
1010
args:
1111
- --autofix
1212
- id: trailing-whitespace
13+
- id: check-symlinks
14+
- id: end-of-file-fixer
15+
- id: mixed-line-ending
16+
17+
- repo: https://github.com/executablebooks/mdformat
18+
rev: 0.7.16
19+
hooks:
20+
- id: mdformat
21+
additional_dependencies:
22+
- mdformat-gfm
23+
- mdformat-toc
24+
# mdformat fights with terraform_docs
25+
exclude: README.m(ark)?d(own)?
1326

1427
- repo: https://github.com/igorshubovych/markdownlint-cli
15-
rev: v0.28.1
28+
rev: v0.33.0
1629
hooks:
1730
- id: markdownlint
1831

32+
- repo: https://github.com/detailyang/pre-commit-shell
33+
rev: 1.0.5
34+
hooks:
35+
- id: shell-lint
36+
1937
- repo: https://github.com/antonbabenko/pre-commit-terraform
20-
rev: v1.75.0
38+
rev: v1.77.1
2139
hooks:
22-
- id: terraform_docs
2340
- id: terraform_fmt

README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ Creates the following resources:
77
* CloudWatch Event to trigger function on a schedule.
88
* AWS Lambda function to actually call Trusted Advisor APIs.
99

10-
## Terraform Versions
11-
12-
Terraform 0.13 and later. Pin module version to ~> 3.0.0. Submit pull-requests to master branch.
13-
14-
Terraform 0.12. Pin module version to ~> 2.0.0. Submit pull-requests to terraform012 branch.
15-
1610
## Usage
1711

1812
```hcl
@@ -27,12 +21,12 @@ module "trusted-advisor-refresh" {
2721
}
2822
```
2923

30-
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
24+
<!-- BEGIN_TF_DOCS -->
3125
## Requirements
3226

3327
| Name | Version |
3428
|------|---------|
35-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.0 |
29+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
3630
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0 |
3731

3832
## Providers
@@ -76,4 +70,4 @@ No modules.
7670
## Outputs
7771

7872
No outputs.
79-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
73+
<!-- END_TF_DOCS -->

main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,3 @@ resource "aws_lambda_function" "main" {
146146
Environment = var.environment
147147
}
148148
}
149-

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.13.0"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = ">= 3.0"

0 commit comments

Comments
 (0)