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

Jump to bottom

GatewayAPI: Fix listener parsing #27695

Merged
merged 1 commit into from
Aug 29, 2023
Merged

GatewayAPI: Fix listener parsing #27695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions operator/pkg/model/model.go
View file
Open in desktop
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
View file
Open in desktop
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