status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Instantiate secure resource service client after the grpc server (#18712)

This commit is contained in:
Iryna Shustava 2023-09-08 09:48:49 -06:00 committed by GitHub
parent 9adb617695
commit bbc2763b9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
agent/consul/server.go
View File

@ -817,11 +817,7 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
s.reportingManager = reporting.NewReportingManager(s.logger, getEnterpriseReportingDeps(flat), s, s.fsm.State()) s.reportingManager = reporting.NewReportingManager(s.logger, getEnterpriseReportingDeps(flat), s, s.fsm.State())
go s.reportingManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh}) go s.reportingManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh})
// Setup resource service clients. // Setup insecure resource service client.
if err := s.setupSecureResourceServiceClient(); err != nil {
return nil, err
}
if err := s.setupInsecureResourceServiceClient(flat.Registry, logger); err != nil { if err := s.setupInsecureResourceServiceClient(flat.Registry, logger); err != nil {
return nil, err return nil, err
} }
@ -829,6 +825,12 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
// Initialize external gRPC server // Initialize external gRPC server
s.setupExternalGRPC(config, flat, logger) s.setupExternalGRPC(config, flat, logger)
// Setup secure resource service client. We need to do it after we setup the
// gRPC server because it needs the server to be instantiated.
if err := s.setupSecureResourceServiceClient(); err != nil {
return nil, err
}
// Initialize internal gRPC server. // Initialize internal gRPC server.
// //
// Note: some "external" gRPC services are also exposed on the internal gRPC server // Note: some "external" gRPC services are also exposed on the internal gRPC server
@ -1400,6 +1402,10 @@ func (s *Server) setupExternalGRPC(config *Config, deps Deps, logger hclog.Logge
} }
func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Registry, logger hclog.Logger) error { func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Registry, logger hclog.Logger) error {
if s.raftStorageBackend == nil {
return fmt.Errorf("raft storage backend cannot be nil")
}
server := resourcegrpc.NewServer(resourcegrpc.Config{ server := resourcegrpc.NewServer(resourcegrpc.Config{
Registry: typeRegistry, Registry: typeRegistry,
Backend: s.raftStorageBackend, Backend: s.raftStorageBackend,
@ -1418,6 +1424,9 @@ func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Regist
} }
func (s *Server) setupSecureResourceServiceClient() error { func (s *Server) setupSecureResourceServiceClient() error {
if s.resourceServiceServer == nil {
return fmt.Errorf("resource service server cannot be nil")
}
conn, err := s.runInProcessGRPCServer(s.resourceServiceServer.Register) conn, err := s.runInProcessGRPCServer(s.resourceServiceServer.Register)
if err != nil { if err != nil {
return err return err