Skip to content

Commit 0c8aeac

Browse files
authored
feat: Updated version requirements to support Terraform 0.14 also (terraform-aws-modules#66)
1 parent 03840e6 commit 0c8aeac

File tree

11 files changed

+54
-18
lines changed

11 files changed

+54
-18
lines changed

.pre-commit-config.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
11
repos:
22
- repo: git://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.31.0
3+
rev: v1.44.0
44
hooks:
55
- id: terraform_fmt
6+
- id: terraform_validate
67
- id: terraform_docs
8+
- id: terraform_tflint
9+
args:
10+
- '--args=--only=terraform_deprecated_interpolation'
11+
- '--args=--only=terraform_deprecated_index'
12+
- '--args=--only=terraform_unused_declarations'
13+
- '--args=--only=terraform_comment_syntax'
14+
- '--args=--only=terraform_documented_outputs'
15+
- '--args=--only=terraform_documented_variables'
16+
- '--args=--only=terraform_typed_variables'
17+
- '--args=--only=terraform_module_pinned_source'
18+
- '--args=--only=terraform_naming_convention'
19+
- '--args=--only=terraform_required_version'
20+
- '--args=--only=terraform_required_providers'
21+
- '--args=--only=terraform_standard_module_structure'
22+
- '--args=--only=terraform_workspace_remote'
723
- repo: git://github.com/pre-commit/pre-commit-hooks
8-
rev: v3.1.0
24+
rev: v3.3.0
925
hooks:
1026
- id: check-merge-conflict

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ module "acm" {
6868

6969
| Name | Version |
7070
|------|---------|
71-
| terraform | >= 0.12.6, < 0.14 |
72-
| aws | >= 2.53, < 4.0 |
71+
| terraform | >= 0.12.6 |
72+
| aws | >= 2.53 |
7373

7474
## Providers
7575

7676
| Name | Version |
7777
|------|---------|
78-
| aws | >= 2.53, < 4.0 |
78+
| aws | >= 2.53 |
7979

8080
## Inputs
8181

examples/complete-dns-validation/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ Note that this example may create resources which cost money. Run `terraform des
2121
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2222
## Requirements
2323

24-
No requirements.
24+
| Name | Version |
25+
|------|---------|
26+
| terraform | >= 0.12.6 |
27+
| aws | >= 2.53 |
2528

2629
## Providers
2730

2831
| Name | Version |
2932
|------|---------|
30-
| aws | n/a |
33+
| aws | >= 2.53 |
3134

3235
## Inputs
3336

examples/complete-dns-validation/variables.tf

Whitespace-only changes.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
terraform {
2+
required_version = ">= 0.12.6"
3+
4+
required_providers {
5+
aws = ">= 2.53"
6+
}
7+
}

examples/complete-email-validation/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ Note that this example may create resources which cost money. Run `terraform des
3434
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
3535
## Requirements
3636

37-
No requirements.
37+
| Name | Version |
38+
|------|---------|
39+
| terraform | >= 0.12.6 |
40+
| aws | >= 2.53 |
3841

3942
## Providers
4043

4144
| Name | Version |
4245
|------|---------|
43-
| aws | n/a |
46+
| aws | >= 2.53 |
4447

4548
## Inputs
4649

examples/complete-email-validation/main.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
variable "domain_name" {
2-
description = "Domain name to use as Route53 zone and ACM certificate"
3-
default = "my-domain-name2.com"
4-
}
5-
61
resource "aws_route53_zone" "this" {
72
name = var.domain_name
83
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
variable "domain_name" {
2+
description = "Domain name to use as Route53 zone and ACM certificate"
3+
type = string
4+
default = "my-domain-name2.com"
5+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
terraform {
2+
required_version = ">= 0.12.6"
3+
4+
required_providers {
5+
aws = ">= 2.53"
6+
}
7+
}

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
locals {
2-
// Get distinct list of domains and SANs
2+
# Get distinct list of domains and SANs
33
distinct_domain_names = distinct(concat([var.domain_name], [for s in var.subject_alternative_names : replace(s, "*.", "")]))
44

5-
// Copy domain_validation_options for the distinct domain names
5+
# Copy domain_validation_options for the distinct domain names
66
validation_domains = var.create_certificate ? [for k, v in aws_acm_certificate.this[0].domain_validation_options : tomap(v) if contains(local.distinct_domain_names, replace(v.domain_name, "*.", ""))] : []
77
}
88

0 commit comments

Comments
 (0)