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

Replace type conversion with embedded structs

This commit is contained in:
Daniel Nephin 2021-06-17 12:53:25 -04:00
parent 40ff895927
commit b7293242f1
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
agent/proxycfg/state.go
View File

@ -151,17 +151,19 @@ func newState(ns *structs.NodeService, token string, config stateConfig) (*state
} }
var handler kindHandler var handler kindHandler
h := handlerState{stateConfig: config, serviceInstance: s, ch: ch}
switch ns.Kind { switch ns.Kind {
case structs.ServiceKindConnectProxy: case structs.ServiceKindConnectProxy:
handler = &handlerConnectProxy{stateConfig: config, serviceInstance: s, ch: ch} handler = &handlerConnectProxy{handlerState: h}
case structs.ServiceKindTerminatingGateway: case structs.ServiceKindTerminatingGateway:
config.logger = config.logger.Named(logging.TerminatingGateway) h.stateConfig.logger = config.logger.Named(logging.TerminatingGateway)
handler = &handlerTerminatingGateway{stateConfig: config, serviceInstance: s, ch: ch} handler = &handlerTerminatingGateway{handlerState: h}
case structs.ServiceKindMeshGateway: case structs.ServiceKindMeshGateway:
config.logger = config.logger.Named(logging.MeshGateway) h.stateConfig.logger = config.logger.Named(logging.MeshGateway)
handler = &handlerMeshGateway{stateConfig: config, serviceInstance: s, ch: ch} handler = &handlerMeshGateway{handlerState: h}
case structs.ServiceKindIngressGateway: case structs.ServiceKindIngressGateway:
handler = &handlerIngressGateway{stateConfig: config, serviceInstance: s, ch: ch} handler = &handlerIngressGateway{handlerState: h}
default: default:
return nil, errors.New("not a connect-proxy, terminating-gateway, mesh-gateway, or ingress-gateway") return nil, errors.New("not a connect-proxy, terminating-gateway, mesh-gateway, or ingress-gateway")
} }
@ -237,19 +239,27 @@ func (s *state) Close() error {
return nil return nil
} }
type handler struct { type handlerState struct {
stateConfig // TODO: un-embed stateConfig // TODO: un-embed
serviceInstance // TODO: un-embed serviceInstance // TODO: un-embed
ch chan cache.UpdateEvent ch chan cache.UpdateEvent
} }
type handlerMeshGateway handler type handlerMeshGateway struct {
handlerState
}
type handlerTerminatingGateway handler type handlerTerminatingGateway struct {
handlerState
}
type handlerConnectProxy handler type handlerConnectProxy struct {
handlerState
}
type handlerIngressGateway handler type handlerIngressGateway struct {
handlerState
}
func (s *handlerUpstreams) watchMeshGateway(ctx context.Context, dc string, upstreamID string) error { func (s *handlerUpstreams) watchMeshGateway(ctx context.Context, dc string, upstreamID string) error {
return s.cache.Notify(ctx, cachetype.InternalServiceDumpName, &structs.ServiceDumpRequest{ return s.cache.Notify(ctx, cachetype.InternalServiceDumpName, &structs.ServiceDumpRequest{
@ -262,7 +272,9 @@ func (s *handlerUpstreams) watchMeshGateway(ctx context.Context, dc string, upst
}, "mesh-gateway:"+dc+":"+upstreamID, s.ch) }, "mesh-gateway:"+dc+":"+upstreamID, s.ch)
} }
type handlerUpstreams handler type handlerUpstreams struct {
handlerState
}
func (s *handlerUpstreams) watchConnectProxyService(ctx context.Context, correlationId string, target *structs.DiscoveryTarget) error { func (s *handlerUpstreams) watchConnectProxyService(ctx context.Context, correlationId string, target *structs.DiscoveryTarget) error {
return s.stateConfig.cache.Notify(ctx, cachetype.HealthServicesName, &structs.ServiceSpecificRequest{ return s.stateConfig.cache.Notify(ctx, cachetype.HealthServicesName, &structs.ServiceSpecificRequest{
@ -844,7 +856,8 @@ func (s *handlerConnectProxy) handleUpdate(ctx context.Context, u cache.UpdateEv
cfg: cfg, cfg: cfg,
meshGateway: meshGateway, meshGateway: meshGateway,
} }
err = (*handlerUpstreams)(s).watchDiscoveryChain(ctx, snap, watchOpts) up := &handlerUpstreams{handlerState: s.handlerState}
err = up.watchDiscoveryChain(ctx, snap, watchOpts)
if err != nil { if err != nil {
return fmt.Errorf("failed to watch discovery chain for %s: %v", svc.String(), err) return fmt.Errorf("failed to watch discovery chain for %s: %v", svc.String(), err)
} }
@ -1776,7 +1789,8 @@ func (s *handlerIngressGateway) handleUpdate(ctx context.Context, u cache.Update
namespace: u.DestinationNamespace, namespace: u.DestinationNamespace,
datacenter: s.source.Datacenter, datacenter: s.source.Datacenter,
} }
err := (*handlerUpstreams)(s).watchDiscoveryChain(ctx, snap, watchOpts) up := &handlerUpstreams{handlerState: s.handlerState}
err := up.watchDiscoveryChain(ctx, snap, watchOpts)
if err != nil { if err != nil {
return fmt.Errorf("failed to watch discovery chain for %s: %v", u.Identifier(), err) return fmt.Errorf("failed to watch discovery chain for %s: %v", u.Identifier(), err)
} }