From 1cd98c76c0da8a86bcb1d2e45523b7d02b25ebe4 Mon Sep 17 00:00:00 2001
From: Jake Champlin <jake.champlin.27@gmail.com>
Date: Fri, 10 Feb 2017 12:40:01 -0500
Subject: [PATCH] provider/aws: Fix ECS Task Definition Acceptance tests

```
$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSEcsTaskDefinition_withNetworkMode'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/02/10 12:12:32 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSEcsTaskDefinition_withNetworkMode -timeout 120m
=== RUN   TestAccAWSEcsTaskDefinition_withNetworkMode
--- PASS: TestAccAWSEcsTaskDefinition_withNetworkMode (13.70s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    13.741s
```

```
$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSEcsTaskDefinition_withTaskRoleArn'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2017/02/10 12:22:40 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSEcsTaskDefinition_withTaskRoleArn -timeout 120m
=== RUN   TestAccAWSEcsTaskDefinition_withTaskRoleArn
--- PASS: TestAccAWSEcsTaskDefinition_withTaskRoleArn (14.70s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    14.728s
```
---
 .../resource_aws_ecs_task_definition_test.go  | 161 +++++++++---------
 1 file changed, 80 insertions(+), 81 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_ecs_task_definition_test.go b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go
index d73296811..c80f0fe6b 100644
--- a/builtin/providers/aws/resource_aws_ecs_task_definition_test.go
+++ b/builtin/providers/aws/resource_aws_ecs_task_definition_test.go
@@ -347,62 +347,61 @@ func testAccAWSEcsTaskDefinitionWithTaskRoleArn(rInt int) string {
 		name = "tf_old_name-%d"
 		path = "/test/"
 		assume_role_policy = <<EOF
-	{
-		"Version": "2012-10-17",
-		"Statement": [
-			{
-				"Action": "sts:AssumeRole",
-				"Principal": {
-					"Service": "ec2.amazonaws.com"
-				},
-				"Effect": "Allow",
-				"Sid": ""
-			}
-		]
-	}
-	EOF
+{
+	"Version": "2012-10-17",
+	"Statement": [
+		{
+			"Action": "sts:AssumeRole",
+			"Principal": {
+				"Service": "ec2.amazonaws.com"
+			},
+			"Effect": "Allow",
+			"Sid": ""
+		}
+	]
+}
+EOF
 	}
 
 	resource "aws_iam_role_policy" "role_test" {
 		name = "role_update_test-%d"
 		role = "${aws_iam_role.role_test.id}"
 		policy = <<EOF
-	{
-		"Version": "2012-10-17",
-		"Statement": [
-			{
-				"Effect": "Allow",
-				"Action": [
-					"s3:GetBucketLocation",
-					"s3:ListAllMyBuckets"
-				],
-				"Resource": "arn:aws:s3:::*"
-			}
-		]
-	}
-	EOF
+{
+	"Version": "2012-10-17",
+	"Statement": [
+		{
+			"Effect": "Allow",
+			"Action": [
+				"s3:GetBucketLocation",
+				"s3:ListAllMyBuckets"
+			],
+			"Resource": "arn:aws:s3:::*"
+		}
+	]
+}
+EOF
 	}
 
 	resource "aws_ecs_task_definition" "sleep" {
 		family = "terraform-acc-sc-volume-test"
 		task_role_arn = "${aws_iam_role.role_test.arn}"
 		container_definitions = <<TASK_DEFINITION
-	[
-		{
-			"name": "sleep",
-			"image": "busybox",
-			"cpu": 10,
-			"command": ["sleep","360"],
-			"memory": 10,
-			"essential": true
-		}
-	]
-	TASK_DEFINITION
-
+[
+	{
+		"name": "sleep",
+		"image": "busybox",
+		"cpu": 10,
+		"command": ["sleep","360"],
+		"memory": 10,
+		"essential": true
+	}
+]
+TASK_DEFINITION
 		volume {
-			name = "database_scratch"
-		}
-	}`, rInt, rInt)
+		name = "database_scratch"
+	}
+}`, rInt, rInt)
 }
 
 func testAccAWSEcsTaskDefinitionWithNetworkMode(rInt int) string {
@@ -411,39 +410,39 @@ func testAccAWSEcsTaskDefinitionWithNetworkMode(rInt int) string {
 	 name = "tf_old_name-%d"
 	 path = "/test/"
 	 assume_role_policy = <<EOF
- {
-	 "Version": "2012-10-17",
-	 "Statement": [
-		 {
-			 "Action": "sts:AssumeRole",
-			 "Principal": {
-				 "Service": "ec2.amazonaws.com"
-			 },
-			 "Effect": "Allow",
-			 "Sid": ""
-		 }
-	 ]
- }
- EOF
+{
+ "Version": "2012-10-17",
+ "Statement": [
+	 {
+		 "Action": "sts:AssumeRole",
+		 "Principal": {
+			 "Service": "ec2.amazonaws.com"
+		 },
+		 "Effect": "Allow",
+		 "Sid": ""
+	 }
+ ]
+}
+EOF
  }
 
  resource "aws_iam_role_policy" "role_test" {
 	 name = "role_update_test-%d"
 	 role = "${aws_iam_role.role_test.id}"
 	 policy = <<EOF
- {
-	 "Version": "2012-10-17",
-	 "Statement": [
-		 {
-			 "Effect": "Allow",
-			 "Action": [
-				 "s3:GetBucketLocation",
-				 "s3:ListAllMyBuckets"
-			 ],
-			 "Resource": "arn:aws:s3:::*"
-		 }
-	 ]
- }
+{
+ "Version": "2012-10-17",
+ "Statement": [
+	 {
+		 "Effect": "Allow",
+		 "Action": [
+			 "s3:GetBucketLocation",
+			 "s3:ListAllMyBuckets"
+		 ],
+		 "Resource": "arn:aws:s3:::*"
+	 }
+ ]
+}
  EOF
  }
 
@@ -452,17 +451,17 @@ func testAccAWSEcsTaskDefinitionWithNetworkMode(rInt int) string {
 	 task_role_arn = "${aws_iam_role.role_test.arn}"
 	 network_mode = "bridge"
 	 container_definitions = <<TASK_DEFINITION
- [
-	 {
-		 "name": "sleep",
-		 "image": "busybox",
-		 "cpu": 10,
-		 "command": ["sleep","360"],
-		 "memory": 10,
-		 "essential": true
-	 }
- ]
- TASK_DEFINITION
+[
+ {
+	 "name": "sleep",
+	 "image": "busybox",
+	 "cpu": 10,
+	 "command": ["sleep","360"],
+	 "memory": 10,
+	 "essential": true
+ }
+]
+TASK_DEFINITION
 
 	 volume {
 		 name = "database_scratch"