Fix grpc health check validation

nginxinc · Nov 30, 2021 · bdc766c · bdc766c
1 parent 0a31878
commit bdc766c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 22 deletions.
diff --git a/pkg/apis/configuration/validation/virtualserver.go b/pkg/apis/configuration/validation/virtualserver.go
@@ -1252,7 +1252,7 @@ func validateGrpcService(service string, fieldPath *field.Path) field.ErrorList
 	allErrs := field.ErrorList{}
 
 	if service == "" {
-		return append(allErrs, field.Required(fieldPath, ""))
+		return allErrs
 	}
 
 	if !grpcRegexp.MatchString(service) {

diff --git a/pkg/apis/configuration/validation/virtualserver_test.go b/pkg/apis/configuration/validation/virtualserver_test.go
@@ -2354,33 +2354,46 @@ func TestValidateUpstreamHealthCheck(t *testing.T) {
 }
 
 func TestValidateGrpcUpstreamHealthCheck(t *testing.T) {
-	hc := &v1.HealthCheck{
-		Enable:   true,
-		Interval: "4s",
-		Jitter:   "2s",
-		Fails:    3,
-		Passes:   2,
-		Port:     8080,
-		TLS: &v1.UpstreamTLS{
-			Enable: true,
+	tests := []struct {
+		hc *v1.HealthCheck
+	}{
+		{
+			hc: &v1.HealthCheck{
+				Enable:   true,
+				Interval: "4s",
+				Jitter:   "2s",
+				Fails:    3,
+				Passes:   2,
+				Port:     8080,
+				TLS: &v1.UpstreamTLS{
+					Enable: true,
+				},
+				ConnectTimeout: "1s",
+				ReadTimeout:    "1s",
+				SendTimeout:    "1s",
+				Headers: []v1.Header{
+					{
+						Name:  "Host",
+						Value: "my.service",
+					},
+				},
+				GRPCStatus:  createPointerFromInt(12),
+				GRPCService: "tea-servicev2",
+			},
 		},
-		ConnectTimeout: "1s",
-		ReadTimeout:    "1s",
-		SendTimeout:    "1s",
-		Headers: []v1.Header{
-			{
-				Name:  "Host",
-				Value: "my.service",
+		{
+			hc: &v1.HealthCheck{
+				Enable: true,
 			},
 		},
-		GRPCStatus:  createPointerFromInt(12),
-		GRPCService: "tea-servicev2",
 	}
 
-	allErrs := validateUpstreamHealthCheck(hc, "grpc", field.NewPath("healthCheck"))
+	for _, test := range tests {
+		allErrs := validateUpstreamHealthCheck(test.hc, "grpc", field.NewPath("healthCheck"))
 
-	if len(allErrs) != 0 {
-		t.Errorf("validateUpstreamHealthCheck() returned errors for valid input %v", hc)
+		if len(allErrs) != 0 {
+			t.Errorf("validateUpstreamHealthCheck() returned errors for valid input %v", test.hc)
+		}
 	}
 }