Skip to content

Commit

Permalink
Add RegionHealthCheck to compute (#1058)
Browse files Browse the repository at this point in the history 
Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
@modular-magician
modular-magician authored and Ty Larrabee committed Sep 16, 2019
1 parent 4e94744 commit 6c19069
Show file tree
Hide file tree
Showing 12 changed files with 3,880 additions and 1,247 deletions.
2 changes: 1 addition & 1 deletion google-beta/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,14 +517,14 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_compute_node_template": resourceComputeNodeTemplate(),
"google_compute_region_autoscaler": resourceComputeRegionAutoscaler(),
"google_compute_region_disk": resourceComputeRegionDisk(),
"google_compute_region_health_check": resourceComputeRegionHealthCheck(),
"google_compute_resource_policy": resourceComputeResourcePolicy(),
"google_compute_route": resourceComputeRoute(),
"google_compute_router": resourceComputeRouter(),
"google_compute_router_nat": resourceComputeRouterNat(),
"google_compute_snapshot": resourceComputeSnapshot(),
"google_compute_ssl_certificate": resourceComputeSslCertificate(),
"google_compute_managed_ssl_certificate": resourceComputeManagedSslCertificate(),
"google_compute_reservation": resourceComputeReservation(),
"google_compute_ssl_policy": resourceComputeSslPolicy(),
"google_compute_subnetwork": resourceComputeSubnetwork(),
"google_compute_target_http_proxy": resourceComputeTargetHttpProxy(),
Expand Down
232 changes: 228 additions & 4 deletions google-beta/resource_compute_health_check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ func healthCheckCustomizeDiff(diff *schema.ResourceDiff, v interface{}) error {
if diff.Get("https_health_check") != nil {
return validatePortSpec(diff, "https_health_check")
}
if diff.Get("http2_health_check") != nil {
return validatePortSpec(diff, "http2_health_check")
}
if diff.Get("tcp_health_check") != nil {
return validatePortSpec(diff, "tcp_health_check")
}
Expand All @@ -86,6 +89,8 @@ func portDiffSuppress(k, old, new string, _ *schema.ResourceData) bool {
defaultPort = 80
case "https_health_check":
defaultPort = 443
case "http2_health_check":
defaultPort = 443
case "tcp_health_check":
defaultPort = 80
case "ssl_health_check":
Expand Down Expand Up @@ -143,6 +148,49 @@ func resourceComputeHealthCheck() *schema.Resource {
Optional: true,
Default: 2,
},
"http2_health_check": {
Type: schema.TypeList,
Optional: true,
DiffSuppressFunc: portDiffSuppress,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"host": {
Type: schema.TypeString,
Optional: true,
},
"port": {
Type: schema.TypeInt,
Optional: true,
},
"port_name": {
Type: schema.TypeString,
Optional: true,
},
"port_specification": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{"USE_FIXED_PORT", "USE_NAMED_PORT", "USE_SERVING_PORT", ""}, false),
},
"proxy_header": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringInSlice([]string{"NONE", "PROXY_V1", ""}, false),
Default: "NONE",
},
"request_path": {
Type: schema.TypeString,
Optional: true,
Default: "/",
},
"response": {
Type: schema.TypeString,
Optional: true,
},
},
},
ConflictsWith: []string{"http_health_check", "https_health_check", "tcp_health_check", "ssl_health_check"},
},
"http_health_check": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -184,7 +232,7 @@ func resourceComputeHealthCheck() *schema.Resource {
},
},
},
ConflictsWith: []string{"https_health_check", "tcp_health_check", "ssl_health_check"},
ConflictsWith: []string{"https_health_check", "tcp_health_check", "ssl_health_check", "http2_health_check"},
},
"https_health_check": {
Type: schema.TypeList,
Expand Down Expand Up @@ -227,7 +275,7 @@ func resourceComputeHealthCheck() *schema.Resource {
},
},
},
ConflictsWith: []string{"http_health_check", "tcp_health_check", "ssl_health_check"},
ConflictsWith: []string{"http_health_check", "tcp_health_check", "ssl_health_check", "http2_health_check"},
},
"ssl_health_check": {
Type: schema.TypeList,
Expand Down Expand Up @@ -265,7 +313,7 @@ func resourceComputeHealthCheck() *schema.Resource {
},
},
},
ConflictsWith: []string{"http_health_check", "https_health_check", "tcp_health_check"},
ConflictsWith: []string{"http_health_check", "https_health_check", "tcp_health_check", "http2_health_check"},
},
"tcp_health_check": {
Type: schema.TypeList,
Expand Down Expand Up @@ -303,7 +351,7 @@ func resourceComputeHealthCheck() *schema.Resource {
},
},
},
ConflictsWith: []string{"http_health_check", "https_health_check", "ssl_health_check"},
ConflictsWith: []string{"http_health_check", "https_health_check", "ssl_health_check", "http2_health_check"},
},
"timeout_sec": {
Type: schema.TypeInt,
Expand Down Expand Up @@ -401,6 +449,12 @@ func resourceComputeHealthCheckCreate(d *schema.ResourceData, meta interface{})
} else if v, ok := d.GetOkExists("ssl_health_check"); !isEmptyValue(reflect.ValueOf(sslHealthCheckProp)) && (ok || !reflect.DeepEqual(v, sslHealthCheckProp)) {
obj["sslHealthCheck"] = sslHealthCheckProp
}
http2HealthCheckProp, err := expandComputeHealthCheckHttp2HealthCheck(d.Get("http2_health_check"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("http2_health_check"); !isEmptyValue(reflect.ValueOf(http2HealthCheckProp)) && (ok || !reflect.DeepEqual(v, http2HealthCheckProp)) {
obj["http2HealthCheck"] = http2HealthCheckProp
}

obj, err = resourceComputeHealthCheckEncoder(d, meta, obj)
if err != nil {
Expand Down Expand Up @@ -507,6 +561,9 @@ func resourceComputeHealthCheckRead(d *schema.ResourceData, meta interface{}) er
if err := d.Set("ssl_health_check", flattenComputeHealthCheckSslHealthCheck(res["sslHealthCheck"], d)); err != nil {
return fmt.Errorf("Error reading HealthCheck: %s", err)
}
if err := d.Set("http2_health_check", flattenComputeHealthCheckHttp2HealthCheck(res["http2HealthCheck"], d)); err != nil {
return fmt.Errorf("Error reading HealthCheck: %s", err)
}
if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
return fmt.Errorf("Error reading HealthCheck: %s", err)
}
Expand Down Expand Up @@ -583,6 +640,12 @@ func resourceComputeHealthCheckUpdate(d *schema.ResourceData, meta interface{})
} else if v, ok := d.GetOkExists("ssl_health_check"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, sslHealthCheckProp)) {
obj["sslHealthCheck"] = sslHealthCheckProp
}
http2HealthCheckProp, err := expandComputeHealthCheckHttp2HealthCheck(d.Get("http2_health_check"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("http2_health_check"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, http2HealthCheckProp)) {
obj["http2HealthCheck"] = http2HealthCheckProp
}

obj, err = resourceComputeHealthCheckEncoder(d, meta, obj)
if err != nil {
Expand Down Expand Up @@ -957,6 +1020,65 @@ func flattenComputeHealthCheckSslHealthCheckPortSpecification(v interface{}, d *
return v
}

func flattenComputeHealthCheckHttp2HealthCheck(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
if len(original) == 0 {
return nil
}
transformed := make(map[string]interface{})
transformed["host"] =
flattenComputeHealthCheckHttp2HealthCheckHost(original["host"], d)
transformed["request_path"] =
flattenComputeHealthCheckHttp2HealthCheckRequestPath(original["requestPath"], d)
transformed["response"] =
flattenComputeHealthCheckHttp2HealthCheckResponse(original["response"], d)
transformed["port"] =
flattenComputeHealthCheckHttp2HealthCheckPort(original["port"], d)
transformed["port_name"] =
flattenComputeHealthCheckHttp2HealthCheckPortName(original["portName"], d)
transformed["proxy_header"] =
flattenComputeHealthCheckHttp2HealthCheckProxyHeader(original["proxyHeader"], d)
transformed["port_specification"] =
flattenComputeHealthCheckHttp2HealthCheckPortSpecification(original["portSpecification"], d)
return []interface{}{transformed}
}
func flattenComputeHealthCheckHttp2HealthCheckHost(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func flattenComputeHealthCheckHttp2HealthCheckRequestPath(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func flattenComputeHealthCheckHttp2HealthCheckResponse(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func flattenComputeHealthCheckHttp2HealthCheckPort(v interface{}, d *schema.ResourceData) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
return intVal
} // let terraform core handle it if we can't convert the string to an int.
}
return v
}

func flattenComputeHealthCheckHttp2HealthCheckPortName(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func flattenComputeHealthCheckHttp2HealthCheckProxyHeader(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func flattenComputeHealthCheckHttp2HealthCheckPortSpecification(v interface{}, d *schema.ResourceData) interface{} {
return v
}

func expandComputeHealthCheckCheckIntervalSec(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}
Expand Down Expand Up @@ -1315,6 +1437,95 @@ func expandComputeHealthCheckSslHealthCheckPortSpecification(v interface{}, d Te
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheck(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
}
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

transformedHost, err := expandComputeHealthCheckHttp2HealthCheckHost(original["host"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedHost); val.IsValid() && !isEmptyValue(val) {
transformed["host"] = transformedHost
}

transformedRequestPath, err := expandComputeHealthCheckHttp2HealthCheckRequestPath(original["request_path"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedRequestPath); val.IsValid() && !isEmptyValue(val) {
transformed["requestPath"] = transformedRequestPath
}

transformedResponse, err := expandComputeHealthCheckHttp2HealthCheckResponse(original["response"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedResponse); val.IsValid() && !isEmptyValue(val) {
transformed["response"] = transformedResponse
}

transformedPort, err := expandComputeHealthCheckHttp2HealthCheckPort(original["port"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedPort); val.IsValid() && !isEmptyValue(val) {
transformed["port"] = transformedPort
}

transformedPortName, err := expandComputeHealthCheckHttp2HealthCheckPortName(original["port_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedPortName); val.IsValid() && !isEmptyValue(val) {
transformed["portName"] = transformedPortName
}

transformedProxyHeader, err := expandComputeHealthCheckHttp2HealthCheckProxyHeader(original["proxy_header"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedProxyHeader); val.IsValid() && !isEmptyValue(val) {
transformed["proxyHeader"] = transformedProxyHeader
}

transformedPortSpecification, err := expandComputeHealthCheckHttp2HealthCheckPortSpecification(original["port_specification"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedPortSpecification); val.IsValid() && !isEmptyValue(val) {
transformed["portSpecification"] = transformedPortSpecification
}

return transformed, nil
}

func expandComputeHealthCheckHttp2HealthCheckHost(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckRequestPath(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckResponse(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckPort(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckPortName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckProxyHeader(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeHealthCheckHttp2HealthCheckPortSpecification(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func resourceComputeHealthCheckEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {

if _, ok := d.GetOk("http_health_check"); ok {
Expand Down Expand Up @@ -1343,6 +1554,19 @@ func resourceComputeHealthCheckEncoder(d *schema.ResourceData, meta interface{},
obj["type"] = "HTTPS"
return obj, nil
}
if _, ok := d.GetOk("http2_health_check"); ok {
hc := d.Get("http2_health_check").([]interface{})[0]
ps := hc.(map[string]interface{})["port_specification"]

if ps == "USE_FIXED_PORT" || ps == "" {
m := obj["http2HealthCheck"].(map[string]interface{})
if m["port"] == nil {
m["port"] = 443
}
}
obj["type"] = "HTTP2"
return obj, nil
}
if _, ok := d.GetOk("tcp_health_check"); ok {
hc := d.Get("tcp_health_check").([]interface{})[0]
ps := hc.(map[string]interface{})["port_specification"]
Expand Down
Loading

0 comments on commit 6c19069

Please sign in to comment.