module update

api/basket.go

@@ -3,8 +3,7 @@ package api
 import (
 	"fmt"
 
-	"git.ego.cloudns.be/egommerce/api-entities/basket"
+	def "git.pbiernat.io/egommerce/api-entities/http"
-	basket "git.ego.cloudns.be/egommerce/api-entities/basket/dto"
 	"github.com/go-redis/redis/v8"
 )
 
@@ -16,9 +15,9 @@ type BasketAPI struct {
 	httpClient *HttpClient
 }
 
-func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
+func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
-	req := &basket.GetBasketRequestDTO{BasketID: basketID}
+	req := &def.GetBasketRequest{BasketID: basketID}
-	res := new(basket.GetBasketResponse)
+	res := new(def.GetBasketResponse)
 	if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
 		return nil, err
 	}
@@ -26,9 +25,9 @@ func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, er
 	return res, nil
 }
 
-func (a *BasketAPI) GetBasketItems(basketID string) ([]*basket.GetBasketItemsResponseDTO, error) {
+func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
 	url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
-	var res []*basket.GetBasketItemsResponseDTO
+	var res []*def.GetBasketItemsResponse
 	if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
 		return nil, err
 	}

consul/discovery.go

@@ -3,8 +3,10 @@ package consul
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 	"time"
 
+	"git.ego.cloudns.be/egommerce/go-api-pkg/config"
 	consul "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/connect"
 )
@@ -125,7 +127,7 @@ func (s *Service) RegisterHealthChecks() {
 	}()
 
 	go func() { // TTL
-		t := time.NewTicker(time.Second * 5)
+		t := time.NewTicker(s.ttl)
 		for range t.C {
 			if _, err := s.healthCheck(); err != nil {
 				// fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
@@ -193,29 +195,29 @@ func (s *Service) healthCheck() (bool, error) {
 
 func (s *Service) getTags() []string {
 	tags := []string{
-		// "traefik.enable=true",
+		"traefik.enable=true",
 		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
 		// "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 + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", "https://identity.service.ego.io/api/v1/traefik"),
+		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", "https://identity.service.ego.io/api/v1/traefik"),
-		// "traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
+		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
-		// "traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
+		"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
 		// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.attempts=3",
 		// "treafik.http.middlewares.retryif_" + s.Name + ".plugin.retryif.statusCode=503",
-		// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`) && PathPrefix(`" + s.pathPrefix + "`)",
+		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`) && PathPrefix(`" + s.pathPrefix + "`)",
-		// "traefik.http.routers." + s.Name + ".entryPoints=https",
+		"traefik.http.routers." + s.Name + ".entryPoints=https",
-		// "traefik.http.routers." + s.Name + ".tls=true",
+		"traefik.http.routers." + s.Name + ".tls=true",
-		// "traefik.http.routers." + s.Name + ".service=" + s.Name,
+		"traefik.http.routers." + s.Name + ".service=" + s.Name,
 		// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name,
-		// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name + ",requestid_" + s.Name + "",
+		"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name + ",requestid_" + s.Name + "",
-		// "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=https",
+		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=https",
-		// "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.services." + s.Name + ".loadbalancer.passhostheader=true",
+		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
-		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=5s",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=5s",
-		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
-		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
+		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
-		// "traefik.tls.certificates.certfile=certs/client.crt",
+		"traefik.tls.certificates.certfile=certs/client.crt",
-		// "traefik.tls.certificates.keyfile=certs/client.key",
+		"traefik.tls.certificates.keyfile=certs/client.key",
 	}
 
 	return tags