Add test for validation

nginx · Jul 23, 2019 · e22d797 · e22d797
1 parent 742676a
commit e22d797
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 22 deletions.
diff --git a/pkg/apis/configuration/validation/validation.go b/pkg/apis/configuration/validation/validation.go
@@ -143,7 +143,7 @@ func validateUpstreams(upstreams []v1alpha1.Upstream, fieldPath *field.Path, isP
 		allErrs = append(allErrs, validateTime(u.ProxyReadTimeout, idxPath.Child("read-timeout"))...)
 		allErrs = append(allErrs, validateTime(u.ProxySendTimeout, idxPath.Child("send-timeout"))...)
 		allErrs = append(allErrs, validateNextUpstream(u.ProxyNextUpstream, idxPath.Child("next-upstream"))...)
-		allErrs = append(allErrs, validateTime(u.ProxyNextUpstream, idxPath.Child("next-upstream-timeout"))...)
+		allErrs = append(allErrs, validateTime(u.ProxyNextUpstreamTimeout, idxPath.Child("next-upstream-timeout"))...)
 		allErrs = append(allErrs, validatePositiveIntOrZero(u.ProxyNextUpstreamTries, idxPath.Child("next-upstream-tries"))...)
 
 		allErrs = append(allErrs, validateUpstreamLBMethod(u.LBMethod, idxPath.Child("lb-method"), isPlus)...)

diff --git a/pkg/apis/configuration/validation/validation_test.go b/pkg/apis/configuration/validation/validation_test.go
@@ -133,14 +133,20 @@ func TestValidateUpstreams(t *testing.T) {
 		{
 			upstreams: []v1alpha1.Upstream{
 				{
-					Name:    "upstream1",
-					Service: "test-1",
-					Port:    80,
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "error timeout",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 				{
-					Name:    "upstream2",
-					Service: "test-2",
-					Port:    80,
+					Name:                     "upstream2",
+					Service:                  "test-2",
+					Port:                     80,
+					ProxyNextUpstream:        "http_404",
+					ProxyNextUpstreamTimeout: "3s",
+					ProxyNextUpstreamTries:   createPointerFromInt(15),
 				},
 			},
 			expectedUpstreamNames: map[string]sets.Empty{
@@ -171,9 +177,12 @@ func TestValidateUpstreamsFails(t *testing.T) {
 		{
 			upstreams: []v1alpha1.Upstream{
 				{
-					Name:    "@upstream1",
-					Service: "test-1",
-					Port:    80,
+					Name:                     "@upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "http_502",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 			},
 			expectedUpstreamNames: sets.String{},
@@ -182,9 +191,12 @@ func TestValidateUpstreamsFails(t *testing.T) {
 		{
 			upstreams: []v1alpha1.Upstream{
 				{
-					Name:    "upstream1",
-					Service: "@test-1",
-					Port:    80,
+					Name:                     "upstream1",
+					Service:                  "@test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "error timeout",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 			},
 			expectedUpstreamNames: map[string]sets.Empty{
@@ -195,9 +207,12 @@ func TestValidateUpstreamsFails(t *testing.T) {
 		{
 			upstreams: []v1alpha1.Upstream{
 				{
-					Name:    "upstream1",
-					Service: "test-1",
-					Port:    0,
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     0,
+					ProxyNextUpstream:        "error timeout",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 			},
 			expectedUpstreamNames: map[string]sets.Empty{
@@ -208,21 +223,75 @@ func TestValidateUpstreamsFails(t *testing.T) {
 		{
 			upstreams: []v1alpha1.Upstream{
 				{
-					Name:    "upstream1",
-					Service: "test-1",
-					Port:    80,
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "error timeout",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 				{
-					Name:    "upstream1",
-					Service: "test-2",
-					Port:    80,
+					Name:                     "upstream1",
+					Service:                  "test-2",
+					Port:                     80,
+					ProxyNextUpstream:        "error timeout",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
 				},
 			},
 			expectedUpstreamNames: map[string]sets.Empty{
 				"upstream1": sets.Empty{},
 			},
 			msg: "duplicated upstreams",
 		},
+		{
+			upstreams: []v1alpha1.Upstream{
+				{
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "https_504",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
+				},
+			},
+			expectedUpstreamNames: map[string]sets.Empty{
+				"upstream1": sets.Empty{},
+			},
+			msg: "invalid next upstream syntax",
+		},
+		{
+			upstreams: []v1alpha1.Upstream{
+				{
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "http_504",
+					ProxyNextUpstreamTimeout: "-2s",
+					ProxyNextUpstreamTries:   createPointerFromInt(5),
+				},
+			},
+			expectedUpstreamNames: map[string]sets.Empty{
+				"upstream1": sets.Empty{},
+			},
+			msg: "invalid upstream timeout value",
+		},
+		{
+			upstreams: []v1alpha1.Upstream{
+				{
+					Name:                     "upstream1",
+					Service:                  "test-1",
+					Port:                     80,
+					ProxyNextUpstream:        "https_504",
+					ProxyNextUpstreamTimeout: "10s",
+					ProxyNextUpstreamTries:   createPointerFromInt(-1),
+				},
+			},
+			expectedUpstreamNames: map[string]sets.Empty{
+				"upstream1": sets.Empty{},
+			},
+			msg: "invalid upstream tries value",
+		},
 	}
 
 	isPlus := false