Skip to content

Commit 636669a

Browse files
grzesjamgrzesjam
committed
Upgrade everything for terraform 1.0
1 parent 1898541 commit 636669a

File tree

75 files changed

+958
-545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+958
-545
lines changed

‎.binaries‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
terraform-docs 0.9.1 https://github.com/segmentio/terraform-docs/releases/download/v{version}/terraform-docs-v{version}-{platform}-amd64
2-
packer 1.5.4 https://releases.hashicorp.com/packer/{version}/packer_{version}_{platform}_amd64.zip
3-
terraform-12 0.12.29 https://releases.hashicorp.com/terraform/{version}/terraform_{version}_{platform}_amd64.zip|terraform
4-
terraform-13 0.13.0 https://releases.hashicorp.com/terraform/{version}/terraform_{version}_{platform}_amd64.zip|terraform
1+
terraform-docs 0.15.0 https://github.com/segmentio/terraform-docs/releases/download/v{version}/terraform-docs-v{version}-{platform}-amd64.tar.gz
2+
packer 1.6.6 https://releases.hashicorp.com/packer/{version}/packer_{version}_{platform}_amd64.zip
3+
terraform-1 1.0.5 https://releases.hashicorp.com/terraform/{version}/terraform_{version}_{platform}_amd64.zip|terraform

‎.binaries.lock‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
terraform-docs darwin c116f09a64e121d37edf83d93fef784035b4809a7ffef1eee5e4dc440629e3b7
2-
packer darwin dab5ab9d4801da5206755856bc3f026942ce18391419202a1b0b442c1c2e591d
3-
terraform-docs linux ceb4e7f291d43a5f7672f7ca9543075554bacd02cf850e6402e74f18fbf28f7e
4-
packer linux c7277f64d217c7d9ccfd936373fe352ea935454837363293f8668f9e42d8d99d
5-
terraform-12 darwin fdcda98ff7b7e65832248f64ef6c2922e05036de25d40c5cdcd732c5117150aa
6-
terraform-13 darwin 080af0420732cd08941aa4c0d2b4693056b24366724faa11b107bf052f7de203
7-
terraform-12 linux 872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d
8-
terraform-13 linux 9ed437560faf084c18716e289ea712c784a514bdd7f2796549c735d439dbe378
1+
terraform-docs linux e0b399d9dc2eb97853a7e12f1ae678e7160cae4c811646ce70169a8d611f6cf9
2+
packer linux 721d119fd70e38d6f2b4ccd8a39daf6b4d36bf5f7640036acafcaaa967b00c3b
3+
terraform-1 linux 7ce24478859ab7ca0ba4d8c9c12bb345f52e8efdc42fa3ef9dd30033dbf4b561

‎.github/workflows/pull_request.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
name: Validate
2020
strategy:
2121
matrix:
22-
terraform: [12, 13]
22+
terraform: [1]
2323
runs-on: ubuntu-latest
2424
steps:
2525
- uses: actions/checkout@v2

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ override.tf.json
1717
*_override.tf
1818
*_override.tf.json
1919
*.gen.*
20+
*.terraform.lock.hcl

‎modules/aws-acm-certificate/README.md‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,40 @@
1-
# AWS Generate Cert
1+
# AWS Generate Cert
22
Simple module creating SSL certificate for domain including all necessary Route53 records .
33

44
## Requirements
55

66
| Name | Version |
77
|------|---------|
8-
| terraform | >= 0.12.6, < 0.14 |
9-
| aws | >= 2.49, < 4.0 |
8+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
9+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~>3.0, < 4.0 |
1010

1111
## Providers
1212

1313
| Name | Version |
1414
|------|---------|
15-
| aws | >= 2.49, < 4.0 |
15+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~>3.0, < 4.0 |
16+
17+
## Modules
18+
19+
No modules.
20+
21+
## Resources
22+
23+
| Name | Type |
24+
|------|------|
25+
| [aws_acm_certificate.cert](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate) | resource |
26+
| [aws_acm_certificate_validation.cert](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate_validation) | resource |
27+
| [aws_route53_record.cert_validation](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_record) | resource |
1628

1729
## Inputs
1830

