Merge pull request #14614 from terraform-providers/f-route53-health-c…

…heck-disable

resource/route53_health_check: support enabling/disabling with disabled argument

aws/resource_aws_route53_health_check.go

@@ -148,6 +148,12 @@ func resourceAwsRoute53HealthCheck() *schema.Resource {
 				Set:      schema.HashString,
 			},
 
+			"disabled": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
+
 			"tags": tagsSchema(),
 		},
 	}
@@ -213,6 +219,10 @@ func resourceAwsRoute53HealthCheckUpdate(d *schema.ResourceData, meta interface{
 		updateHealthCheck.Regions = expandStringList(d.Get("regions").(*schema.Set).List())
 	}
 
+	if d.HasChange("disabled") {
+		updateHealthCheck.Disabled = aws.Bool(d.Get("disabled").(bool))
+	}
+
 	_, err := conn.UpdateHealthCheck(updateHealthCheck)
 	if err != nil {
 		return err
@@ -315,6 +325,10 @@ func resourceAwsRoute53HealthCheckCreate(d *schema.ResourceData, meta interface{
 		callerRef = fmt.Sprintf("%s-%s", v.(string), callerRef)
 	}
 
+	if v, ok := d.GetOk("disabled"); ok {
+		healthConfig.Disabled = aws.Bool(v.(bool))
+	}
+
 	input := &route53.CreateHealthCheckInput{
 		CallerReference:   aws.String(callerRef),
 		HealthCheckConfig: healthConfig,
@@ -364,6 +378,7 @@ func resourceAwsRoute53HealthCheckRead(d *schema.ResourceData, meta interface{})
 	d.Set("resource_path", updated.ResourcePath)
 	d.Set("measure_latency", updated.MeasureLatency)
 	d.Set("invert_healthcheck", updated.Inverted)
+	d.Set("disabled", updated.Disabled)
 
 	if err := d.Set("child_healthchecks", flattenStringList(updated.ChildHealthChecks)); err != nil {
 		return fmt.Errorf("error setting child_healthchecks: %s", err)

aws/resource_aws_route53_health_check_test.go

@@ -285,6 +285,45 @@ func TestAccAWSRoute53HealthCheck_withSNI(t *testing.T) {
 	})
 }
 
+func TestAccAWSRoute53HealthCheck_Disabled(t *testing.T) {
+	var check route53.HealthCheck
+	resourceName := "aws_route53_health_check.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckRoute53HealthCheckDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccRoute53HealthCheckConfigDisabled(true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRoute53HealthCheckExists(resourceName, &check),
+					resource.TestCheckResourceAttr(resourceName, "disabled", "true"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccRoute53HealthCheckConfigDisabled(false),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRoute53HealthCheckExists(resourceName, &check),
+					resource.TestCheckResourceAttr(resourceName, "disabled", "false"),
+				),
+			},
+			{
+				Config: testAccRoute53HealthCheckConfigDisabled(true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckRoute53HealthCheckExists(resourceName, &check),
+					resource.TestCheckResourceAttr(resourceName, "disabled", "true"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccAWSRoute53HealthCheck_disappears(t *testing.T) {
 	var check route53.HealthCheck
 	resourceName := "aws_route53_health_check.test"
@@ -636,3 +675,17 @@ resource "aws_route53_health_check" "test" {
    }
 }
 `
+
+func testAccRoute53HealthCheckConfigDisabled(disabled bool) string {
+	return fmt.Sprintf(`
+resource "aws_route53_health_check" "test" {
+  disabled          = %[1]t
+  failure_threshold = "2"
+  fqdn              = "dev.notexample.com"
+  port              = 80
+  request_interval  = "30"
+  resource_path     = "/"
+  type              = "HTTP"
+}
+`, disabled)
+}

website/docs/r/route53_health_check.html.markdown

@@ -83,6 +83,8 @@ resource "aws_route53_health_check" "foo" {
 
 The following arguments are supported:
 
+~> **Note:** At least one of either `fqdn` or `ip_address` must be specified.
+
 * `reference_name` - (Optional) This is a reference name used in Caller Reference
     (helpful for identifying single health_check set amongst others)
 * `fqdn` - (Optional) The fully qualified domain name of the endpoint to be checked.
@@ -95,6 +97,12 @@ The following arguments are supported:
 * `search_string` - (Optional) String searched in the first 5120 bytes of the response body for check to be considered healthy. Only valid with `HTTP_STR_MATCH` and `HTTPS_STR_MATCH`.
 * `measure_latency` - (Optional) A Boolean value that indicates whether you want Route 53 to measure the latency between health checkers in multiple AWS regions and your endpoint and to display CloudWatch latency graphs in the Route 53 console.
 * `invert_healthcheck` - (Optional) A boolean value that indicates whether the status of health check should be inverted. For example, if a health check is healthy but Inverted is True , then Route 53 considers the health check to be unhealthy.
+* `disabled` - (Optional) A boolean value that stops Route 53 from performing health checks. When set to true, Route 53 will do the following depending on the type of health check:
+    * For health checks that check the health of endpoints, Route5 53 stops submitting requests to your application, server, or other resource.
+    * For calculated health checks, Route 53 stops aggregating the status of the referenced health checks.
+    * For health checks that monitor CloudWatch alarms, Route 53 stops monitoring the corresponding CloudWatch metrics. 
+
+    ~> **Note:** After you disable a health check, Route 53 considers the status of the health check to always be healthy. If you configured DNS failover, Route 53 continues to route traffic to the corresponding resources. If you want to stop routing traffic to a resource, change the value of `invert_healthcheck`.
 * `enable_sni` - (Optional) A boolean value that indicates whether Route53 should send the `fqdn` to the endpoint when performing the health check. This defaults to AWS' defaults: when the `type` is "HTTPS" `enable_sni` defaults to `true`, when `type` is anything else `enable_sni` defaults to `false`.
 * `child_healthchecks` - (Optional) For a specified parent health check, a list of HealthCheckId values for the associated child health checks.
 * `child_health_threshold` - (Optional) The minimum number of child health checks that must be healthy for Route 53 to consider the parent health check to be healthy. Valid values are integers between 0 and 256, inclusive
@@ -105,8 +113,6 @@ The following arguments are supported:
 
 * `tags` - (Optional) A map of tags to assign to the health check.
 
-At least one of either `fqdn` or `ip_address` must be specified.
-
 ## Attributes Reference
 
 The following attributes are exported in addition to the arguments listed above: