Skip to content

Commit 33abb99

Browse files
committed
chore: terraform fmt
1 parent 4b2d1ad commit 33abb99

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

modules/emr/main.tf

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ resource "aws_emr_cluster" "segment_data_lake_emr_cluster" {
3333
instance_count = "${var.core_instance_count}"
3434
name = "core_group"
3535

36-
3736
ebs_config {
3837
size = "64"
3938
type = "gp2"
@@ -95,7 +94,6 @@ resource "aws_emr_cluster" "segment_data_lake_emr_cluster" {
9594
EOF
9695
}
9796

98-
9997
configurations_json = <<EOF
10098
[
10199
{
@@ -112,7 +110,6 @@ EOF
112110
]
113111
EOF
114112

115-
116113
tags = "${local.tags}"
117114
}
118115

@@ -226,4 +223,4 @@ resource "aws_emr_instance_group" "task" {
226223
}]
227224
}
228225
EOF
229-
}
226+
}

modules/iam/main.tf

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ resource "aws_iam_role" "segment_data_lake_iam_role" {
77
tags = "${local.tags}"
88
}
99

10-
1110
# Policy attached to the IAM role.
1211
# https://www.terraform.io/docs/providers/aws/d/iam_policy_document.html
1312
data "aws_iam_policy_document" "segment_data_lake_assume_role_policy_document" {
@@ -59,7 +58,7 @@ data "aws_iam_policy_document" "segment_data_lake_policy_document" {
5958
"elasticmapreduce:DescribeCluster",
6059
"elasticmapreduce:DescribeStep",
6160
"elasticmapreduce:RunJobFlow",
62-
"elasticmapreduce:TerminateJobFlows"
61+
"elasticmapreduce:TerminateJobFlows",
6362
]
6463

6564
resources = [
@@ -69,6 +68,7 @@ data "aws_iam_policy_document" "segment_data_lake_policy_document" {
6968
condition {
7069
test = "StringEquals"
7170
variable = "elasticmapreduce:ResourceTag/vendor"
71+
7272
values = [
7373
"segment",
7474
]
@@ -141,28 +141,24 @@ data "aws_iam_policy_document" "segment_data_lake_policy_document" {
141141
# Gives the EMR service role permission to create cluster
142142
statement {
143143
actions = [
144-
"iam:PassRole"
144+
"iam:PassRole",
145145
]
146146

147147
resources = [
148148
"${aws_iam_role.segment_emr_service_role.arn}",
149149
"${aws_iam_role.segment_emr_instance_profile_role.arn}",
150-
"${aws_iam_role.segment_emr_autoscaling_role.arn}"
150+
"${aws_iam_role.segment_emr_autoscaling_role.arn}",
151151
]
152152

153153
effect = "Allow"
154154
}
155-
156155
}
157156

158-
159157
resource "aws_iam_role_policy_attachment" "segment_data_lake_role_policy_attachment" {
160158
role = "${aws_iam_role.segment_data_lake_iam_role.name}"
161159
policy_arn = "${aws_iam_policy.segment_data_lake_policy.arn}"
162160
}
163161

164-
165-
166162
# IAM role for EMR Service
167163
resource "aws_iam_role" "segment_emr_service_role" {
168164
name = "SegmentEMRServiceRole${var.suffix}"
@@ -264,8 +260,6 @@ resource "aws_iam_role_policy" "segment_emr_service_policy" {
264260
EOF
265261
}
266262

267-
268-
269263
# IAM Role for EC2 Instance Profile
270264
resource "aws_iam_role" "segment_emr_instance_profile_role" {
271265
name = "SegmentEMRInstanceProfileRole${var.suffix}"
@@ -292,7 +286,6 @@ resource "aws_iam_instance_profile" "segment_emr_instance_profile" {
292286
roles = ["${aws_iam_role.segment_emr_instance_profile_role.name}"]
293287
}
294288

295-
296289
resource "aws_iam_role_policy" "segment_emr_instance_profile_policy" {
297290
name = "SegmentEMRInstanceProfilePolicy${var.suffix}"
298291
role = "${aws_iam_role.segment_emr_instance_profile_role.id}"
@@ -368,7 +361,6 @@ resource "aws_iam_role_policy" "segment_emr_instance_profile_policy" {
368361
EOF
369362
}
370363

371-
372364
# IAM Role for EMR Autoscaling role
373365
resource "aws_iam_role" "segment_emr_autoscaling_role" {
374366
name = "SegmentEMRAutoscalingRole${var.suffix}"

modules/iam/output.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ output "iam_emr_service_role" {
88

99
output "iam_emr_autoscaling_role" {
1010
value = "${aws_iam_role.segment_emr_autoscaling_role.name}"
11-
}
11+
}

0 commit comments

Comments
 (0)