Merge pull request #8498 from drich10/finite_health_checking

provider/google: Use healthcheck names instead of urls when reading target pool
This commit is contained in:
Evan Brown 2016-09-01 22:02:41 -07:00 committed by GitHub
commit 3a3b4e9244
2 changed files with 24 additions and 2 deletions

View File

@ -362,6 +362,16 @@ func convertInstancesFromUrls(urls []string) []string {
return result
}
func convertHealthChecksFromUrls(urls []string) []string {
result := make([]string, 0, len(urls))
for _, url := range urls {
urlArray := strings.Split(url, "/")
healthCheck := fmt.Sprintf("%s", urlArray[len(urlArray)-1])
result = append(result, healthCheck)
}
return result
}
func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
@ -394,7 +404,11 @@ func resourceComputeTargetPoolRead(d *schema.ResourceData, meta interface{}) err
d.Set("backup_pool", tpool.BackupPool)
d.Set("description", tpool.Description)
d.Set("failover_ratio", tpool.FailoverRatio)
d.Set("health_checks", tpool.HealthChecks)
if tpool.HealthChecks != nil {
d.Set("health_checks", convertHealthChecksFromUrls(tpool.HealthChecks))
} else {
d.Set("health_checks", nil)
}
if tpool.Instances != nil {
d.Set("instances", convertInstancesFromUrls(tpool.Instances))
} else {

View File

@ -73,9 +73,17 @@ func testAccCheckComputeTargetPoolExists(n string) resource.TestCheckFunc {
}
var testAccComputeTargetPool_basic = fmt.Sprintf(`
resource "google_compute_http_health_check" "foobar" {
name = "healthcheck-test-%s"
host = "example.com"
}
resource "google_compute_target_pool" "foobar" {
description = "Resource created for Terraform acceptance testing"
instances = ["us-central1-a/foo", "us-central1-b/bar"]
name = "tpool-test-%s"
session_affinity = "CLIENT_IP_PROTO"
}`, acctest.RandString(10))
health_checks = [
"${google_compute_http_health_check.foobar.name}"
]
}`, acctest.RandString(10), acctest.RandString(10))