API Basket update

api/basket.go

@@ -3,7 +3,8 @@ package api
 import (
 	"fmt"
 
-	def "git.pbiernat.io/egommerce/api-entities/http"
+	"git.ego.cloudns.be/egommerce/api-entities/basket"
+	basket "git.ego.cloudns.be/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) {
+func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
-	req := &def.GetBasketRequest{BasketID: basketID}
+	req := &basket.GetBasketRequestDTO{BasketID: basketID}
-	res := new(def.GetBasketResponse)
+	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
 	}

consul/discovery.go

@@ -2,6 +2,7 @@ package consul
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -25,8 +26,8 @@ type Service struct {
 	connect    *connect.Service
 	kv         *consul.KV
 
-	hcTicker  *time.Ticker
+	// hcTicker  *time.Ticker
-	ttlTicker *time.Ticker
+	// ttlTicker *time.Ticker
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
@@ -60,6 +61,7 @@ func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix st
 
 func newClientConfig(serverAddr string) *consul.Config {
 	conf := consul.DefaultConfig()
+	log.Printf("Setting consul server addr: %s", serverAddr)
 	conf.Address = serverAddr
 
 	return conf
@@ -85,11 +87,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",
@@ -142,11 +146,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 CERTS:: %v\n", s.Name, svc.ServerTLSConfig())
-	fmt.Printf("CONNECT SERVER:: %s CONFIG:: %v\n", s.Name, cnf)
+	// for k, c := range cnf.Certificates {
-	for k, c := range cnf.Certificates {
+	// 	fmt.Printf("CONNECT CERT %d: %v", k, c)
-		fmt.Printf("CONNECT CERT %d: %v", k, c)
+	// }
-	}
 
 	return svc, err
 }

go.mod

@@ -1,9 +1,8 @@
-module git.pbiernat.io/egommerce/go-api-pkg
+module git.ego.cloudns.be/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.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,7 +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.pbiernat.io/egommerce/api-entities v0.2.3/go.mod h1:INXAG5x4+i+vNwg1NpfPHiDW8nY1kn1K7pgLOtX+/I0=
+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=