Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Disabled to Route 53 health check resource #8939

Closed
wants to merge 2 commits into from
Closed

Added Disabled to Route 53 health check resource #8939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a1644
Added Disabled to Route 53 health check resource
Glen-Moonpig Jun 11, 2019
343a4ae
Updated website docs
Glen-Moonpig Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions aws/resource_aws_route53_health_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ func resourceAwsRoute53HealthCheck() *schema.Resource {
Set: schema.HashString,
},

"disabled": {
Type: schema.TypeBool,
Optional: true,
Default: false,
},

"tags": tagsSchema(),
},
}
Expand Down Expand Up @@ -196,6 +202,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
Expand Down Expand Up @@ -294,6 +304,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,
Expand Down Expand Up @@ -342,6 +356,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)
Expand Down
7 changes: 7 additions & 0 deletions aws/resource_aws_route53_health_check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ resource "aws_route53_health_check" "foo" {
request_interval = "30"
measure_latency = true
invert_healthcheck = true
disabled = false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To ensure we are not introducing any regressions (unlikely given the implementation here, but as a good practice), could we leave the existing test configurations without these changes and introduce a new acceptance test with its own configuration that verifies the new functionality? e.g.

func TestAccAWSRoute53HealthCheck_Disabled(t *testing.T) {
  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),
          resource.TestCheckResourceAttr(resourceName, "disabled", "true"),
        ),
      },
      {
        ResourceName:      resourceName,
        ImportState:       true,
        ImportStateVerify: true,
      },
      {
        Config: testAccRoute53HealthCheckConfigDisabled(false),
        Check: resource.ComposeTestCheckFunc(
          testAccCheckRoute53HealthCheckExists(resourceName),
          resource.TestCheckResourceAttr(resourceName, "disabled", "false"),
        ),
      },
      {
        Config: testAccRoute53HealthCheckConfigDisabled(true),
        Check: resource.ComposeTestCheckFunc(
          testAccCheckRoute53HealthCheckExists(resourceName),
          resource.TestCheckResourceAttr(resourceName, "disabled", "true"),
        ),
      },
    },
  })
}

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)


tags = {
Name = "tf-test-health-check"
Expand All @@ -296,6 +297,7 @@ resource "aws_route53_health_check" "foo" {
request_interval = "30"
measure_latency = true
invert_healthcheck = false
disabled = false

tags = {
Name = "tf-test-health-check"
Expand Down Expand Up @@ -387,6 +389,7 @@ resource "aws_route53_health_check" "foo" {
request_interval = "30"
measure_latency = true
invert_healthcheck = false
disabled = false
search_string = "OK"

tags = {
Expand All @@ -405,6 +408,7 @@ resource "aws_route53_health_check" "foo" {
request_interval = "30"
measure_latency = true
invert_healthcheck = true
disabled = false
search_string = "FAILED"

tags = {
Expand All @@ -423,6 +427,7 @@ resource "aws_route53_health_check" "foo" {
request_interval = "30"
measure_latency = true
invert_healthcheck = true
disabled = false

tags = {
Name = "tf-test-health-check"
Expand All @@ -441,6 +446,7 @@ resource "aws_route53_health_check" "foo" {
measure_latency = true
invert_healthcheck = true
enable_sni = true
disabled = false

tags = {
Name = "tf-test-health-check"
Expand All @@ -459,6 +465,7 @@ resource "aws_route53_health_check" "foo" {
measure_latency = true
invert_healthcheck = true
enable_sni = false
disabled = false

tags = {
Name = "tf-test-health-check"
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/route53_health_check.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ 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.
* `disable` - (Optional) A boolean value that stops Route 53 from performing health checks. When true Route 53 stops submitting requests to your application, server, or other resource, stops aggregating the status of the referenced health checks and stops monitoring the corresponding CloudWatch metrics. 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
Expand Down