From cd586392598191b42961480c81cd00852271bb44 Mon Sep 17 00:00:00 2001 From: Jonathan Burnhams Date: Thu, 22 Oct 2020 16:31:46 +0100 Subject: [PATCH] Support TLSSkipVerify for https also. Reduce repetition of Timeout --- consul/consul.go | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/consul/consul.go b/consul/consul.go index 13e8f18b3..e6c47bd31 100644 --- a/consul/consul.go +++ b/consul/consul.go @@ -96,17 +96,11 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ } if path := service.Attrs["check_http"]; path != "" { check.HTTP = fmt.Sprintf("http://%s:%d%s", service.IP, service.Port, path) - if timeout := service.Attrs["check_timeout"]; timeout != "" { - check.Timeout = timeout - } if method := service.Attrs["check_http_method"]; method != "" { check.Method = method } } else if path := service.Attrs["check_https"]; path != "" { check.HTTP = fmt.Sprintf("https://%s:%d%s", service.IP, service.Port, path) - if timeout := service.Attrs["check_timeout"]; timeout != "" { - check.Timeout = timeout - } if method := service.Attrs["check_https_method"]; method != "" { check.Method = method } @@ -118,19 +112,10 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ check.TTL = ttl } else if tcp := service.Attrs["check_tcp"]; tcp != "" { check.TCP = fmt.Sprintf("%s:%d", service.IP, service.Port) - if timeout := service.Attrs["check_timeout"]; timeout != "" { - check.Timeout = timeout - } } else if grpc := service.Attrs["check_grpc"]; grpc != "" { check.GRPC = fmt.Sprintf("%s:%d", service.IP, service.Port) - if timeout := service.Attrs["check_timeout"]; timeout != "" { - check.Timeout = timeout - } if useTLS := service.Attrs["check_grpc_use_tls"]; useTLS != "" { check.GRPCUseTLS = true - if tlsSkipVerify := service.Attrs["check_tls_skip_verify"]; tlsSkipVerify != "" { - check.TLSSkipVerify = true - } } } else { return nil @@ -141,6 +126,12 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ } else { check.Interval = DefaultInterval } + if timeout := service.Attrs["check_timeout"]; timeout != "" { + check.Timeout = timeout + } + if tlsSkipVerify := service.Attrs["check_tls_skip_verify"]; tlsSkipVerify != "" { + check.TLSSkipVerify = true + } } if deregister_after := service.Attrs["check_deregister_after"]; deregister_after != "" { check.DeregisterCriticalServiceAfter = deregister_after