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

Backport of [API Gateway] Validate listener name is not empty into release/1.15.x #16341

Merged
merged 2 commits into from
Feb 21, 2023
Merged

Backport of [API Gateway] Validate listener name is not empty into release/1.15.x #16341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
156d399
backport of commit cabcb052fd735c51a63be9e534e7c8bc3dea111d
Feb 21, 2023
7b7078f
backport of commit 89baddca259d38dd37e1e9aa3e58170d5067da66
Feb 21, 2023
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
Prev Previous commit
backport of commit 89baddc
  • Loading branch information
Andrew Stucki committed Feb 21, 2023
commit 7b7078fd0afbdb79a1585260023a45b9cc165426
5 changes: 2 additions & 3 deletions agent/structs/config_entry_gateways.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,9 +867,8 @@ const (

// APIGatewayListener represents an individual listener for an APIGateway
type APIGatewayListener struct {
// Name is the optional name of the listener in a given gateway. This is
// optional but must be unique within a gateway; therefore, if a gateway
// has more than a single listener, all but one must specify a Name.
// Name is the name of the listener in a given gateway. This must be
// unique within a gateway.
Name string
// Hostname is the host name that a listener should be bound to. If
// unspecified, the listener accepts requests for all hostnames.
Expand Down
5 changes: 2 additions & 3 deletions api/config_entry_gateways.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,8 @@ func (g *APIGatewayConfigEntry) GetModifyIndex() uint64 { return g.ModifyInd

// APIGatewayListener represents an individual listener for an APIGateway
type APIGatewayListener struct {
// Name is the optional name of the listener in a given gateway. This is
// optional, however, it must be unique. Therefore, if a gateway has more
// than a single listener, all but one must specify a Name.
// Name is the name of the listener in a given gateway. This must be
// unique within a gateway.
Name string
// Hostname is the host name that a listener should be bound to, if
// unspecified, the listener accepts requests for all hostnames.
Expand Down
1 change: 1 addition & 0 deletions test/integration/connect/envoy/case-api-gateway-tcp-conflicted/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ listeners = [
{
port = 9999
protocol = "tcp"
name = "listener"
}
]
'
Expand Down