aws: Fix bug w/ changing ECS service LB association

- fixes #3444 - fixes #4227
hashicorp · Dec 22, 2015 · b95c8fa · b95c8fa
1 parent 7d6b980
commit b95c8fa
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 9 deletions.
diff --git a/builtin/providers/aws/resource_aws_ecs_service.go b/builtin/providers/aws/resource_aws_ecs_service.go
@@ -51,27 +51,32 @@ func resourceAwsEcsService() *schema.Resource {
 
 			"iam_role": &schema.Schema{
 				Type:     schema.TypeString,
+				ForceNew: true,
 				Optional: true,
 			},
 
 			"load_balancer": &schema.Schema{
 				Type:     schema.TypeSet,
 				Optional: true,
+				ForceNew: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"elb_name": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
+							ForceNew: true,
 						},
 
 						"container_name": &schema.Schema{
 							Type:     schema.TypeString,
 							Required: true,
+							ForceNew: true,
 						},
 
 						"container_port": &schema.Schema{
 							Type:     schema.TypeInt,
 							Required: true,
+							ForceNew: true,
 						},
 					},
 				},

diff --git a/builtin/providers/aws/resource_aws_ecs_service_test.go b/builtin/providers/aws/resource_aws_ecs_service_test.go
@@ -175,6 +175,12 @@ func TestAccAWSEcsService_withIamRole(t *testing.T) {
 					testAccCheckAWSEcsServiceExists("aws_ecs_service.ghost"),
 				),
 			},
+			resource.TestStep{
+				Config: testAccAWSEcsService_withIamRole_modified,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSEcsServiceExists("aws_ecs_service.ghost"),
+				),
+			},
 		},
 	})
 }
@@ -209,6 +215,7 @@ func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error {
 
 		out, err := conn.DescribeServices(&ecs.DescribeServicesInput{
 			Services: []*string{aws.String(rs.Primary.ID)},
+			Cluster:  aws.String(rs.Primary.Attributes["cluster"]),
 		})
 
 		if awserr, ok := err.(awserr.Error); ok && awserr.Code() == "ClusterNotFoundException" {
@@ -217,8 +224,19 @@ func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error {
 
 		if err == nil {
 			if len(out.Services) > 0 {
-				return fmt.Errorf("ECS service still exists:\n%#v", out.Services)
+				var activeServices []*ecs.Service
+				for _, svc := range out.Services {
+					if *svc.Status != "INACTIVE" {
+						activeServices = append(activeServices, svc)
+					}
+				}
+				if len(activeServices) == 0 {
+					return nil
+				}
+
+				return fmt.Errorf("ECS service still exists:\n%#v", activeServices)
 			}
+			return nil
 		}
 
 		return err
@@ -294,7 +312,7 @@ resource "aws_ecs_service" "mongo" {
 }
 `
 
-var testAccAWSEcsService_withIamRole = `
+var tpl_testAccAWSEcsService_withIamRole = `
 resource "aws_ecs_cluster" "main" {
 	name = "terraformecstest11"
 }
@@ -306,13 +324,13 @@ resource "aws_ecs_task_definition" "ghost" {
   {
     "cpu": 128,
     "essential": true,
-    "image": "ghost:latest",
+    "image": "%s",
     "memory": 128,
-    "name": "ghost",
+    "name": "%s",
     "portMappings": [
       {
-        "containerPort": 2368,
-        "hostPort": 8080
+        "containerPort": %d,
+        "hostPort": %d
       }
     ]
   }
@@ -364,7 +382,7 @@ resource "aws_elb" "main" {
   availability_zones = ["us-west-2a"]
 
   listener {
-    instance_port = 8080
+    instance_port = %d
     instance_protocol = "http"
     lb_port = 80
     lb_protocol = "http"
@@ -380,14 +398,21 @@ resource "aws_ecs_service" "ghost" {
 
   load_balancer {
     elb_name = "${aws_elb.main.id}"
-    container_name = "ghost"
-    container_port = "2368"
+    container_name = "%s"
+    container_port = "%d"
   }
 
   depends_on = ["aws_iam_role_policy.ecs_service"]
 }
 `
 
+var testAccAWSEcsService_withIamRole = fmt.Sprintf(
+	tpl_testAccAWSEcsService_withIamRole,
+	"ghost:latest", "ghost", 2368, 8080, 8080, "ghost", 2368)
+var testAccAWSEcsService_withIamRole_modified = fmt.Sprintf(
+	tpl_testAccAWSEcsService_withIamRole,
+	"nginx:latest", "nginx", 80, 8080, 8080, "nginx", 80)
+
 var testAccAWSEcsServiceWithFamilyAndRevision = `
 resource "aws_ecs_cluster" "default" {
 	name = "terraformecstest2"