resource/aws_ecs_service: Use Read after Create and retry on ServiceN…

…otFound for new resources
hashicorp · Feb 8, 2018 · 7551f92 · 7551f92
1 parent e63a014
commit 7551f92
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/aws/resource_aws_ecs_service.go b/aws/resource_aws_ecs_service.go
@@ -311,7 +311,7 @@ func resourceAwsEcsServiceCreate(d *schema.ResourceData, meta interface{}) error
 	log.Printf("[DEBUG] ECS service created: %s", *service.ServiceArn)
 	d.SetId(*service.ServiceArn)
 
-	return resourceAwsEcsServiceUpdate(d, meta)
+	return resourceAwsEcsServiceRead(d, meta)
 }
 
 func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error {
@@ -323,7 +323,18 @@ func resourceAwsEcsServiceRead(d *schema.ResourceData, meta interface{}) error {
 		Cluster:  aws.String(d.Get("cluster").(string)),
 	}
 
-	out, err := conn.DescribeServices(&input)
+	var out *ecs.DescribeServicesOutput
+	err := resource.Retry(2*time.Minute, func() *resource.RetryError {
+		var err error
+		out, err = conn.DescribeServices(&input)
+		if err != nil {
+			if d.IsNewResource() && isAWSErr(err, ecs.ErrCodeServiceNotFoundException, "") {
+				return resource.RetryableError(err)
+			}
+			return resource.NonRetryableError(err)
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}