Update module names

api/basket.go

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

config/config.go

@@ -3,20 +3,19 @@ package config
 import (
 	"os"
 
-	"github.com/gofiber/fiber/v2/log"
 	"github.com/joho/godotenv"
 )
 
 var ErrLoadingEnvs error
 
 func init() {
-	ErrLoadingEnvs = godotenv.Load()
+	ErrLoadingEnvs = godotenv.Load(".env.local", ".env")
 }
 
 func GetEnv(name string, defVal string) string {
 	env := os.Getenv(name)
 	if env == "" {
-		log.Panicf("Missing %s env variable", name)
+		return defVal
 	}
 
 	return env

consul/discovery.go

@@ -3,10 +3,8 @@ package consul
 import (
 	"fmt"
 	"net/http"
-	"strconv"
 	"time"
 
-	"git.pbiernat.io/egommerce/go-api-pkg/config"
 	consul "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/connect"
 )
@@ -17,26 +15,35 @@ type Service struct {
 	appID      string
 	domain     string
 	pathPrefix string
+	tls        bool
 	port       int
 	ttl        time.Duration
 	client     *consul.Client
 	agent      *consul.Agent
 	connect    *connect.Service
 	kv         *consul.KV
+
+	// hcTicker  *time.Ticker
+	// ttlTicker *time.Ticker
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.Name = name
-	s.Address = hostname
+	s.Address = addr
 	s.appID = id
 	s.domain = domain
 	s.pathPrefix = pathPrefix
+	s.tls = true // FIXME add arg
 	s.port = appPort
 	s.ttl = time.Second * 10
 
+	if useDomainOverIp == "true" { // FIXME types...
+		s.Address = domain
+	}
+
 	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
@@ -61,9 +68,8 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	isTLS := s.port == 443
 	proto := "http"
-	if isTLS {
+	if s.tls {
 		proto = "https"
 	}
 	return fmt.Sprintf("%s://%s:%d/", proto, s.domain, s.port)
@@ -77,11 +83,13 @@ func (s *Service) Register() error {
 		Address: s.Address,
 		Port:    s.port,
 		Tags:    s.getTags(),
-		// Connect: &consul.AgentServiceConnect{Native: true},
+		Connect: &consul.AgentServiceConnect{Native: true},
 		// Proxy: &consul.AgentServiceConnectProxyConfig{
 		// 	DestinationServiceName: s.Name,
 		// },
 		Check: &consul.AgentServiceCheck{
+			// Interval:                       "5s",
+			// Timeout:                        "1s",
 			TTL:                            s.ttl.String(),
 			Status:                         "passing",
 			DeregisterCriticalServiceAfter: "10s",
@@ -95,25 +103,33 @@ func (s *Service) Register() error {
 	return nil
 }
 func (s *Service) Unregister() error {
+	// s.ttlTicker.Stop()
+	// s.hcTicker.Stop()
+
+	s.client.Catalog().Deregister(&consul.CatalogDeregistration{
+		Address:   s.Address,
+		ServiceID: s.GetID(),
+	}, nil)
+
 	return s.agent.ServiceDeregister(s.GetID())
 }
 
 func (s *Service) RegisterHealthChecks() {
 	go func() { // startup register
-		ticker := time.NewTicker(time.Second * 1)
-		for range ticker.C {
+		t := time.NewTicker(time.Second)
+		for range t.C {
 			if ok, _ := s.healthCheck(); ok {
-				ticker.Stop()
+				t.Stop()
 			}
 		}
 	}()
 
 	go func() { // TTL
-		interval := s.ttl - (time.Second * 2) // 2 seconds overhead
-		ticker := time.NewTicker(interval)
-		for range ticker.C {
+		t := time.NewTicker(time.Second * 5)
+		for range t.C {
 			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("HealthCheck endpoint not available #: %v\n", err)
+				// fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
+				t.Stop()
 			}
 		}
 	}()
@@ -126,11 +142,10 @@ func (s *Service) Connect() (*connect.Service, error) {
 	// })
 	svc, err := connect.NewService(s.Name, s.client)
 	s.connect = svc
-	cnf := svc.ServerTLSConfig()
-	fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", s.Name, cnf)
-	for k, c := range cnf.Certificates {
-		fmt.Printf("CONNECT CERT %d: %v", k, c)
-	}
+	fmt.Printf("CONNECT SERVER:: %s CERTS:: %v\n", s.Name, svc.ServerTLSConfig())
+	// for k, c := range cnf.Certificates {
+	// 	fmt.Printf("CONNECT CERT %d: %v", k, c)
+	// }
 
 	return svc, err
 }
@@ -143,6 +158,7 @@ func (s *Service) healthCheck() (bool, error) {
 	alive := func() bool {
 		client := &http.Client{}
 		healthUrl := fmt.Sprintf("%s%s?name=%s", s.GetFullAddr(), "health", s.Name)
+		// fmt.Printf("HealthCheck URL: %s%s?name=%s", s.GetFullAddr(), "health", s.Name)
 		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 		if err != nil {
 			return false
@@ -177,25 +193,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 + ".forwardauth.trustForwardHeader=true",
-		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
-		"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
-		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
-		"traefik.http.routers." + s.Name + ".rule=PathPrefix(`" + s.pathPrefix + "`)",
-		// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
-		"traefik.http.routers." + s.Name + ".entryPoints=https",
+		// "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 + ".service=" + s.Name,
 		// "traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",stripprefix_" + s.Name,
-		"traefik.http.routers." + s.Name + ".middlewares=auth_" + s.Name + ",requestid_" + s.Name + ",stripprefix_" + s.Name + "",
-		"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.tls.certificates.certfile=/certs/client.cert",
-		"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

go.mod

@@ -1,9 +1,8 @@
-module git.pbiernat.io/egommerce/go-api-pkg
+module git.ego.freeddns.org/egommerce/go-api-pkg
 
 go 1.18
 
 require (
-	git.pbiernat.io/egommerce/api-entities v0.2.3
 	github.com/fluent/fluent-logger-golang v1.9.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/hashicorp/consul v1.16.0
@@ -12,6 +11,7 @@ require (
 )
 
 require (
+	git.ego.freeddns.org/egommerce/api-entities v0.3.0 // 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,7 +35,10 @@ 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.pbiernat.io/egommerce/api-entities v0.2.3/go.mod h1:INXAG5x4+i+vNwg1NpfPHiDW8nY1kn1K7pgLOtX+/I0=
+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=
 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=