fixes in Consul KV base support

consul/discovery.go

@@ -2,41 +2,41 @@ package consul
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
 )
 
 type Service struct {
-	AppID       string
+	Name    string
-	Name        string
+	Address string
-	Address     string
+	appID   string
-	IP          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(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Service, error) {
 	s := new(Service)
-	s.AppID = appID
+	s.Name = name
-	s.Name = strings.Replace(appName, "-", "_", -1)
+	s.Address = hostname
-	s.Address = domain
+	s.appID = id
-	s.IP = ip
+	s.domain = domain
-	s.Port = appPort
+	s.port = appPort
-	s.TTL = time.Second * 15
+	s.ttl = time.Second * 15
 
-	client, err := consul.NewClient(newClientConfig(serverAddr))
+	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
 }
@@ -49,98 +49,107 @@ 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.IP, s.Port)
+	return fmt.Sprintf("http://%s:%d/", s.Address, s.port)
 }
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
 		Name:    s.Name,
-		Address: s.IP,
+		Address: s.Address,
-		Port:    s.Port,
+		Port:    s.port,
 		Tags:    s.getTags(),
-		Meta:    s.getMetadata(),
 		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 s.UpdateTTL(def)
+
+	go func(s *Service) { // startup register
+		ticker := time.NewTicker(time.Millisecond * 100)
+		for range ticker.C {
+			ok, _ := s.healthCheck()
+			if ok {
+				ticker.Stop()
+			}
+		}
+	}(s)
+
+	go func(s *Service) { // TTL
+		interval := s.ttl - time.Second*2
+		ticker := time.NewTicker(interval)
+		for range ticker.C {
+			_, 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) UpdateTTL(service *consul.AgentServiceRegistration) {
+func (s *Service) KV() *consul.KV {
-	ticker := time.NewTicker(s.TTL / 2)
+	return s.kv
-	for range ticker.C {
+}
-		ok, err := s.check()
+
-		if !ok {
+func (s *Service) healthCheck() (bool, error) {
-			if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), err.Error()); err != nil {
+	alive := func() bool {
-				log.Println(err)
+		client := &http.Client{}
-			}
+		healthUrl := s.GetFullAddr() + "health"
-		} else {
+		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
-			if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+		if err != nil {
-				log.Println(err)
+			return false
-			}
 		}
-	}
+		req.Header.Set("User-Agent", "Health Check")
-}
 
-func (s *Service) check() (bool, error) {
+		resp, err := client.Do(req)
-	client := &http.Client{}
+		if err != nil {
-	healthUrl := fmt.Sprintf("http://%s/health", s.GetFullAddr())
+			return false
-	req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
+		}
-	if err != nil {
+		defer resp.Body.Close()
-		return false, ErrServiceUnavailable
-	}
-	req.Header.Set("User-Agent", "Health Check")
 
-	resp, err := client.Do(req)
+		return resp.StatusCode == http.StatusOK
-	if err != nil {
+	}()
-		return false, ErrServiceUnavailable
-	}
-	defer resp.Body.Close()
 
-	if resp.StatusCode == http.StatusOK {
+	if alive {
+		if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			return false, err
+		}
 		return true, nil
 	}
 
+	if err := s.agent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
+		return false, err
+	}
 	return false, ErrServiceUnavailable
 }
 
-func (s *Service) getMetadata() map[string]string {
-	m := map[string]string{}
-	m["traefik/http/services/"+s.Name+"/loadBalancer/servers/0/url"] = s.GetFullAddr()
-
-	return m
-}
-
 func (s *Service) getTags() []string {
-	// fullName := fmt.Sprintf("%s-%s", s.Name, s.AppID)
-	// bFullAddr := fmt.Sprintf("http://%s:%d/", s.IP, s.Port) // FIXME: declare one once - dont need to refresh....
-
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Address + "`)",
+		"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.passhostheader=false",
 		"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,
 		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",