luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Normalize all API Gateway references (#16316)

This commit is contained in:
Andrew Stucki 2023-02-17 16:37:34 -05:00 committed by GitHub
parent 89113f4877
commit 7552e84718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
agent/structs/config_entry_gateways.go
View File

@ -754,6 +754,8 @@ func (e *APIGatewayConfigEntry) Normalize() error {
if cert.Kind == "" {
cert.Kind = InlineCertificate
}
cert.EnterpriseMeta.Normalize()
listener.TLS.Certificates[i] = cert
}
}
@ -972,7 +974,23 @@ func (e *BoundAPIGatewayConfigEntry) IsInitializedForGateway(gateway *APIGateway
func (e *BoundAPIGatewayConfigEntry) GetKind() string { return BoundAPIGateway }
func (e *BoundAPIGatewayConfigEntry) GetName() string { return e.Name }
func (e *BoundAPIGatewayConfigEntry) GetMeta() map[string]string { return e.Meta }
func (e *BoundAPIGatewayConfigEntry) Normalize() error { return nil }
func (e *BoundAPIGatewayConfigEntry) Normalize() error {
for i, listener := range e.Listeners {
for j, route := range listener.Routes {
route.EnterpriseMeta.Normalize()
listener.Routes[j] = route
}
for j, cert := range listener.Certificates {
cert.EnterpriseMeta.Normalize()
listener.Certificates[j] = cert
}
e.Listeners[i] = listener
}
return nil
}
func (e *BoundAPIGatewayConfigEntry) Validate() error {
allowedCertificateKinds := map[string]bool{
@ -1109,8 +1127,6 @@ func (l *BoundAPIGatewayListener) UnbindRoute(route ResourceReference) bool {
return false
}
func (e *BoundAPIGatewayConfigEntry) GetStatus() Status {
return Status{}
}
func (e *BoundAPIGatewayConfigEntry) GetStatus() Status { return Status{} }
func (e *BoundAPIGatewayConfigEntry) SetStatus(status Status) {}
func (e *BoundAPIGatewayConfigEntry) DefaultStatus() Status { return Status{} }

18
agent/structs/config_entry_routes.go
View File

@ -79,6 +79,7 @@ func (e *HTTPRouteConfigEntry) Normalize() error {
for i, parent := range e.Parents {
if parent.Kind == "" {
parent.Kind = APIGateway
parent.EnterpriseMeta.Normalize()
e.Parents[i] = parent
}
}
@ -87,12 +88,22 @@ func (e *HTTPRouteConfigEntry) Normalize() error {
for j, match := range rule.Matches {
rule.Matches[j] = normalizeHTTPMatch(match)
}
for j, service := range rule.Services {
rule.Services[j] = normalizeHTTPService(service)
}
e.Rules[i] = rule
}
return nil
}
func normalizeHTTPService(service HTTPService) HTTPService {
service.EnterpriseMeta.Normalize()
return service
}
func normalizeHTTPMatch(match HTTPMatch) HTTPMatch {
method := string(match.Method)
method = strings.ToUpper(method)
@ -494,9 +505,16 @@ func (e *TCPRouteConfigEntry) Normalize() error {
for i, parent := range e.Parents {
if parent.Kind == "" {
parent.Kind = APIGateway
parent.EnterpriseMeta.Normalize()
e.Parents[i] = parent
}
}
for i, service := range e.Services {
service.EnterpriseMeta.Normalize()
e.Services[i] = service
}
return nil
}