dataclients/kubernetes: provide expected network backend address form…

…at in the error message Followup on #2719 Signed-off-by: Alexander Yastrebov <[email protected]>
zalando · Dec 6, 2023 · 2415dae · 2415dae
1 parent 6f1419f
commit 2415dae
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/cmd/webhook/admission/admission_test.go b/cmd/webhook/admission/admission_test.go
@@ -136,7 +136,7 @@ func TestRouteGroupAdmitter(t *testing.T) {
 		{
 			name:      "routegroup with invalid backends",
 			inputFile: "rg-with-invalid-backend-path.json",
-			message:   `backend address \"http://example.com/foo\" contains path, query or missing scheme\nbackend address \"http://example.com/foo/bar\" contains path, query or missing scheme\nbackend address \"http://example.com/foo/\" contains path, query or missing scheme\nbackend address \"/foo\" contains path, query or missing scheme\nbackend address \"http://example.com/\" contains path, query or missing scheme\nbackend address \"example.com/\" contains path, query or missing scheme\nbackend address \"example.com/foo\" contains path, query or missing scheme\nbackend address \"http://example.com?foo=bar\" contains path, query or missing scheme\nbackend address \"example.com\" contains path, query or missing scheme`,
+			message:   `backend address \"http://example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com/foo/bar\" does not match scheme://host format\nbackend address \"http://example.com/foo/\" does not match scheme://host format\nbackend address \"/foo\" does not match scheme://host format\nbackend address \"http://example.com/\" does not match scheme://host format\nbackend address \"example.com/\" does not match scheme://host format\nbackend address \"example.com/foo\" does not match scheme://host format\nbackend address \"http://example.com?foo=bar\" does not match scheme://host format\nbackend address \"example.com\" does not match scheme://host format`,
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {

diff --git a/dataclients/kubernetes/definitions/routegroupvalidator.go b/dataclients/kubernetes/definitions/routegroupvalidator.go
@@ -100,8 +100,10 @@ func (rgv *RouteGroupValidator) validateBackends(item *RouteGroupItem) error {
 			address, err := url.Parse(backend.Address)
 			if err != nil {
 				errs = append(errs, fmt.Errorf("failed to parse backend address %q: %w", backend.Address, err))
-			} else if address.Path != "" || address.RawQuery != "" || address.Scheme == "" {
-				errs = append(errs, fmt.Errorf("backend address %q contains path, query or missing scheme", backend.Address))
+			} else {
+				if address.Path != "" || address.RawQuery != "" || address.Scheme == "" || address.Host == "" {
+					errs = append(errs, fmt.Errorf("backend address %q does not match scheme://host format", backend.Address))
+				}
 			}
 		}
 	}

diff --git a/dataclients/kubernetes/definitions/testdata/errorwrapdata/errors.log b/dataclients/kubernetes/definitions/testdata/errorwrapdata/errors.log
@@ -4,10 +4,10 @@ single predicate expected at "Path(\"/foo\") && Method(\"GET\")"
 single predicate expected at ""
 single filter expected at "inlineContent(\"/foo\") -> status(200)"
 single filter expected at " "
-backend address "http://example.com/foo" contains path, query or missing scheme
-backend address "http://example.com/foo/bar" contains path, query or missing scheme
-backend address "http://example.com/foo/" contains path, query or missing scheme
-backend address "/foo" contains path, query or missing scheme
-backend address "example.com/" contains path, query or missing scheme
-backend address "http://example.com?foo=bar" contains path, query or missing scheme
-backend address "example.com" contains path, query or missing scheme
+backend address "http://example.com/foo" does not match scheme://host format
+backend address "http://example.com/foo/bar" does not match scheme://host format
+backend address "http://example.com/foo/" does not match scheme://host format
+backend address "/foo" does not match scheme://host format
+backend address "example.com/" does not match scheme://host format
+backend address "http://example.com?foo=bar" does not match scheme://host format
+backend address "example.com" does not match scheme://host format
diff --git a/...ients/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.log b/...ients/kubernetes/definitions/testdata/validation/route-with-invalid-backend-with-path.log
@@ -1,8 +1,8 @@
-backend address \\\"http://example\.com/foo\\\" contains path, query or missing scheme
-backend address \\\"http://example\.com/foo/bar\\\" contains path, query or missing scheme
-backend address \\\"/foo\\\" contains path, query or missing scheme
-backend address \\\"/foo/bar\\\" contains path, query or missing scheme
-backend address \\\"example\.com/foo\\\" contains path, query or missing scheme
-backend address \\\"http://example\.com/\\\" contains path, query or missing scheme
-backend address \\\"http://example\.com\?foo=bar\\\" contains path, query or missing scheme
-backend address \\\"example\.com\\\" contains path, query or missing scheme
+backend address \\\"http://example\.com/foo\\\" does not match scheme://host format
+backend address \\\"http://example\.com/foo/bar\\\" does not match scheme://host format
+backend address \\\"/foo\\\" does not match scheme://host format
+backend address \\\"/foo/bar\\\" does not match scheme://host format
+backend address \\\"example\.com/foo\\\" does not match scheme://host format
+backend address \\\"http://example\.com/\\\" does not match scheme://host format
+backend address \\\"http://example\.com\?foo=bar\\\" does not match scheme://host format
+backend address \\\"example\.com\\\" does not match scheme://host format