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 Add validation for apigw creation with no routes into release/1.15.x #16679

Merged
merged 8 commits into from
Mar 20, 2023
Merged

Backport of Add validation for apigw creation with no routes into release/1.15.x #16679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eff2c6e
backport of commit b22ec0d7e371ed55fe461df246ca37f0ff551fd5
missylbytes Mar 15, 2023
fb50745
backport of commit 19534a7ea3e5e409b726cfa3e026f2d69dad9c80
missylbytes Mar 16, 2023
87b968b
backport of commit 65b82cb695ebf357e535e39d147ed153251a03b1
missylbytes Mar 16, 2023
f660a25
Merge branch 'release/1.15.x' into backport/add-checks-apigw-creation…
missylbytes Mar 20, 2023
9ef77d6
fixes test
missylbytes Mar 16, 2023
5570d80
Reformat mdx files
missylbytes Mar 20, 2023
1850a6f
fix accidental formatting
missylbytes Mar 20, 2023
cc7bd7b
typo
missylbytes Mar 16, 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
Next Next commit
backport of commit 65b82cb
  • Loading branch information
@missylbytes
missylbytes committed Mar 16, 2023
commit 87b968b754d5cc75aaad59459ae6d9b0aad14fbe
3 changes: 3 additions & 0 deletions .changelog/16649.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
gateways: Adds validation to ensure the API Gateway has a listener defined when created
```
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
@@ -1,7 +1,6 @@
package structs

import (
"errors"
"fmt"
"regexp"
"sort"
Expand Down Expand Up @@ -771,7 +770,7 @@ func (e *APIGatewayConfigEntry) Validate() error {
}

if len(e.Listeners) == 0 {
return errors.New("api gateway must have at least one listener")
return fmt.Errorf("api gateway must have at least one listener")
}
if err := e.validateListenerNames(); err != nil {
return err
Expand Down Expand Up @@ -830,7 +829,7 @@ func (e *APIGatewayConfigEntry) validateListeners() error {
}
if listener.Port <= 0 || listener.Port > 65535 {
return fmt.Errorf("listener port %d not in the range 1-65535", listener.Port)
}
}| api-gateway | `mesh:write` |
if strings.ContainsRune(strings.TrimPrefix(listener.Hostname, wildcardPrefix), '*') {
return fmt.Errorf("host %q is not valid, a wildcard specifier is only allowed as the left-most label", listener.Hostname)
}
Expand Down
1 change: 1 addition & 0 deletions website/content/commands/config/delete.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ are not supported from commands, but may be from the corresponding HTTP endpoint

| Config Entry Kind | Required ACL |
| ------------------- | ------------------ |
| api-gateway | `mesh:write` |
| ingress-gateway | `operator:write` |
| proxy-defaults | `operator:write` |
| service-defaults | `service:write` |
Expand Down
1 change: 1 addition & 0 deletions website/content/commands/config/list.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ are not supported from commands, but may be from the corresponding HTTP endpoint

| Config Entry Kind | Required ACL |
| ------------------- | ----------------- |
| api-gateway | `mesh:read` |
| ingress-gateway | `service:read` |
| proxy-defaults | `<none>` |
| service-defaults | `service:read` |
Expand Down
1 change: 1 addition & 0 deletions website/content/commands/config/read.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ are not supported from commands, but may be from the corresponding HTTP endpoint

| Config Entry Kind | Required ACL |
| ------------------- | ----------------- |
| api-gateway | `mesh:read` |
| ingress-gateway | `service:read` |
| proxy-defaults | `<none>` |
| service-defaults | `service:read` |
Expand Down
1 change: 1 addition & 0 deletions website/content/commands/config/write.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ are not supported from commands, but may be from the corresponding HTTP endpoint

| Config Entry Kind | Required ACL |
| ------------------- | ------------------ |
| api-gateway | `mesh:write` |
| ingress-gateway | `operator:write` |
| proxy-defaults | `operator:write` |
| service-defaults | `service:write` |
Expand Down