ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11858 from hashicorp/f-fix-acc-tests 

provider/aws: Fix ECS Task Definition Acceptance tests
This commit is contained in:
Jake Champlin 2017-02-10 13:21:19 -05:00 committed by GitHub
parent e223ec4b40 1cd98c76c0
commit f3befb0fe5
1 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
builtin/providers/aws/resource_aws_ecs_task_definition_test.go
View File

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