fixes in Consul KV base support

consul/discovery.go

@@ -10,31 +10,33 @@ import (
 )
 
 type Service struct {
-	AppID       string
+	Name    string
-	Name        string
+	Address string
-	Domain      string
+	appID   string
-	Address     string
+	domain  string
-	Port        int
+	port    int
-	TTL         time.Duration
+	ttl     time.Duration
-	ConsulAgent *consul.Agent
+	agent   *consul.Agent
+	kv      *consul.KV
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
 func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Service, error) {
 	s := new(Service)
-	s.AppID = id
 	s.Name = name
 	s.Address = hostname
-	s.Domain = domain
+	s.appID = id
-	s.Port = appPort
+	s.domain = domain
-	s.TTL = time.Second * 15
+	s.port = appPort
+	s.ttl = time.Second * 15
 
 	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
 	}
-	s.ConsulAgent = client.Agent()
+	s.agent = client.Agent()
+	s.kv = client.KV()
 
 	return s, nil
 }
@@ -47,11 +49,11 @@ func newClientConfig(serverAddr string) *consul.Config {
 }
 
 func (s *Service) GetID() string {
-	return fmt.Sprintf("%s_%s", s.Name, s.AppID)
+	return fmt.Sprintf("%s_%s", s.Name, s.appID)
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("http://%s:%d/", s.Address, s.Port)
+	return fmt.Sprintf("http://%s:%d/", s.Address, s.port)
 }
 
 func (s *Service) Register() error {
@@ -59,18 +61,18 @@ func (s *Service) Register() error {
 		ID:      s.GetID(),
 		Name:    s.Name,
 		Address: s.Address,
-		Port:    s.Port,
+		Port:    s.port,
 		Tags:    s.getTags(),
 		Check: &consul.AgentServiceCheck{
-			TTL: s.TTL.String(),
+			TTL: s.ttl.String(),
 		},
 	}
 
-	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
+	if err := s.agent.ServiceRegister(def); err != nil {
 		return err
 	}
 
-	go func() { // startup register
+	go func(s *Service) { // startup register
 		ticker := time.NewTicker(time.Millisecond * 100)
 		for range ticker.C {
 			ok, _ := s.healthCheck()
@@ -78,24 +80,27 @@ func (s *Service) Register() error {
 				ticker.Stop()
 			}
 		}
-	}()
+	}(s)
 
-	go func() { // TTL
+	go func(s *Service) { // TTL
-		interval := s.TTL - time.Second*3
+		interval := s.ttl - time.Second*2
 		ticker := time.NewTicker(interval)
 		for range ticker.C {
-			fmt.Println("HC call: ", time.Now().String())
 			_, err := s.healthCheck()
 			if err != nil {
 				fmt.Printf("TTL Error: %v\n", err)
 			}
 		}
-	}()
+	}(s)
 
 	return nil
 }
 func (s *Service) Unregister() error {
-	return s.ConsulAgent.ServiceDeregister(s.GetID())
+	return s.agent.ServiceDeregister(s.GetID())
+}
+
+func (s *Service) KV() *consul.KV {
+	return s.kv
 }
 
 func (s *Service) healthCheck() (bool, error) {
@@ -118,13 +123,13 @@ func (s *Service) healthCheck() (bool, error) {
 	}()
 
 	if alive {
-		if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+		if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
 			return false, err
 		}
 		return true, nil
 	}
 
-	if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
+	if err := s.agent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
 		return false, err
 	}
 	return false, ErrServiceUnavailable
@@ -133,15 +138,17 @@ func (s *Service) healthCheck() (bool, error) {
 func (s *Service) getTags() []string {
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Domain + "`)",
+		"traefik.http.routers." + s.Name + ".rule=Headers(`X-API-SERVICE`, `" + s.Name + "`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
 		"traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
 		"traefik.http.routers." + s.Name + ".middlewares=compress,requestid",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
-		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.Port),
+		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
 		"traefik.http.middlewares.compress.compress=true",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
+		"traefik.tls.certificates.certfile=/certs/client.cert",
+		"traefik.tls.certificates.keyfile=/certs/client.key",
 		// "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,