module update

api/basket.go

@@ -3,8 +3,7 @@ package api
 import (
 	"fmt"
 
-	"git.ego.freeddns.org/egommerce/api-entities/basket"
-	basket "git.ego.freeddns.org/egommerce/api-entities/basket/dto"
+	def "git.pbiernat.io/egommerce/api-entities/http"
 	"github.com/go-redis/redis/v8"
 )
 
@@ -16,9 +15,9 @@ type BasketAPI struct {
 	httpClient *HttpClient
 }
 
-func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
-	req := &basket.GetBasketRequestDTO{BasketID: basketID}
-	res := new(basket.GetBasketResponse)
+func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
+	req := &def.GetBasketRequest{BasketID: basketID}
+	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.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
-		// "traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
+		"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.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 + ".entryPoints=https",
-		// "traefik.http.routers." + s.Name + ".tls=true",
-		// "traefik.http.routers." + s.Name + ".service=" + s.Name,
+		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`) && PathPrefix(`" + s.pathPrefix + "`)",
+		"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=auth_" + s.Name + ",stripprefix_" + 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.port=" + strconv.Itoa(s.port),
-		// "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
-		// "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.path=/health",
-		// "traefik.tls.certificates.certfile=certs/client.crt",
-		// "traefik.tls.certificates.keyfile=certs/client.key",
+		"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.port=" + strconv.Itoa(s.port),
+		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
+		"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.path=/health",
+		"traefik.tls.certificates.certfile=certs/client.crt",
+		"traefik.tls.certificates.keyfile=certs/client.key",
 	}
 
 	return tags

fluentd/logger.go

@@ -3,7 +3,6 @@ package fluentd
 import (
 	"fmt"
 	"log"
-	"time"
 
 	"github.com/fluent/fluent-logger-golang/fluent"
 )
@@ -15,9 +14,9 @@ type Logger struct {
 
 func NewLogger(appName, fHost string, fPort int) (*Logger, error) {
 	config := fluent.Config{
-		FluentHost:   fHost,
-		FluentPort:   fPort,
-		WriteTimeout: 100 * time.Millisecond,
+		FluentHost: fHost,
+		FluentPort: fPort,
+		// WriteTimeout: -1,
 	}
 	fluent, err := fluent.New(config)
 	if err != nil {
@@ -37,18 +36,6 @@ func (l *Logger) Log(format string, v ...any) {
 	}
 }
 
-func (l *Logger) Ping() error {
-	mapData := map[string]string{
-		"message": "Checking is Fluentd alive",
-	}
-	err := l.fluent.Post(l.appName, mapData)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func (l *Logger) Close() error {
 	return l.fluent.Close()
 }

go.mod

@@ -1,4 +1,4 @@
-module git.ego.freeddns.org/egommerce/go-api-pkg
+module git.ego.cloudns.be/egommerce/go-api-pkg
 
 go 1.18
 
@@ -11,7 +11,7 @@ require (
 )
 
 require (
-	git.ego.freeddns.org/egommerce/api-entities v0.3.0 // indirect
+	git.ego.cloudns.be/egommerce/api-entities v0.2.5 // indirect
 	github.com/DataDog/datadog-go v3.2.0+incompatible // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/armon/go-radix v1.0.0 // indirect

go.sum

@@ -35,10 +35,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-git.ego.freeddns.org/egommerce/api-entities v0.2.5 h1:A7KQNXLB3l0ck7/R6MzyU33H490feZOlEodnU6bC+DA=
-git.ego.freeddns.org/egommerce/api-entities v0.2.5/go.mod h1:xr9mW9DKq+oNO4cMqtqY3VCAVCn6iImw4MqNj51dTFc=
-git.ego.freeddns.org/egommerce/api-entities v0.3.0 h1:IhJNOfze8/D8Hgy8Mr9hoFEwrg45xeFSnVRUnUrC5xc=
-git.ego.freeddns.org/egommerce/api-entities v0.3.0/go.mod h1:IqynARw+06GOm4eZGZuepmbi7bUxWBnOB4jd5cI7jf8=
+git.ego.cloudns.be/egommerce/api-entities v0.2.5 h1:A7KQNXLB3l0ck7/R6MzyU33H490feZOlEodnU6bC+DA=
+git.ego.cloudns.be/egommerce/api-entities v0.2.5/go.mod h1:xr9mW9DKq+oNO4cMqtqY3VCAVCn6iImw4MqNj51dTFc=
 github.com/Azure/azure-sdk-for-go v44.0.0+incompatible h1:e82Yv2HNpS0kuyeCrV29OPKvEiqfs2/uJHic3/3iKdg=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM=