Skip to content

Commit 645d293

Browse files
eugenep-scribdQingping Hou
authored andcommitted
chore: fix warnings of terraform 0.12.20
When upgrading to terraform 0.12.20 it produces warnings about quotes around types and interpolation with only one value inside. This resolves them, so terraform validate doesn't produce any warnings on 0.12.20 I also cleaned up the note about terraform 0.11, because we're using features that are not supported in 0.11 (e.g. `list(string)`)
1 parent 05bae6a commit 645d293

File tree

5 files changed

+17
-23
lines changed

5 files changed

+17
-23
lines changed

logshipping.tf

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,28 @@ EOF
6060
}
6161

6262
resource "aws_iam_role_policy_attachment" "datadog-logshipping-lambda-attach" {
63-
role = "${aws_iam_role.dd-log-lambda.name}"
64-
policy_arn = "${aws_iam_policy.datadog-logshipping.arn}"
63+
role = aws_iam_role.dd-log-lambda.name
64+
policy_arn = aws_iam_policy.datadog-logshipping.arn
6565
}
6666

6767
resource "aws_iam_role_policy_attachment" "datadog-logshipping-lambda-attach2" {
68-
role = "${aws_iam_role.dd-log-lambda.name}"
68+
role = aws_iam_role.dd-log-lambda.name
6969
policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
7070
}
7171

7272
resource "aws_iam_role_policy_attachment" "datadog-logshipping-lambda-attach3" {
73-
role = "${aws_iam_role.dd-log-lambda.name}"
73+
role = aws_iam_role.dd-log-lambda.name
7474
policy_arn = "arn:aws:iam::aws:policy/AWSXrayWriteOnlyAccess"
7575
}
7676

7777
resource "aws_lambda_function" "dd-log" {
7878
filename = "${path.module}/files/dd_log_lambda.zip"
7979
function_name = "${local.stack_prefix}DatadogLambdaFunction"
80-
role = "${aws_iam_role.dd-log-lambda.arn}"
80+
role = aws_iam_role.dd-log-lambda.arn
8181
handler = "lambda_function.lambda_handler"
8282
description = "This lambda function will export logs to our orgs Datadog events"
8383

84-
# The filebase64sha256() function is available in Terraform 0.11.12 and later
85-
# For Terraform 0.11.11 and earlier, use the base64sha256() function and the file() function:
86-
# source_code_hash = "${base64sha256(file("lambda_function_payload.zip"))}"
87-
source_code_hash = "${filebase64sha256("${path.module}/files/dd_log_lambda.zip")}"
84+
source_code_hash = filebase64sha256("${path.module}/files/dd_log_lambda.zip")
8885

8986
runtime = "python2.7"
9087
memory_size = "1024"

logshipping_cloudtrail.tf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
21
# Make lambda function accept invokes from S3
32
resource "aws_lambda_permission" "allow-ctbucket-trigger" {
4-
count = "${var.cloudtrail_bucket_id != "" ? 1 : 0}"
3+
count = var.cloudtrail_bucket_id != "" ? 1 : 0
54
statement_id = "AllowExecutionFromCTBucket"
65
action = "lambda:InvokeFunction"
7-
function_name = "${aws_lambda_function.dd-log.arn}"
6+
function_name = aws_lambda_function.dd-log.arn
87
principal = "s3.amazonaws.com"
9-
source_arn = "${var.cloudtrail_bucket_arn}"
8+
source_arn = var.cloudtrail_bucket_arn
109
}
1110

1211
# Tell S3 bucket to invoke DD lambda once an object is created/modified
1312
resource "aws_s3_bucket_notification" "ctbucket-notification-dd-log" {
14-
count = "${var.cloudtrail_bucket_id != "" ? 1 : 0}"
15-
bucket = "${var.cloudtrail_bucket_id}"
13+
count = var.cloudtrail_bucket_id != "" ? 1 : 0
14+
bucket = var.cloudtrail_bucket_id
1615

1716
lambda_function {
18-
lambda_function_arn = "${aws_lambda_function.dd-log.arn}"
17+
lambda_function_arn = aws_lambda_function.dd-log.arn
1918
events = ["s3:ObjectCreated:*"]
2019
}
2120
}

logshipping_elb.tf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
# Make lambda function accept invokes from S3
32
resource "aws_lambda_permission" "allow-elblog-trigger" {
43
count = var.create_elb_logs_bucket ? 1 : 0
54
statement_id = "AllowExecutionFromELBLogBucket"
65
action = "lambda:InvokeFunction"
7-
function_name = "${aws_lambda_function.dd-log.arn}"
6+
function_name = aws_lambda_function.dd-log.arn
87
principal = "s3.amazonaws.com"
98
source_arn = aws_s3_bucket.elb_logs[0].arn
109
}
@@ -15,7 +14,7 @@ resource "aws_s3_bucket_notification" "elblog-notification-dd-log" {
1514
bucket = aws_s3_bucket.elb_logs[0].id
1615

1716
lambda_function {
18-
lambda_function_arn = "${aws_lambda_function.dd-log.arn}"
17+
lambda_function_arn = aws_lambda_function.dd-log.arn
1918
events = ["s3:ObjectCreated:*"]
2019
}
2120
}
@@ -83,4 +82,3 @@ POLICY
8382
}
8483
}
8584
}
86-

main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,6 @@ EOF
128128

129129
resource "aws_iam_role_policy_attachment" "datadog-core-attach" {
130130
count = var.enable_datadog_aws_integration ? 1 : 0
131-
role = "${aws_iam_role.datadog-integration[0].name}"
132-
policy_arn = "${aws_iam_policy.datadog-core[0].arn}"
131+
role = aws_iam_role.datadog-integration[0].name
132+
policy_arn = aws_iam_policy.datadog-core[0].arn
133133
}

vars.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ variable "elb_logs_bucket_prefix" {
5959
}
6060
variable "log_exclude_at_match" {
6161
description = "Sets EXCLUDE_AT_MATCH environment variable, which allows excluding unwanted log lines"
62-
type = "string"
62+
type = string
6363
default = "$x^" # <- never matches anything
6464
}

0 commit comments

Comments
 (0)