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

Remove unnecessary methods 

They call only a single method and add no additional functionality
This commit is contained in:
Daniel Nephin 2020-03-23 13:27:59 -04:00
parent 8df3746927
commit a95974cf79
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
command/connect/envoy/envoy.go
View File

@ -208,7 +208,6 @@ func canBindInternal(addr string, ifAddrs []net.Addr) bool {
func canBind(addr string) bool { func canBind(addr string) bool {
ifAddrs, err := net.InterfaceAddrs() ifAddrs, err := net.InterfaceAddrs()
if err != nil { if err != nil {
return false return false
} }
@ -344,14 +343,14 @@ func (c *cmd) Run(args []string) int {
// See if we need to lookup proxyID // See if we need to lookup proxyID
if c.proxyID == "" && c.sidecarFor != "" { if c.proxyID == "" && c.sidecarFor != "" {
proxyID, err := c.lookupProxyIDForSidecar() proxyID, err := proxyCmd.LookupProxyIDForSidecar(c.client, c.sidecarFor)
if err != nil { if err != nil {
c.UI.Error(err.Error()) c.UI.Error(err.Error())
return 1 return 1
} }
c.proxyID = proxyID c.proxyID = proxyID
} else if c.proxyID == "" && c.meshGateway { } else if c.proxyID == "" && c.meshGateway {
gatewaySvc, err := c.lookupGatewayProxy() gatewaySvc, err := proxyCmd.LookupGatewayProxy(c.client)
if err != nil { if err != nil {
c.UI.Error(err.Error()) c.UI.Error(err.Error())
return 1 return 1
@ -361,8 +360,7 @@ func (c *cmd) Run(args []string) int {
} }
if c.proxyID == "" { if c.proxyID == "" {
c.UI.Error("No proxy ID specified. One of -proxy-id or -sidecar-for/-mesh-gateway is " + c.UI.Error("No proxy ID specified. One of -proxy-id or -sidecar-for/-mesh-gateway is required")
"required")
return 1 return 1
} }
@ -572,14 +570,6 @@ func (c *cmd) generateConfig() ([]byte, error) {
return bsCfg.GenerateJSON(args) return bsCfg.GenerateJSON(args)
} }
func (c *cmd) lookupProxyIDForSidecar() (string, error) {
return proxyCmd.LookupProxyIDForSidecar(c.client, c.sidecarFor)
}
func (c *cmd) lookupGatewayProxy() (*api.AgentService, error) {
return proxyCmd.LookupGatewayProxy(c.client)
}
func (c *cmd) lookupGRPCPort() (int, error) { func (c *cmd) lookupGRPCPort() (int, error) {
self, err := c.client.Agent().Self() self, err := c.client.Agent().Self()
if err != nil { if err != nil {