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

Merge pull request #10378 from hashicorp/dnephin/agent-self-primary-dc 

http: add PrimaryDatacenter to the /v1/agent/self  response
This commit is contained in:
Daniel Nephin 2021-06-11 13:44:07 -04:00 committed by GitHub
parent 652a782d57 95315e9e06
commit 69262022da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
agent/agent_endpoint.go
View File

@ -74,19 +74,21 @@ func (s *HTTPHandlers) AgentSelf(resp http.ResponseWriter, req *http.Request) (i
} }
config := struct { config := struct {
Datacenter string Datacenter string
NodeName string PrimaryDatacenter string
NodeID string NodeName string
Revision string NodeID string
Server bool Revision string
Version string Server bool
Version string
}{ }{
Datacenter: s.agent.config.Datacenter, Datacenter: s.agent.config.Datacenter,
NodeName: s.agent.config.NodeName, PrimaryDatacenter: s.agent.config.PrimaryDatacenter,
NodeID: string(s.agent.config.NodeID), NodeName: s.agent.config.NodeName,
Revision: s.agent.config.Revision, NodeID: string(s.agent.config.NodeID),
Server: s.agent.config.ServerMode, Revision: s.agent.config.Revision,
Version: s.agent.config.Version, Server: s.agent.config.ServerMode,
Version: s.agent.config.Version,
} }
return Self{ return Self{
Config: config, Config: config,