Skip to content

Commit 1a70a36

Browse files
authored
Merge pull request #8 from trussworks/relax_tf
Relaxing terraform version, update precommit & circleci
2 parents f51b757 + 14c4392 commit 1a70a36

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
- auth:
55
password: $DOCKER_PASSWORD
66
username: $DOCKER_USERNAME
7-
image: trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a
7+
image: trussworks/circleci:efb1042e31538677779971798e0912390f699e72
88
steps:
99
- checkout
1010
- restore_cache:
@@ -17,8 +17,6 @@ jobs:
1717
key: pre-commit-dot-cache-{{ checksum ".pre-commit-config.yaml" }}
1818
paths:
1919
- ~/.cache/pre-commit
20-
references:
21-
circleci: trussworks/circleci:6986bb9022e5a83599feb66a7128a2d0fa12732a
2220
version: 2.1
2321
workflows:
2422
validate:

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: git://github.com/pre-commit/pre-commit-hooks
3-
rev: v3.2.0
3+
rev: v3.4.0
44
hooks:
55
- id: check-json
66
- id: check-merge-conflict
@@ -12,12 +12,12 @@ repos:
1212
- id: trailing-whitespace
1313

1414
- repo: git://github.com/igorshubovych/markdownlint-cli
15-
rev: v0.23.2
15+
rev: v0.26.0
1616
hooks:
1717
- id: markdownlint
1818

1919
- repo: git://github.com/antonbabenko/pre-commit-terraform
20-
rev: v1.37.0
20+
rev: v1.45.0
2121
hooks:
2222
- id: terraform_docs
2323
- id: terraform_fmt

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Creates the following resources:
99

1010
## Terraform Versions
1111

12-
Terraform 0.12. Pin module version to ~> 2.0.0. Submit pull-requests to master branch.
12+
Terraform 0.13 and later. Pin module version to ~> 3.0.0. Submit pull-requests to master branch.
1313

14-
Terraform 0.11. Pin module version to ~> 1.0.0. Submit pull-requests to terraform011 branch.
14+
Terraform 0.12. Pin module version to ~> 2.0.0. Submit pull-requests to terraform012 branch.
1515

1616
## Usage
1717

@@ -32,14 +32,14 @@ module "trusted-advisor-refresh" {
3232

3333
| Name | Version |
3434
|------|---------|
35-
| terraform | ~> 0.12.0 |
36-
| aws | ~> 2.70 |
35+
| terraform | >= 0.13.0 |
36+
| aws | >= 3.0 |
3737

3838
## Providers
3939

4040
| Name | Version |
4141
|------|---------|
42-
| aws | ~> 2.70 |
42+
| aws | >= 3.0 |
4343

4444
## Inputs
4545

versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
2-
required_version = "~> 0.12.0"
2+
required_version = ">= 0.13.0"
33

44
required_providers {
5-
aws = "~> 2.70"
5+
aws = ">= 3.0"
66
}
77
}

0 commit comments

Comments
 (0)