Skip to content

Commit b71a885

Browse files
remove vestiges of interpolation syntax that was deprecated in TF v0.12+ (#316)
* remove vestiges of interpolation syntax that was deprecated in TF v0.12+ * whitespace fixes * more whitespace
1 parent 408e99d commit b71a885

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

aws-acm-cert/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resource "aws_route53_record" "cert_validation" {
2828
name = lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_name")
2929
type = lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_type")
3030
zone_id = lookup(var.cert_subject_alternative_names, lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "domain_name"), var.aws_route53_zone_id)
31-
records = ["${lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_value")}"]
31+
records = [lookup(aws_acm_certificate.cert.domain_validation_options[count.index], "resource_record_value")]
3232
ttl = var.validation_record_ttl
3333

3434
allow_overwrite = var.allow_validation_record_overwrite

aws-aurora/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ resource "aws_rds_cluster" "db" {
5454
database_name = var.database_name
5555
master_username = var.database_username
5656
master_password = var.database_password
57-
vpc_security_group_ids = ["${aws_security_group.rds.id}"]
57+
vpc_security_group_ids = [aws_security_group.rds.id]
5858
db_subnet_group_name = var.database_subnet_group
5959
storage_encrypted = true
6060
iam_database_authentication_enabled = var.iam_database_authentication_enabled

aws-default-vpc-security/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ resource "aws_default_vpc" "default" {
2020
data "aws_internet_gateway" "default" {
2121
filter {
2222
name = "attachment.vpc-id"
23-
values = ["${aws_default_vpc.default.id}"]
23+
values = [aws_default_vpc.default.id]
2424
}
2525
}
2626

aws-iam-policy-cwlogs/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ resource "aws_iam_policy" "logs-policy" {
2020

2121
resource "aws_iam_policy_attachment" "attach-logs" {
2222
name = "logs-attachment"
23-
roles = ["${var.role_name}"]
23+
roles = [var.role_name]
2424
policy_arn = aws_iam_policy.logs-policy.arn
2525
}

aws-params-reader-policy/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ data "aws_iam_policy_document" "policy" {
2828

2929
statement {
3030
actions = ["kms:Decrypt"]
31-
resources = ["${data.aws_kms_alias.parameter_store_key.target_key_arn}"]
31+
resources = [data.aws_kms_alias.parameter_store_key.target_key_arn]
3232
}
3333
}
3434

aws-single-page-static-site/main.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ locals {
1212
bucket_name = var.bucket_name != "" ? var.bucket_name : local.website_fqdn
1313

1414
aliases = [
15-
"${local.website_fqdn}",
15+
local.website_fqdn,
1616
"www.${local.website_fqdn}",
1717
]
1818
}
@@ -31,7 +31,7 @@ data "aws_iam_policy_document" "bucket_policy" {
3131

3232
principals {
3333
type = "AWS"
34-
identifiers = ["${aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn}"]
34+
identifiers = [aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn]
3535
}
3636
}
3737

@@ -42,7 +42,7 @@ data "aws_iam_policy_document" "bucket_policy" {
4242

4343
principals {
4444
type = "AWS"
45-
identifiers = ["${aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn}"]
45+
identifiers = [aws_cloudfront_origin_access_identity.origin_access_identity.iam_arn]
4646
}
4747
}
4848
}

bless-ca/iam.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ data "aws_iam_policy_document" "lambda" {
1919
"kms:Decrypt",
2020
]
2121

22-
resources = ["${aws_kms_key.bless.arn}"]
22+
resources = [aws_kms_key.bless.arn]
2323
}
2424

2525
statement {
2626
sid = "describekey"
2727
actions = ["kms:DescribeKey"]
28-
resources = ["${aws_kms_key.bless_kms_auth.arn}"]
28+
resources = [aws_kms_key.bless_kms_auth.arn]
2929
}
3030

3131
statement {
@@ -35,12 +35,12 @@ data "aws_iam_policy_document" "lambda" {
3535
"kms:Decrypt",
3636
]
3737

38-
resources = ["${aws_kms_key.bless_kms_auth.arn}"]
38+
resources = [aws_kms_key.bless_kms_auth.arn]
3939

4040
condition {
4141
test = "StringEquals"
4242
variable = "kms:EncryptionContext:to"
43-
values = ["${local.name}"]
43+
values = [local.name]
4444
}
4545
}
4646

bless-ca/kms.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ data "aws_iam_policy_document" "kmsauth" {
3737
condition {
3838
test = "StringEquals"
3939
variable = "kms:EncryptionContext:to"
40-
values = ["${local.name}"]
40+
values = [local.name]
4141
}
4242

4343
condition {

bless-ca/test/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module "bless" {
1818
owner = var.owner
1919

2020
iam_path = var.iam_path
21-
authorized_users = ["${aws_iam_user.bless-test.arn}"]
21+
authorized_users = [aws_iam_user.bless-test.arn]
2222
kmsauth_iam_group_name_format = var.kmsauth_iam_group_name_format
2323
bless_logging_level = var.bless_logging_level
2424
}

github-webhooks-to-s3/firehose.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ data "aws_iam_policy_document" "firehose-to-s3" {
4444
]
4545

4646
resources = [
47-
"${module.bucket.arn}",
47+
module.bucket.arn,
4848
"${module.bucket.arn}/*",
4949
]
5050
}
@@ -59,7 +59,7 @@ data "aws_iam_policy_document" "firehose-to-s3" {
5959
]
6060

6161
resources = [
62-
"${aws_cloudwatch_log_group.firehose.arn}",
62+
aws_cloudwatch_log_group.firehose.arn,
6363
"${aws_cloudwatch_log_group.firehose.arn}/*",
6464
]
6565
}

github-webhooks-to-s3/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ data "aws_iam_policy_document" "firehose-write" {
3131
"firehose:PutRecord",
3232
]
3333

34-
resources = ["${aws_kinesis_firehose_delivery_stream.firehose.arn}"]
34+
resources = [aws_kinesis_firehose_delivery_stream.firehose.arn]
3535
}
3636
}
3737

0 commit comments

Comments
 (0)