Skip to content

Commit

Permalink
Update terraform files to address deprecation warnings. (#2670)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DailyDreaming
DailyDreaming committed Dec 4, 2019
1 parent eee134a commit a1dd5ae
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 118 deletions.
10 changes: 5 additions & 5 deletions infra/async_state_db/main.tf
View file
Expand Up @@ -4,10 +4,10 @@ locals {
common_tags = "${map(
"managedBy" , "terraform",
"Name" , "${var.DSS_INFRA_TAG_SERVICE}-asyncdynamodb",
"project" , "${var.DSS_INFRA_TAG_PROJECT}",
"env" , "${var.DSS_DEPLOYMENT_STAGE}",
"service" , "${var.DSS_INFRA_TAG_SERVICE}",
"owner" , "${var.DSS_INFRA_TAG_OWNER}"
"project" , var.DSS_INFRA_TAG_PROJECT,
"env" , var.DSS_DEPLOYMENT_STAGE,
"service" , var.DSS_INFRA_TAG_SERVICE,
"owner" , var.DSS_INFRA_TAG_OWNER
)}"
}

Expand All @@ -26,5 +26,5 @@ resource "aws_dynamodb_table" "sfn_state" {
type = "S"
}

tags = "${local.common_tags}"
tags = local.common_tags
}
60 changes: 30 additions & 30 deletions infra/buckets/gs.tf
View file
@@ -1,58 +1,58 @@
resource google_storage_bucket dss_gs_bucket {
name = "${var.DSS_GS_BUCKET}"
provider = "google"
name = var.DSS_GS_BUCKET
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
}

resource google_storage_bucket dss_gs_bucket_test {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
name = "${var.DSS_GS_BUCKET_TEST}"
provider = "google"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
name = var.DSS_GS_BUCKET_TEST
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
lifecycle_rule {
action {
type = "Delete"
}
condition {
age = "${var.DSS_BLOB_TTL_DAYS}"
age = var.DSS_BLOB_TTL_DAYS
with_state = "LIVE"
}
}
}

resource google_storage_bucket dss_gs_bucket_test_fixtures {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
name = "${var.DSS_GS_BUCKET_TEST_FIXTURES}"
provider = "google"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
name = var.DSS_GS_BUCKET_TEST_FIXTURES
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
}

resource google_storage_bucket dss_gs_checkout_bucket {
name = "${var.DSS_GS_CHECKOUT_BUCKET}"
provider = "google"
name = var.DSS_GS_CHECKOUT_BUCKET
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
lifecycle_rule {
action {
type = "Delete"
}
condition {
age = "${var.DSS_BLOB_TTL_DAYS}"
age = var.DSS_BLOB_TTL_DAYS
matches_storage_class = ["STANDARD"]
with_state = "LIVE"
}
}
}

