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

Added measure_latency option to Route 53 Health Check resource. #3688

Merged
merged 2 commits into from
Jan 7, 2016
Merged

Added measure_latency option to Route 53 Health Check resource. #3688

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
c1bb852
Added measure_latency option to Route 53 Health Check resource.
ajvb Oct 29, 2015
ab273bb
Fixed up measure_latency option in r53 health checks.
ajvb Oct 29, 2015
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
13 changes: 13 additions & 0 deletions builtin/providers/aws/resource_aws_route53_health_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
},
}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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{
Expand Down
3 changes: 3 additions & 0 deletions builtin/providers/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 @@ -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{
Expand Down Expand Up @@ -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"
Expand Down