497df1ca3b
This is the OSS portion of enterprise PR 2056. This commit provides server-local implementations of the proxycfg.ConfigEntry and proxycfg.ConfigEntryList interfaces, that source data from streaming events. It makes use of the LocalMaterializer type introduced for peering replication, adding the necessary support for authorization. It also adds support for "wildcard" subscriptions (within a topic) to the event publisher, as this is needed to fetch service-resolvers for all services when configuring mesh gateways. Currently, events will be emitted for just the ingress-gateway, service-resolver, and mesh config entry types, as these are the only entries required by proxycfg — the events will be emitted on topics named IngressGateway, ServiceResolver, and MeshConfig topics respectively. Though these events will only be consumed "locally" for now, they can also be consumed via the gRPC endpoint (confirmed using grpcurl) so using them from client agents should be a case of swapping the LocalMaterializer for an RPCMaterializer.
45 lines
1.6 KiB
Go
45 lines
1.6 KiB
Go
package consul
|
|
|
|
import (
|
|
"github.com/hashicorp/go-hclog"
|
|
"google.golang.org/grpc"
|
|
|
|
"github.com/hashicorp/consul-net-rpc/net/rpc"
|
|
|
|
"github.com/hashicorp/consul/agent/consul/stream"
|
|
"github.com/hashicorp/consul/agent/pool"
|
|
"github.com/hashicorp/consul/agent/router"
|
|
"github.com/hashicorp/consul/agent/rpc/middleware"
|
|
"github.com/hashicorp/consul/agent/token"
|
|
"github.com/hashicorp/consul/tlsutil"
|
|
)
|
|
|
|
type Deps struct {
|
|
EventPublisher *stream.EventPublisher
|
|
Logger hclog.InterceptLogger
|
|
TLSConfigurator *tlsutil.Configurator
|
|
Tokens *token.Store
|
|
Router *router.Router
|
|
ConnPool *pool.ConnPool
|
|
GRPCConnPool GRPCClientConner
|
|
LeaderForwarder LeaderForwarder
|
|
// GetNetRPCInterceptorFunc, if not nil, sets the net/rpc rpc.ServerServiceCallInterceptor on
|
|
// the server side to record metrics around the RPC requests. If nil, no interceptor is added to
|
|
// the rpc server.
|
|
GetNetRPCInterceptorFunc func(recorder *middleware.RequestRecorder) rpc.ServerServiceCallInterceptor
|
|
// NewRequestRecorderFunc provides a middleware.RequestRecorder for the server to use; it cannot be nil
|
|
NewRequestRecorderFunc func(logger hclog.Logger, isLeader func() bool, localDC string) *middleware.RequestRecorder
|
|
EnterpriseDeps
|
|
}
|
|
|
|
type GRPCClientConner interface {
|
|
ClientConn(datacenter string) (*grpc.ClientConn, error)
|
|
ClientConnLeader() (*grpc.ClientConn, error)
|
|
SetGatewayResolver(func(string) string)
|
|
}
|
|
|
|
type LeaderForwarder interface {
|
|
// UpdateLeaderAddr updates the leader address in the local DC's resolver.
|
|
UpdateLeaderAddr(datacenter, addr string)
|
|
}
|