locals {
checkout_bucket_viewers = "${compact(split(",", var.DSS_CHECKOUT_BUCKET_OBJECT_VIEWERS))}"
checkout_bucket_viewers = compact(split(",", var.DSS_CHECKOUT_BUCKET_OBJECT_VIEWERS))
gcp_tags = "${map(
"name" , "${var.DSS_INFRA_TAG_SERVICE}-gs-storage",
"owner" , "${element(split("@", var.DSS_INFRA_TAG_OWNER),0)}",
Expand All @@ -61,43 +61,43 @@ locals {
}

resource "google_storage_bucket_iam_member" "checkout_viewer" {
count = "${length(local.checkout_bucket_viewers)}"
bucket = "${google_storage_bucket.dss_gs_checkout_bucket.name}"
count = length(local.checkout_bucket_viewers)
bucket = google_storage_bucket.dss_gs_checkout_bucket.name
role = "roles/storage.objectViewer"
member = "${local.checkout_bucket_viewers[count.index]}"
member = local.checkout_bucket_viewers[count.index]
}

resource google_storage_bucket dss_gs_checkout_bucket_test {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
name = "${var.DSS_GS_CHECKOUT_BUCKET_TEST}"
provider = "google"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
name = var.DSS_GS_CHECKOUT_BUCKET_TEST
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
lifecycle_rule {
action {
type = "Delete"
}
condition {
age = "${var.DSS_BLOB_TTL_DAYS}"
age = var.DSS_BLOB_TTL_DAYS
with_state = "LIVE"
}
}
}

resource google_storage_bucket dss_gs_checkout_bucket_test_user {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
name = "${var.DSS_GS_CHECKOUT_BUCKET_TEST_USER}"
provider = "google"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
name = var.DSS_GS_CHECKOUT_BUCKET_TEST_USER
provider = google
location = "US"
storage_class = "MULTI_REGIONAL"
labels = "${merge(local.common_tags, local.gcp_tags)}"
labels = merge(local.common_tags, local.gcp_tags)
lifecycle_rule {
action {
type = "Delete"
}
condition {
age = "${var.DSS_BLOB_TTL_DAYS}"
age = var.DSS_BLOB_TTL_DAYS
with_state = "LIVE"
}
}
Expand Down
64 changes: 32 additions & 32 deletions infra/buckets/s3.tf
View file
Expand Up @@ -14,41 +14,41 @@ locals {
}

resource aws_s3_bucket dss_s3_bucket {
count = "${length(var.DSS_S3_BUCKET) > 0 ? 1 : 0}"
bucket = "${var.DSS_S3_BUCKET}"
count = length(var.DSS_S3_BUCKET) > 0 ? 1 : 0
bucket = var.DSS_S3_BUCKET
server_side_encryption_configuration {
rule {
apply_server_side_encryption_by_default {
sse_algorithm = "AES256"
}
}
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
}

resource aws_s3_bucket dss_s3_bucket_test {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
bucket = "${var.DSS_S3_BUCKET_TEST}"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
bucket = var.DSS_S3_BUCKET_TEST
lifecycle_rule {
id = "prune old things"
enabled = true
abort_incomplete_multipart_upload_days = "${var.DSS_BLOB_TTL_DAYS}"
abort_incomplete_multipart_upload_days = var.DSS_BLOB_TTL_DAYS
expiration {
days = "${var.DSS_BLOB_TTL_DAYS}"
days = var.DSS_BLOB_TTL_DAYS
}
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
}

resource aws_s3_bucket dss_s3_bucket_test_fixtures {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
bucket = "${var.DSS_S3_BUCKET_TEST_FIXTURES}"
tags = "${merge(local.common_tags, local.aws_tags)}"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
bucket = var.DSS_S3_BUCKET_TEST_FIXTURES
tags = merge(local.common_tags, local.aws_tags)
}

resource aws_s3_bucket dss_s3_checkout_bucket {
count = "${length(var.DSS_S3_CHECKOUT_BUCKET) > 0 ? 1 : 0}"
bucket = "${var.DSS_S3_CHECKOUT_BUCKET}"
count = length(var.DSS_S3_CHECKOUT_BUCKET) > 0 ? 1 : 0
bucket = var.DSS_S3_CHECKOUT_BUCKET
server_side_encryption_configuration {
rule {
apply_server_side_encryption_by_default {
Expand All @@ -63,15 +63,15 @@ resource aws_s3_bucket dss_s3_checkout_bucket {
"uncached" = "true"
}
expiration {
days = "${var.DSS_BLOB_TTL_DAYS}"
days = var.DSS_BLOB_TTL_DAYS
}
}
lifecycle_rule {
id = "failed multipart cleanup"
enabled = true
abort_incomplete_multipart_upload_days = "${var.DSS_BLOB_TTL_DAYS}"
abort_incomplete_multipart_upload_days = var.DSS_BLOB_TTL_DAYS
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
cors_rule {
allowed_methods = [
"HEAD",
Expand All @@ -88,37 +88,37 @@ resource aws_s3_bucket dss_s3_checkout_bucket {
}

resource aws_s3_bucket dss_s3_checkout_bucket_test {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
bucket = "${var.DSS_S3_CHECKOUT_BUCKET_TEST}"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
bucket = var.DSS_S3_CHECKOUT_BUCKET_TEST
lifecycle_rule {
id = "dss_checkout_expiration"
enabled = true
abort_incomplete_multipart_upload_days = "${var.DSS_BLOB_TTL_DAYS}"
abort_incomplete_multipart_upload_days = var.DSS_BLOB_TTL_DAYS
expiration {
days = "${var.DSS_BLOB_TTL_DAYS}"
days = var.DSS_BLOB_TTL_DAYS
}
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
}

resource aws_s3_bucket dss_s3_checkout_bucket_test_user {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
bucket = "${var.DSS_S3_CHECKOUT_BUCKET_TEST_USER}"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
bucket = var.DSS_S3_CHECKOUT_BUCKET_TEST_USER
lifecycle_rule {
id = "dss_checkout_expiration"
enabled = true
abort_incomplete_multipart_upload_days = "${var.DSS_BLOB_TTL_DAYS}"
abort_incomplete_multipart_upload_days = var.DSS_BLOB_TTL_DAYS
expiration {
days = "${var.DSS_BLOB_TTL_DAYS}"
days = var.DSS_BLOB_TTL_DAYS
}
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
}

resource aws_s3_bucket dss_s3_checkout_bucket_unwritable {
count = "${var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0}"
bucket = "${var.DSS_S3_CHECKOUT_BUCKET_UNWRITABLE}"
tags = "${merge(local.common_tags, local.aws_tags)}"
count = var.DSS_DEPLOYMENT_STAGE == "dev" ? 1 : 0
bucket = var.DSS_S3_CHECKOUT_BUCKET_UNWRITABLE
tags = merge(local.common_tags, local.aws_tags)
policy = <<POLICY
{
"Version": "2012-10-17",
Expand Down Expand Up @@ -152,8 +152,8 @@ POLICY
}

resource aws_s3_bucket dss_s3_events_bucket {
count = "${length(var.DSS_FLASHFLOOD_BUCKET) > 0 ? 1 : 0}"
bucket = "${var.DSS_FLASHFLOOD_BUCKET}"
count = length(var.DSS_FLASHFLOOD_BUCKET) > 0 ? 1 : 0
bucket = var.DSS_FLASHFLOOD_BUCKET
server_side_encryption_configuration {
rule {
apply_server_side_encryption_by_default {
Expand All @@ -171,5 +171,5 @@ resource aws_s3_bucket dss_s3_events_bucket {
days = "1"
}
}
tags = "${merge(local.common_tags, local.aws_tags)}"
tags = merge(local.common_tags, local.aws_tags)
}
2 changes: 1 addition & 1 deletion infra/collections_db/main.tf
View file
Expand Up @@ -31,5 +31,5 @@ resource "aws_dynamodb_table" "collections-db-aws" {
type = "S"
}

tags = "${local.common_tags}"
tags = local.common_tags
}
12 changes: 6 additions & 6 deletions infra/domain/main.tf
View file
@@ -1,12 +1,12 @@
data aws_caller_identity current {}
locals {account_id = "${data.aws_caller_identity.current.account_id}"}
locals {account_id = data.aws_caller_identity.current.account_id}

data aws_route53_zone selected {
name = "${var.DSS_ZONE_NAME}"
name = var.DSS_ZONE_NAME
}

resource "aws_api_gateway_domain_name" "dss" {
domain_name = "${var.API_DOMAIN_NAME}"
domain_name = var.API_DOMAIN_NAME
regional_certificate_arn = "arn:aws:acm:${var.AWS_DEFAULT_REGION}:${local.account_id}:certificate/${var.ACM_CERTIFICATE_IDENTIFIER}"

endpoint_configuration {
Expand All @@ -15,9 +15,9 @@ resource "aws_api_gateway_domain_name" "dss" {
}

resource "aws_route53_record" "dss" {
zone_id = "${data.aws_route53_zone.selected.zone_id}"
name = "${var.API_DOMAIN_NAME}"
zone_id = data.aws_route53_zone.selected.zone_id
name = var.API_DOMAIN_NAME
type = "CNAME"
ttl = "300"
records = ["${aws_api_gateway_domain_name.dss.regional_domain_name}"]
records = [aws_api_gateway_domain_name.dss.regional_domain_name]
}
14 changes: 7 additions & 7 deletions infra/dss-events-scribe/main.tf
View file
Expand Up @@ -29,7 +29,7 @@ data "aws_iam_policy_document" "sqs" {
condition {
test = "StringEquals"
variable = "aws:SourceArn"
values = ["${aws_cloudwatch_event_rule.events-scribe.arn}"]
values = [aws_cloudwatch_event_rule.events-scribe.arn]
}
}
statement {
Expand All @@ -51,23 +51,23 @@ data "aws_iam_policy_document" "sqs" {

resource "aws_sqs_queue" "dss-events-scribe-queue" {
name = "dss-events-scribe-${var.DSS_DEPLOYMENT_STAGE}"
tags = "${local.common_tags}"
tags = local.common_tags
message_retention_seconds = "3600"
visibility_timeout_seconds = "600"
policy = "${data.aws_iam_policy_document.sqs.json}"
policy = data.aws_iam_policy_document.sqs.json
}

resource "aws_cloudwatch_event_rule" "events-scribe" {
name = "dss-events-scribe-${var.DSS_DEPLOYMENT_STAGE}"
description = "Queue event journal/update"
schedule_expression = "rate(10 minutes)"
tags = "${local.common_tags}"
tags = local.common_tags
}

resource "aws_cloudwatch_event_target" "send-journal-and-update-message" {
count = "${length(local.replicas)}"
rule = "${aws_cloudwatch_event_rule.events-scribe.name}"
arn = "${aws_sqs_queue.dss-events-scribe-queue.arn}"
count = length(local.replicas)
rule = aws_cloudwatch_event_rule.events-scribe.name
arn = aws_sqs_queue.dss-events-scribe-queue.arn
input = <<-DOC
{
"replica":"${local.replicas[count.index]}"
Expand Down
4 changes: 2 additions & 2 deletions infra/elasticsearch/access_ips.tf
View file
Expand Up @@ -3,6 +3,6 @@ data "aws_secretsmanager_secret_version" "source_ips" {
}

locals {
ips_str = "${data.aws_secretsmanager_secret_version.source_ips.secret_string}"
access_ips = "${compact(split(",", local.ips_str))}"
ips_str = data.aws_secretsmanager_secret_version.source_ips.secret_string
access_ips = compact(split(",", local.ips_str))
}

0 comments on commit a1dd5ae

Please sign in to comment.