Merge pull request #10452 from stack72/ecs-service-custom-delete-timeout

resource/ecs_service: Add support for customTimeout on delete

Author: anGie44

aws/resource_aws_ecs_service.go

@@ -28,6 +28,10 @@ func resourceAwsEcsService() *schema.Resource {
 			State: resourceAwsEcsServiceImport,
 		},
 
+		Timeouts: &schema.ResourceTimeout{
+			Delete: schema.DefaultTimeout(20 * time.Minute),
+		},
+
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:     schema.TypeString,
@@ -1114,7 +1118,7 @@ func resourceAwsEcsServiceDelete(d *schema.ResourceData, meta interface{}) error
 		Cluster: aws.String(d.Get("cluster").(string)),
 	}
 	// Wait until the ECS service is drained
-	err = resource.Retry(5*time.Minute, func() *resource.RetryError {
+	err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
 		log.Printf("[DEBUG] Trying to delete ECS service %s", input)
 		_, err := conn.DeleteService(&input)
 		if err != nil {

website/docs/r/ecs_service.html.markdown

@@ -189,6 +189,13 @@ In addition to all arguments above, the following attributes are exported:
 * `iam_role` - The ARN of IAM role used for ELB
 * `desired_count` - The number of instances of the task definition
 
+## Timeouts
+
+`aws_ecs_service` provides the following
+[Timeouts](/docs/configuration/resources.html#operation-timeouts) configuration options:
+
+- `delete` - (Default `20 minutes`)
+
 ## Import
 
 ECS services can be imported using the `name` together with ecs cluster `name`, e.g.