status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-01-24 20:51:10 +00:00
Code Issues Projects Releases Wiki Activity

address comment feedback

Browse Source
This commit is contained in:
Mitchell Hashimoto 2018-05-22 10:33:14 -07:00
parent db10240bea
commit eb2a6952ba
No known key found for this signature in database
GPG Key ID: 744E147AA52F5B0A
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/agent_endpoint.go
View File

@ -907,7 +907,8 @@ func (s *HTTPServer) AgentConnectCARoots(resp http.ResponseWriter, req *http.Req
// AgentConnectCALeafCert returns the certificate bundle for a service // AgentConnectCALeafCert returns the certificate bundle for a service
// instance. This supports blocking queries to update the returned bundle. // instance. This supports blocking queries to update the returned bundle.
func (s *HTTPServer) AgentConnectCALeafCert(resp http.ResponseWriter, req *http.Request) (interface{}, error) { func (s *HTTPServer) AgentConnectCALeafCert(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
// Get the service ID. Note that this is the ID of a service instance. // Get the service name. Note that this is the name of the sevice,
// not the ID of the service instance.
serviceName := strings.TrimPrefix(req.URL.Path, "/v1/agent/connect/ca/leaf/") serviceName := strings.TrimPrefix(req.URL.Path, "/v1/agent/connect/ca/leaf/")
args := cachetype.ConnectCALeafRequest{ args := cachetype.ConnectCALeafRequest{

2
command/connect/proxy/proxy.go
View File

@ -340,6 +340,8 @@ Usage: consul connect proxy [options]
a non-Connect-aware application to use Connect. a non-Connect-aware application to use Connect.
The proxy requires service:write permissions for the service it represents. The proxy requires service:write permissions for the service it represents.
The token may be passed via the CLI or the CONSUL_TOKEN environment
variable.
Consul can automatically start and manage this proxy by specifying the Consul can automatically start and manage this proxy by specifying the
"proxy" configuration within your service definition. "proxy" configuration within your service definition.