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

Merge pull request #8574 from hashicorp/fix-spotfleet-tests 

provider/aws: `aws_spot_fleet_request` was leaving orphaned instances running
This commit is contained in:
Paul Stack 2016-08-31 12:30:46 +01:00 committed by GitHub
parent aa1ec26bc5 4d2b9cb167
commit 85e6323e7b
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
builtin/providers/aws/resource_aws_spot_fleet_request_test.go
View File

@ -403,7 +403,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -451,7 +454,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -499,7 +505,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -554,7 +563,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -625,7 +637,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -680,7 +695,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -745,7 +763,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -801,7 +822,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }
@ -863,7 +887,10 @@ resource "aws_iam_role" "test-role" {
"Sid": "", "Sid": "",
"Effect": "Allow", "Effect": "Allow",
"Principal": { "Principal": {
"Service": "spotfleet.amazonaws.com" "Service": [
"spotfleet.amazonaws.com",
"ec2.amazonaws.com"
]
}, },
"Action": "sts:AssumeRole" "Action": "sts:AssumeRole"
} }