From 4d2b9cb167d3221a5044aabcb22b41f41aa62421 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Wed, 31 Aug 2016 11:25:08 +0100
Subject: [PATCH] provider/aws: `aws_spot_fleet_request` was leaving orphaned
 instances running

Each nightly build was leaving multiple instances running. The issue is
that the IAM role we were using didn't have access to Terminate the EC2
instances

The role was missing the ec2 principle
---
 .../resource_aws_spot_fleet_request_test.go   | 45 +++++++++++++++----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_spot_fleet_request_test.go b/builtin/providers/aws/resource_aws_spot_fleet_request_test.go
index 41aa0a7b8d..0dbae30ac1 100644
--- a/builtin/providers/aws/resource_aws_spot_fleet_request_test.go
+++ b/builtin/providers/aws/resource_aws_spot_fleet_request_test.go
@@ -403,7 +403,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -451,7 +454,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -499,7 +505,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -554,7 +563,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -625,7 +637,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -680,7 +695,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -745,7 +763,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -801,7 +822,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }
@@ -863,7 +887,10 @@ resource "aws_iam_role" "test-role" {
       "Sid": "",
       "Effect": "Allow",
       "Principal": {
-        "Service": "spotfleet.amazonaws.com"
+        "Service": [
+          "spotfleet.amazonaws.com",
+          "ec2.amazonaws.com"
+        ]
       },
       "Action": "sts:AssumeRole"
     }