Fix grpc healthcheck behaviour. (#3883) (#7061)

Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Aug 19, 2020 · 16d7a50 · 16d7a50
1 parent 62c1239
commit 16d7a50
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/.changelog/3883.txt b/.changelog/3883.txt
@@ -0,0 +1,3 @@
+```release-note:none
+bug fix for an unreleased field
+```
diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go
@@ -2018,5 +2018,20 @@ func resourceComputeHealthCheckEncoder(d *schema.ResourceData, meta interface{},
 		return obj, nil
 	}
 
+	if _, ok := d.GetOk("grpc_health_check"); ok {
+		hc := d.Get("grpc_health_check").([]interface{})[0]
+		ps := hc.(map[string]interface{})["port_specification"]
+		pn := hc.(map[string]interface{})["port_name"]
+
+		if ps == "USE_FIXED_PORT" || (ps == "" && pn == "") {
+			m := obj["grpcHealthCheck"].(map[string]interface{})
+			if m["port"] == nil {
+				return nil, fmt.Errorf("error in HealthCheck %s: `port` must be set for GRPC health checks`.", d.Get("name").(string))
+			}
+		}
+		obj["type"] = "GRPC"
+		return obj, nil
+	}
+
 	return nil, fmt.Errorf("error in HealthCheck %s: No health check block specified.", d.Get("name").(string))
 }
diff --git a/google/resource_compute_health_check_test.go b/google/resource_compute_health_check_test.go
@@ -149,7 +149,7 @@ func TestAccComputeHealthCheck_tcpAndSsl_shouldFail(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccComputeHealthCheck_tcpAndSsl_shouldFail(hckName),
-				ExpectError: regexp.MustCompile("only one of `http2_health_check,http_health_check,https_health_check,ssl_health_check,tcp_health_check` can be specified"),
+				ExpectError: regexp.MustCompile("only one of `grpc_health_check,http2_health_check,http_health_check,https_health_check,ssl_health_check,tcp_health_check` can be specified"),
 			},
 		},
 	})

diff --git a/google/resource_compute_region_health_check.go b/google/resource_compute_region_health_check.go
@@ -1974,5 +1974,20 @@ func resourceComputeRegionHealthCheckEncoder(d *schema.ResourceData, meta interf
 		return obj, nil
 	}
 
+	if _, ok := d.GetOk("grpc_health_check"); ok {
+		hc := d.Get("grpc_health_check").([]interface{})[0]
+		ps := hc.(map[string]interface{})["port_specification"]
+		pn := hc.(map[string]interface{})["port_name"]
+
+		if ps == "USE_FIXED_PORT" || (ps == "" && pn == "") {
+			m := obj["grpcHealthCheck"].(map[string]interface{})
+			if m["port"] == nil {
+				return nil, fmt.Errorf("error in HealthCheck %s: `port` must be set for GRPC health checks`.", d.Get("name").(string))
+			}
+		}
+		obj["type"] = "GRPC"
+		return obj, nil
+	}
+
 	return nil, fmt.Errorf("error in HealthCheck %s: No health check block specified.", d.Get("name").(string))
 }
diff --git a/google/resource_compute_region_health_check_test.go b/google/resource_compute_region_health_check_test.go
@@ -154,7 +154,7 @@ func TestAccComputeRegionHealthCheck_tcpAndSsl_shouldFail(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config:      testAccComputeRegionHealthCheck_tcpAndSsl_shouldFail(hckName),
-				ExpectError: regexp.MustCompile("only one of `http2_health_check,http_health_check,https_health_check,ssl_health_check,tcp_health_check` can be specified"),
+				ExpectError: regexp.MustCompile("only one of `grpc_health_check,http2_health_check,http_health_check,https_health_check,ssl_health_check,tcp_health_check` can be specified"),
 			},
 		},
 	})