rekahsoft/blog-rekahsoft-ca
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Upgrade terraform from 0.11.x to 0.12

Browse Source 
Signed-off-by: Collin J. Doering <collin@rekahsoft.ca>
This commit is contained in:
Collin J. Doering 2019-06-13 22:57:31 -04:00
parent 1ee07aab1f
commit 9b779ec31b
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
3 changed files with 115 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
infra/main.tf
View File

@ -1,4 +1,6 @@
terraform {
required_version = ">= 0.12"
backend "s3" {
region = "ca-central-1"
bucket = "rekahsoft-terraform"
@ -8,12 +10,12 @@ terraform {
}
provider "aws" {
region = "${var.region}"
region = var.region
version = "~> 2.15"
assume_role = [{
role_arn = "${var.workspace_iam_roles[terraform.workspace]}"
}]
assume_role {
role_arn = var.workspace_iam_roles[terraform.workspace]
}
}
provider "aws" {
@ -21,9 +23,9 @@ provider "aws" {
region = "us-east-1"
version = "~> 2.1"
assume_role = [{
role_arn = "${var.workspace_iam_roles[terraform.workspace]}"
}]
assume_role {
role_arn = var.workspace_iam_roles[terraform.workspace]
}
}
provider "null" {
@ -42,29 +44,29 @@ provider "template" {
# Local values to be re-used throughout this template
locals {
common_tags = "${map(
"Project", "${var.project}",
"Environment", "${terraform.workspace}"
)}"
common_tags = {
"Project" = var.project
"Environment" = terraform.workspace
}
cdn_origin_id = "${terraform.workspace}-origin-cdn"
www = "${var.enable_naked_domain ? "" : "www."}"
subdomain = "${var.subdomain == "" ? "" : "${var.subdomain}."}"
www = var.enable_naked_domain ? "" : "www."
subdomain = var.subdomain == "" ? "" : "${var.subdomain}."
naked_domain = "${local.subdomain}${var.dns_apex}"
domain = "${local.www}${local.naked_domain}"
project_env = "${var.project}-${terraform.workspace}"
}
#
# Data Sources
data "template_file" "s3_origin_policy" {
template = "${file("templates/s3_origin_policy.json")}"
template = file("templates/s3_origin_policy.json")
vars {
bucket_arn = "${aws_s3_bucket.static.arn}"
user_arn = "${aws_iam_user.app_deploy.arn}"
cloudfront_arn = "${aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn}"
vars = {
bucket_arn = aws_s3_bucket.static.arn
user_arn = aws_iam_user.app_deploy.arn
cloudfront_arn = aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn
}
}
@ -72,38 +74,45 @@ data "aws_route53_zone" "external" {
name = "${var.dns_apex}."
}
#
# Resources
resource "aws_acm_certificate" "cert" {
domain_name = "${local.domain}"
subject_alternative_names = "${compact(list("${var.enable_naked_domain}" ? "" : "${local.naked_domain}"))}"
domain_name = local.domain
subject_alternative_names = compact([var.enable_naked_domain ? "" : local.naked_domain])
validation_method = "DNS"
tags = "${local.common_tags}"
tags = local.common_tags
provider = "aws.us_east_1"
provider = aws.us_east_1
}
resource "aws_route53_record" "cert_validation" {
count = "${1 + "${var.enable_naked_domain ? 0 : 1}"}"
count = 1 + (var.enable_naked_domain ? 0 : 1)
zone_id = "${data.aws_route53_zone.external.id}"
name = "${lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_name")}"
type = "${lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_type")}"
zone_id = data.aws_route53_zone.external.id
name = aws_acm_certificate.cert.domain_validation_options[count.index]["resource_record_name"]
type = aws_acm_certificate.cert.domain_validation_options[count.index]["resource_record_type"]
ttl = 60
records = ["${lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_value")}"]
# TF-UPGRADE-TODO: In Terraform v0.10 and earlier, it was sometimes necessary to
# force an interpolation expression to be interpreted as a list by wrapping it
# in an extra set of list brackets. That form was supported for compatibilty in
# v0.11, but is no longer supported in Terraform v0.12.
#
# If the expression in the following list itself returns a list, remove the
# brackets to avoid interpretation as a list of lists. If the expression
# returns a single list item then leave it as-is and remove this TODO comment.
records = [aws_acm_certificate.cert.domain_validation_options[count.index]["resource_record_value"]]
}
resource "aws_acm_certificate_validation" "cert" {
certificate_arn = "${aws_acm_certificate.cert.arn}"
validation_record_fqdns = ["${aws_route53_record.cert_validation.*.fqdn}"]
certificate_arn = aws_acm_certificate.cert.arn
validation_record_fqdns = aws_route53_record.cert_validation.*.fqdn
provider = "aws.us_east_1"
provider = aws.us_east_1
}
resource "aws_s3_bucket" "static" {
bucket_prefix = "${local.project_env}"
bucket_prefix = local.project_env
acl = "private"
website {
@ -111,24 +120,24 @@ resource "aws_s3_bucket" "static" {
error_document = "error.html"
}
tags = "${local.common_tags}"
tags = local.common_tags
}
resource "aws_s3_bucket" "static_redirect" {
count = "${var.enable_naked_domain ? 0 : 1}"
count = var.enable_naked_domain ? 0 : 1
bucket_prefix = "${local.project_env}"
bucket_prefix = local.project_env
acl = "private"
website {
redirect_all_requests_to = "https://${local.domain}"
}
tags = "${local.common_tags}"
tags = local.common_tags
}
resource "aws_s3_bucket" "static_logs" {
bucket_prefix = "${local.project_env}"
bucket_prefix = local.project_env
acl = "private"
}
@ -139,43 +148,43 @@ resource "random_string" "app_deploy_username" {
}
resource "aws_iam_user" "app_deploy" {
name = "${random_string.app_deploy_username.result}"
name = random_string.app_deploy_username.result
}
resource "aws_iam_access_key" "app_deploy" {
user = "${aws_iam_user.app_deploy.name}"
user = aws_iam_user.app_deploy.name
# pgp_key = "keybase:some_person_that_exists"
}
resource "aws_route53_record" "static" {
zone_id = "${data.aws_route53_zone.external.zone_id}"
zone_id = data.aws_route53_zone.external.zone_id
name = "${local.domain}."
type = "A"
alias {
name = "${aws_cloudfront_distribution.cdn.domain_name}"
zone_id = "${aws_cloudfront_distribution.cdn.hosted_zone_id}"
name = aws_cloudfront_distribution.cdn.domain_name
zone_id = aws_cloudfront_distribution.cdn.hosted_zone_id
evaluate_target_health = true
}
}
resource "aws_route53_record" "static_redirect" {
count = "${var.enable_naked_domain ? 0 : 1}"
count = var.enable_naked_domain ? 0 : 1
zone_id = "${data.aws_route53_zone.external.zone_id}"
zone_id = data.aws_route53_zone.external.zone_id
name = "${local.naked_domain}."
type = "A"
alias {
name = "${aws_cloudfront_distribution.cdn_redirect.domain_name}"
zone_id = "${aws_cloudfront_distribution.cdn_redirect.hosted_zone_id}"
name = aws_cloudfront_distribution.cdn_redirect[0].domain_name
zone_id = aws_cloudfront_distribution.cdn_redirect[0].hosted_zone_id
evaluate_target_health = true
}
}
resource "aws_s3_bucket_policy" "static_policy" {
bucket = "${aws_s3_bucket.static.id}"
policy = "${data.template_file.s3_origin_policy.rendered}"
bucket = aws_s3_bucket.static.id
policy = data.template_file.s3_origin_policy.rendered
}
resource "aws_cloudfront_origin_access_identity" "origin_access_identity" {
@ -185,11 +194,11 @@ resource "aws_cloudfront_origin_access_identity" "origin_access_identity" {
resource "aws_cloudfront_distribution" "cdn" {
# Static file origin
origin {
domain_name = "${aws_s3_bucket.static.bucket_regional_domain_name}"
origin_id = "${local.cdn_origin_id}"
domain_name = aws_s3_bucket.static.bucket_regional_domain_name
origin_id = local.cdn_origin_id
s3_origin_config {
origin_access_identity = "${aws_cloudfront_origin_access_identity.origin_access_identity.cloudfront_access_identity_path}"
origin_access_identity = aws_cloudfront_origin_access_identity.origin_access_identity.cloudfront_access_identity_path
}
}
@ -208,15 +217,23 @@ resource "aws_cloudfront_distribution" "cdn" {
logging_config {
include_cookies = false
bucket = "${aws_s3_bucket.static_logs.bucket_domain_name}"
bucket = aws_s3_bucket.static_logs.bucket_domain_name
}
aliases = ["${local.domain}"]
# TF-UPGRADE-TODO: In Terraform v0.10 and earlier, it was sometimes necessary to
# force an interpolation expression to be interpreted as a list by wrapping it
# in an extra set of list brackets. That form was supported for compatibilty in
# v0.11, but is no longer supported in Terraform v0.12.
#
# If the expression in the following list itself returns a list, remove the
# brackets to avoid interpretation as a list of lists. If the expression
# returns a single list item then leave it as-is and remove this TODO comment.
aliases = [local.domain]
default_cache_behavior {
allowed_methods = ["GET", "HEAD", "OPTIONS"]
cached_methods = ["GET", "HEAD", "OPTIONS"]
target_origin_id = "${local.cdn_origin_id}"
target_origin_id = local.cdn_origin_id
forwarded_values {
query_string = false
@ -237,7 +254,7 @@ resource "aws_cloudfront_distribution" "cdn" {
path_pattern = "index.html"
allowed_methods = ["GET", "HEAD", "OPTIONS"]
cached_methods = ["GET", "HEAD", "OPTIONS"]
target_origin_id = "${local.cdn_origin_id}"
target_origin_id = local.cdn_origin_id
forwarded_values {
query_string = false
@ -262,22 +279,22 @@ resource "aws_cloudfront_distribution" "cdn" {
}
}
tags = "${local.common_tags}"
tags = local.common_tags
viewer_certificate {
acm_certificate_arn = "${aws_acm_certificate_validation.cert.certificate_arn}"
acm_certificate_arn = aws_acm_certificate_validation.cert.certificate_arn
ssl_support_method = "sni-only"
minimum_protocol_version = "TLSv1.1_2016"
}
}
resource "aws_cloudfront_distribution" "cdn_redirect" {
count = "${var.enable_naked_domain ? 0 : 1}"
count = var.enable_naked_domain ? 0 : 1
# Static file origin
origin {
domain_name = "${aws_s3_bucket.static_redirect.id}.${aws_s3_bucket.static_redirect.website_domain}"
origin_id = "${local.cdn_origin_id}"
domain_name = "${aws_s3_bucket.static_redirect[0].id}.${aws_s3_bucket.static_redirect[0].website_domain}"
origin_id = local.cdn_origin_id
custom_origin_config {
http_port = 80
@ -294,15 +311,23 @@ resource "aws_cloudfront_distribution" "cdn_redirect" {
logging_config {
include_cookies = false
bucket = "${aws_s3_bucket.static_logs.bucket_domain_name}"
bucket = aws_s3_bucket.static_logs.bucket_domain_name
}
aliases = ["${local.naked_domain}"]
# TF-UPGRADE-TODO: In Terraform v0.10 and earlier, it was sometimes necessary to
# force an interpolation expression to be interpreted as a list by wrapping it
# in an extra set of list brackets. That form was supported for compatibilty in
# v0.11, but is no longer supported in Terraform v0.12.
#
# If the expression in the following list itself returns a list, remove the
# brackets to avoid interpretation as a list of lists. If the expression
# returns a single list item then leave it as-is and remove this TODO comment.
aliases = [local.naked_domain]
default_cache_behavior {
allowed_methods = ["GET", "HEAD", "OPTIONS"]
cached_methods = ["GET", "HEAD", "OPTIONS"]
target_origin_id = "${local.cdn_origin_id}"
target_origin_id = local.cdn_origin_id
forwarded_values {
query_string = false
@ -326,10 +351,10 @@ resource "aws_cloudfront_distribution" "cdn_redirect" {
}
}
tags = "${local.common_tags}"
tags = local.common_tags
viewer_certificate {
acm_certificate_arn = "${aws_acm_certificate_validation.cert.certificate_arn}"
acm_certificate_arn = aws_acm_certificate_validation.cert.certificate_arn
ssl_support_method = "sni-only"
minimum_protocol_version = "TLSv1.1_2016"
}
@ -354,5 +379,7 @@ aws --profile ${aws_iam_user.app_deploy.name} s3 sync --delete ../_site s3://${a
: Cleanup temporary aws config and credentials files
rm $${AWS_CONFIG_FILE} $${AWS_SHARED_CREDENTIALS_FILE};
SCRIPT
}
}

3
infra/outputs.tf
View File

@ -1,3 +1,4 @@
output "s3_bucket_static" {
value = "${aws_s3_bucket.static.id}"
value = aws_s3_bucket.static.id
}

4
infra/variables.tf
View File

@ -14,7 +14,8 @@ variable "project" {
default = "blog-rekahsoft-ca"
}
variable "dns_apex" {}
variable "dns_apex" {
}
variable "subdomain" {
default = ""
@ -23,3 +24,4 @@ variable "subdomain" {
variable "enable_naked_domain" {
default = false
}