Merge pull request #3688 from ajvb/master

Added measure_latency option to Route 53 Health Check resource.

builtin/providers/aws/resource_aws_route53_health_check.go

@@ -55,6 +55,12 @@ func resourceAwsRoute53HealthCheck() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"measure_latency": &schema.Schema{
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				ForceNew: true,
+			},
 			"tags": tagsSchema(),
 		},
 	}
@@ -128,6 +134,12 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{
 		healthConfig.ResourcePath = aws.String(v.(string))
 	}
 
+	if *healthConfig.Type != route53.HealthCheckTypeCalculated {
+		if v, ok := d.GetOk("measure_latency"); ok {
+			healthConfig.MeasureLatency = aws.Bool(v.(bool))
+		}
+	}
+
 	input := &route53.CreateHealthCheckInput{
 		CallerReference:   aws.String(time.Now().Format(time.RFC3339Nano)),
 		HealthCheckConfig: healthConfig,
@@ -174,6 +186,7 @@ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{})
 	d.Set("ip_address", updated.IPAddress)
 	d.Set("port", updated.Port)
 	d.Set("resource_path", updated.ResourcePath)
+	d.Set("measure_latency", updated.MeasureLatency)
 
 	// read the tags
 	req := &route53.ListTagsForResourceInput{

builtin/providers/aws/resource_aws_route53_health_check_test.go

@@ -20,6 +20,8 @@ func TestAccAWSRoute53HealthCheck_basic(t *testing.T) {
 				Config: testAccRoute53HealthCheckConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckRoute53HealthCheckExists("aws_route53_health_check.foo"),
+					resource.TestCheckResourceAttr(
+						"aws_route53_health_check.foo", "measure_latency", "true"),
 				),
 			},
 			resource.TestStep{
@@ -124,6 +126,7 @@ resource "aws_route53_health_check" "foo" {
   resource_path = "/"
   failure_threshold = "2"
   request_interval = "30"
+  measure_latency = true
 
   tags = {
     Name = "tf-test-health-check"