Skip to content

Commit

Permalink
GatewayAPI: Fix listener parsing
Browse files Browse the repository at this point in the history
Previously, parsing the listeners of a Gateway object only worked correctly,
if only one listener of a given type (HTTP or TLS) was present, as looping
over them was incorrectly handled.

Fixes: #27533
Fixes: 677e8b4 ("Implement TLSRoute")

Signed-off-by: Patrick Reich <patrick@neodyme.io>
  • Loading branch information
Managarmrr committed Aug 25, 2023
1 parent e46ade2 commit 3c05c8d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
8 changes: 4 additions & 4 deletions operator/pkg/model/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ type Model struct {
func (m *Model) GetListeners() []Listener {
var listeners []Listener

for _, l := range m.HTTP {
listeners = append(listeners, &l)
for i := range m.HTTP {
listeners = append(listeners, &m.HTTP[i])
}

for _, l := range m.TLS {
listeners = append(listeners, &l)
for i := range m.TLS {
listeners = append(listeners, &m.TLS[i])
}

return listeners
Expand Down
24 changes: 17 additions & 7 deletions operator/pkg/model/model_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,21 @@ var testTLSListener = TLSListener{
Port: 443,
}

var testTLSListener2 = TLSListener{
Name: "test-tls-listener2",
Port: 443,
}

var testHTTPListener = HTTPListener{
Name: "test-http-listener",
Port: 80,
}

var testHTTPListener2 = HTTPListener{
Name: "test-http-listener2",
Port: 80,
}

func TestModel_GetListeners(t *testing.T) {
type fields struct {
HTTP []HTTPListener
Expand All @@ -31,24 +41,24 @@ func TestModel_GetListeners(t *testing.T) {
{
name: "Combine HTTP and TLS listeners",
fields: fields{
HTTP: []HTTPListener{testHTTPListener},
TLS: []TLSListener{testTLSListener},
HTTP: []HTTPListener{testHTTPListener, testHTTPListener2},
TLS: []TLSListener{testTLSListener, testTLSListener2},
},
want: []Listener{&testHTTPListener, &testTLSListener},
want: []Listener{&testHTTPListener, &testHTTPListener2, &testTLSListener, &testTLSListener2},
},
{
name: "Only HTTP listeners",
fields: fields{
HTTP: []HTTPListener{testHTTPListener},
HTTP: []HTTPListener{testHTTPListener, testHTTPListener2},
},
want: []Listener{&testHTTPListener},
want: []Listener{&testHTTPListener, &testHTTPListener2},
},
{
name: "Only TLS listeners",
fields: fields{
TLS: []TLSListener{testTLSListener},
TLS: []TLSListener{testTLSListener, testTLSListener2},
},
want: []Listener{&testTLSListener},
want: []Listener{&testTLSListener, &testTLSListener2},
},
{
name: "No listeners",
Expand Down

0 comments on commit 3c05c8d

Please sign in to comment.