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

Move assertion to after config fetch

This commit is contained in:
freddygv 2021-11-10 10:50:08 -07:00
parent 2261d51515
commit 5ac1ab359b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/consul/server_connect.go
View File

@ -16,7 +16,7 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
if err != nil { if err != nil {
return nil, err return nil, err
} }
if config == nil { if config == nil || config.ClusterID == "" {
return nil, fmt.Errorf("CA has not finished initializing") return nil, fmt.Errorf("CA has not finished initializing")
} }
@ -29,9 +29,6 @@ func (s *Server) getCARoots(ws memdb.WatchSet, state *state.Store) (*structs.Ind
// defensive. // defensive.
return nil, fmt.Errorf("no cluster trust domain setup") return nil, fmt.Errorf("no cluster trust domain setup")
} }
if signingID.ClusterID == "" {
return nil, fmt.Errorf("CA has not finished initializing")
}
indexedRoots.TrustDomain = signingID.Host() indexedRoots.TrustDomain = signingID.Host()