Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow hostname to use subdomain with single label/character #4803

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
+18 −6
Open

fix: allow hostname to use subdomain with single label/character #4803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
48d9df8
fix: allow hostname to use subdomain with single label/character
nothinux Nov 28, 2024
cf1cc7b
add test
nothinux Nov 28, 2024
cfe69ab
fix test
nothinux Nov 28, 2024
30cc3b8
Merge branch 'main' into fix-domain-single-char
nothinux Nov 28, 2024
fdb7e2e
Merge branch 'main' into fix-domain-single-char
nothinux Nov 30, 2024
19dbff1
fix coverage test
nothinux Nov 30, 2024
041d13f
Merge branch 'fix-domain-single-char' of github.com:nothinux/gateway …
nothinux Nov 30, 2024
93c6e9a
Merge branch 'main' into fix-domain-single-char
nothinux Dec 2, 2024
b62b642
Merge branch 'main' into fix-domain-single-char
nothinux Dec 3, 2024
b94f3b1
Merge branch 'main' into fix-domain-single-char
nothinux Dec 4, 2024
c49eebb
fix lint
nothinux Dec 6, 2024
f317255
Merge branch 'main' into fix-domain-single-char
nothinux Dec 6, 2024
4374a5a
Merge branch 'main' into fix-domain-single-char
nothinux Dec 8, 2024
7308e3c
Merge branch 'main' into fix-domain-single-char
zirain Dec 9, 2024
6030b6c
Merge branch 'main' into fix-domain-single-char
zirain Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1alpha1/backend_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type FQDNEndpoint struct {
//
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=253
// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$`
// +kubebuilder:validation:Pattern=`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`
Hostname string `json:"hostname"`

// Port defines the port of the backend endpoint.
Expand Down
2 changes: 1 addition & 1 deletion charts/gateway-helm/crds/generated/gateway.envoyproxy.io_backends.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
endpoint.
maxLength: 253
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
port:
description: Port defines the port of the backend endpoint.
Expand Down
20 changes: 16 additions & 4 deletions test/cel-validation/backend_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,24 @@ func TestBackend(t *testing.T) {
Port: 443,
},
},
{
FQDN: &egv1a1.FQDNEndpoint{
Hostname: "sub.example.com",
Port: 443,
},
},
{
FQDN: &egv1a1.FQDNEndpoint{
Hostname: "sub1.sub.sub.example.com",
Port: 443,
},
},
{
FQDN: &egv1a1.FQDNEndpoint{
Hostname: "sub.s.example.com",
Port: 443,
},
},
},
}
},
Expand Down Expand Up @@ -190,10 +202,10 @@ func TestBackend(t *testing.T) {
}
},
wantErrors: []string{
"spec.endpoints[0].fqdn.hostname: Invalid value: \"host name\": spec.endpoints[0].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$'",
"spec.endpoints[1].fqdn.hostname: Invalid value: \"host_name\": spec.endpoints[1].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$'",
"spec.endpoints[2].fqdn.hostname: Invalid value: \"hostname:443\": spec.endpoints[2].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$",
"spec.endpoints[3].fqdn.hostname: Invalid value: \"host.*.name\": spec.endpoints[3].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9]))*$",
"spec.endpoints[0].fqdn.hostname: Invalid value: \"host name\": spec.endpoints[0].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$'",
"spec.endpoints[1].fqdn.hostname: Invalid value: \"host_name\": spec.endpoints[1].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$'",
"spec.endpoints[2].fqdn.hostname: Invalid value: \"hostname:443\": spec.endpoints[2].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$",
"spec.endpoints[3].fqdn.hostname: Invalid value: \"host.*.name\": spec.endpoints[3].fqdn.hostname in body should match '^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$",
},
},
{
Expand Down
Loading