Skip to content

Commit 9931e6f

Browse files
author
Chris Gilmer
authored
Merge pull request #46 from trussworks/cg_pin
Pin tf version to 0.12 family. Update pre-commit.
2 parents badc985 + 174ecef commit 9931e6f

File tree

4 files changed

+19
-9
lines changed

4 files changed

+19
-9
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
references:
4-
circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:e66fbea875bcb788b29b1b5f59142e8231961ec5
4+
circleci_docker_primary: &circleci_docker_primary trussworks/circleci-docker-primary:822fac1c30f3bb7d5d595bed5d2dc86265c4f2f0
55

66
jobs:
77
terratest:

.pre-commit-config.yaml

+4-4
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: v2.5.0
3+
rev: v3.2.0
44
hooks:
55
- id: check-json
66
- id: check-merge-conflict
@@ -12,17 +12,17 @@ repos:
1212
- id: trailing-whitespace
1313

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

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

2525
- repo: git://github.com/golangci/golangci-lint
26-
rev: v1.23.8
26+
rev: v1.30.0
2727
hooks:
2828
- id: golangci-lint

README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,23 @@ module "acm_cert" {
2727
```
2828

2929
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
30+
## Requirements
31+
32+
| Name | Version |
33+
|------|---------|
34+
| terraform | ~> 0.12.0 |
35+
| aws | ~> 2.70 |
36+
3037
## Providers
3138

3239
| Name | Version |
3340
|------|---------|
34-
| aws | n/a |
41+
| aws | ~> 2.70 |
3542

3643
## Inputs
3744

3845
| Name | Description | Type | Default | Required |
39-
|------|-------------|------|---------|:-----:|
46+
|------|-------------|------|---------|:--------:|
4047
| alb\_listener\_arn | (Optional) Associate ACM certificate to and ALB listener. | `string` | `""` | no |
4148
| caa\_records | Add CAA records to route53. | `list(string)` | `[]` | no |
4249
| domain\_name | Domain name to associate with the ACM certificate. | `string` | n/a | yes |

versions.tf

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
21
terraform {
3-
required_version = ">= 0.12"
2+
required_version = "~> 0.12.0"
3+
4+
required_providers {
5+
aws = "~> 2.70"
6+
}
47
}

0 commit comments

Comments
 (0)