upgrade Terraform to 0.14, as well as providers and modules

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2021-03-30 11:01:15 +02:00
parent e50f2db95b
commit e83cb3acd1
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
6 changed files with 15 additions and 20 deletions

7
.gitignore vendored
View File

@ -1,15 +1,10 @@
.terraform/
.terraform.lock.hcl
*.tfstate
*.tfstate.d/
*.tfstate.backup
*.tfstate.*.backup
*.tfvars
*.retry
*.zip
ansible/files/*
google-cloud.json
files/sesforwarder.zip

View File

@ -11,11 +11,11 @@ resource "aws_acm_certificate" "main" {
resource "aws_route53_record" "cert_verification" {
zone_id = var.zone_id
name = replace(aws_acm_certificate.main.domain_validation_options[count.index].resource_record_name, ".${var.domain}.", "")
type = aws_acm_certificate.main.domain_validation_options[count.index].resource_record_type
name = replace(tolist(aws_acm_certificate.main.domain_validation_options)[count.index].resource_record_name, ".${var.domain}.", "")
type = tolist(aws_acm_certificate.main.domain_validation_options)[count.index].resource_record_type
ttl = 300
records = [aws_acm_certificate.main.domain_validation_options[count.index].resource_record_value]
count = length(var.sans)+1
records = [tolist(aws_acm_certificate.main.domain_validation_options)[count.index].resource_record_value]
count = length(aws_acm_certificate.main.domain_validation_options)
}
resource "aws_acm_certificate_validation" "main" {

View File

@ -8,7 +8,7 @@ data "aws_availability_zones" "available" {
}
module "vpc" {
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=0.17.0"
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=0.21.1"
namespace = ""
stage = var.stage
@ -17,7 +17,7 @@ module "vpc" {
}
module "subnets" {
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=0.30.0"
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=0.38.0"
availability_zones = slice(data.aws_availability_zones.available.names, 0, var.max_availability_zones)
namespace = ""
@ -31,7 +31,7 @@ module "subnets" {
}
module "eb_application" {
source = "git::https://github.com/cloudposse/terraform-aws-elastic-beanstalk-application.git?ref=0.7.1"
source = "git::https://github.com/cloudposse/terraform-aws-elastic-beanstalk-application.git?ref=0.11.0"
name = local.app_name
description = "${local.fqdn} application"
@ -40,7 +40,7 @@ module "eb_application" {
}
module "eb_environment" {
source = "git::https://github.com/cloudposse/terraform-aws-elastic-beanstalk-environment.git?ref=0.30.0"
source = "git::https://github.com/cloudposse/terraform-aws-elastic-beanstalk-environment.git?ref=0.38.0"
description = "Dapp Discovery Store - ${local.fqdn}"
name = local.app_name

View File

@ -1,9 +1,9 @@
terraform {
required_version = "~> 0.13.3"
required_version = "~> 0.14.4"
required_providers {
aws = {
source = "hashicorp/aws"
version = "= 2.46.0"
version = "= 3.34.0"
}
}
}

View File

@ -1,9 +1,9 @@
terraform {
required_version = "~> 0.13.3"
required_version = "~> 0.14.4"
required_providers {
aws = {
source = "hashicorp/aws"
version = "= 2.46.0"
version = "= 3.34.0"
}
ansible = {
source = "nbering/ansible"

View File

@ -1,10 +1,10 @@
terraform {
required_version = "~> 0.13.3"
required_version = ">= 0.14.4"
required_providers {
aws = {
source = "hashicorp/aws"
version = "= 2.46.0"
version = "= 3.34.0"
}
ansible = {
source = "nbering/ansible"