Consul refactor

consul/discovery.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"time"
 
+	"git.pbiernat.dev/egommerce/go-api-pkg/config"
 	consul "github.com/hashicorp/consul/api"
 )
 
@@ -18,8 +19,8 @@ type Service struct {
 	port       int
 	ttl        time.Duration
 	agent      *consul.Agent
+	connect    *consul.Connect
 	kv         *consul.KV
-	catalog    *consul.Catalog
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -32,15 +33,15 @@ func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort
 	s.domain = domain
 	s.pathPrefix = pathPrefix
 	s.port = appPort
-	s.ttl = time.Second * 15
+	s.ttl = time.Second * 10
 
 	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
 	}
 	s.agent = client.Agent()
+	s.connect = client.Connect()
 	s.kv = client.KV()
-	s.catalog = client.Catalog()
 
 	return s, nil
 }
@@ -53,7 +54,7 @@ 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 {
@@ -69,7 +70,7 @@ func (s *Service) Register() error {
 		Tags:    s.getTags(),
 		Check: &consul.AgentServiceCheck{
 			TTL:                            s.ttl.String(),
-			DeregisterCriticalServiceAfter: "5s",
+			DeregisterCriticalServiceAfter: "10s",
 		},
 	}
 
@@ -78,7 +79,7 @@ func (s *Service) Register() error {
 	}
 
 	go func(s *Service) { // startup register
-		ticker := time.NewTicker(time.Millisecond * 100)
+		ticker := time.NewTicker(time.Second * 1)
 		for range ticker.C {
 			if ok, _ := s.healthCheck(); ok {
 				ticker.Stop()
@@ -91,7 +92,7 @@ func (s *Service) Register() error {
 		ticker := time.NewTicker(interval)
 		for range ticker.C {
 			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("TTL Error: %v\n", err)
+				fmt.Printf("TTL Error #: %v\n", err)
 			}
 		}
 	}(s)
@@ -102,12 +103,12 @@ func (s *Service) Unregister() error {
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
-func (s *Service) KV() *consul.KV {
-	return s.kv
+func (s *Service) Connect() *consul.Connect {
+	return s.connect
 }
 
-func (s *Service) Catalog() *consul.Catalog {
-	return s.catalog
+func (s *Service) KV() *consul.KV {
+	return s.kv
 }
 
 func (s *Service) healthCheck() (bool, error) {
@@ -118,7 +119,7 @@ func (s *Service) healthCheck() (bool, error) {
 		if err != nil {
 			return false
 		}
-		req.Header.Set("User-Agent", "Health Check")
+		req.Header.Set("User-Agent", "service/internal")
 
 		resp, err := client.Do(req)
 		if err != nil {
@@ -131,6 +132,7 @@ func (s *Service) healthCheck() (bool, error) {
 
 	if alive {
 		if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			fmt.Printf("Failed to pass TTL: %v", err)
 			return false, err
 		}
 		return true, nil
@@ -153,7 +155,7 @@ func (s *Service) getTags() []string {
 		"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.passhostheader=false",
-		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL="",
+		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
 		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
 		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
 		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",