1931
| Name | Description | Type | Default | Required |
2032
|------|-------------|------|---------|:--------:|
21-
| domain | Domain for which certificate is going to be created | `string` | n/a | yes |
22-
| zone\_id | Route53 zone id. | `string` | n/a | yes |
33+
| <a name="input_domain"></a> [domain](#input\_domain) | Domain for which certificate is going to be created | `string` | n/a | yes |
34+
| <a name="input_zone_id"></a> [zone\_id](#input\_zone\_id) | Route53 zone id. | `string` | n/a | yes |
2335

2436
## Outputs
2537

2638
| Name | Description |
2739
|------|-------------|
28-
| certificate\_arn | n/a |
29-
40+
| <a name="output_certificate_arn"></a> [certificate\_arn](#output\_certificate\_arn) | n/a |

‎modules/aws-acm-certificate/example/main.tf‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
terraform {
2+
required_providers {
3+
aws = "~>3.0"
4+
}
5+
}
6+
17
provider "aws" {
2-
version = "~>3.0"
3-
region = "us-east-1"
8+
region = "us-east-1"
49
}
510

611
resource "aws_route53_zone" "zone" {

‎modules/aws-acm-certificate/main.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ resource "aws_acm_certificate_validation" "cert" {
1111
resource "aws_acm_certificate" "cert" {
1212
domain_name = var.domain
1313
validation_method = "DNS"
14+
lifecycle {
15+
create_before_destroy = true
16+
}
1417
}
1518

1619
resource "aws_route53_record" "cert_validation" {

‎modules/aws-acm-certificate/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.6, < 0.14"
2+
required_version = ">= 1.0"
33

44
required_providers {
5-
aws = ">= 2.49, < 4.0"
5+
aws = "~>3.0, < 4.0"
66
}
77
}

‎modules/aws-acm-multi-zone/README.md‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
1-
# AWS Generate multi zone cert
2-
Module for creating SSL certificate for multiple domains in different route53 zones (eg. different TLD domains).
1+
# AWS Generate multi zone cert
2+
Module for creating SSL certificate for multiple domains in different route53 zones (eg. different TLD domains).
33
Limitation: Wildcard domains.
44

55
## Requirements
66

77
| Name | Version |
88
|------|---------|
9-
| terraform | >= 0.12.6, < 0.14 |
10-
| aws | >= 3.0, < 4.0 |
9+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
10+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.0, < 4.0 |
1111

1212
## Providers
1313

1414
| Name | Version |
1515
|------|---------|
16-
| aws | >= 3.0, < 4.0 |
16+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.0, < 4.0 |
17+
18+
## Modules
19+
20+
No modules.
21+
22+
## Resources
23+
24+
| Name | Type |
25+
|------|------|
26+
| [aws_acm_certificate.cert](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate) | resource |
27+
| [aws_acm_certificate_validation.cert](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/acm_certificate_validation) | resource |
28+
| [aws_route53_record.cert_validation](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_record) | resource |
1729

1830
## Inputs
1931

2032
| Name | Description | Type | Default | Required |
2133
|------|-------------|------|---------|:--------:|
22-
| certificates | A mapping of hosted zone name to domains. | `map(list(string))` | n/a | yes |
23-
| tags | Tags to be added to ACM. | `map(string)` | `{}` | no |
34+
| <a name="input_certificates"></a> [certificates](#input\_certificates) | A mapping of hosted zone name to domains. | `map(list(string))` | n/a | yes |
35+
| <a name="input_tags"></a> [tags](#input\_tags) | Tags to be added to ACM. | `map(string)` | `{}` | no |
2436

2537
## Outputs
2638

2739
| Name | Description |
2840
|------|-------------|
29-
| certificate\_arn | ARN of ACM certificate |
30-
| list\_of\_domains | Domains that ACM certificate was created for |
31-
41+
| <a name="output_certificate_arn"></a> [certificate\_arn](#output\_certificate\_arn) | ARN of ACM certificate |
42+
| <a name="output_list_of_domains"></a> [list\_of\_domains](#output\_list\_of\_domains) | Domains that ACM certificate was created for |

‎modules/aws-acm-multi-zone/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.12.6, < 0.14"
2+
required_version = ">= 1.0"
33

44
required_providers {
55
aws = ">= 3.0, < 4.0"

0 commit comments

Comments
 (0)