go.mod update priv git url

api/basket.go

@@ -3,7 +3,7 @@ package api
 import (
 	"fmt"
 
-	def "git.pbiernat.io/egommerce/api-entities/http"
+	def "git.pbiernat.dev/egommerce/api-entities/http"
 	"github.com/go-redis/redis/v8"
 )
 

api/pricing.go

@@ -3,7 +3,7 @@ package api
 import (
 	"fmt"
 
-	def "git.pbiernat.io/egommerce/api-entities/http"
+	def "git.pbiernat.dev/egommerce/api-entities/http"
 	"github.com/go-redis/redis/v8"
 )
 

consul/discovery.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"git.pbiernat.io/egommerce/go-api-pkg/config"
+	"git.pbiernat.dev/egommerce/go-api-pkg/config"
 	consul "github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/connect"
 )
@@ -27,20 +27,16 @@ type Service struct {
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.Name = name
-	s.Address = addr
+	s.Address = hostname
 	s.appID = id
 	s.domain = domain
 	s.pathPrefix = pathPrefix
 	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
@@ -70,7 +66,7 @@ func (s *Service) GetFullAddr() string {
 	if isTLS {
 		proto = "https"
 	}
-	return fmt.Sprintf("%s://%s:%d/", proto, s.Address, s.port)
+	return fmt.Sprintf("%s://%s:%d/", proto, s.domain, s.port)
 }
 
 func (s *Service) Register() error {
@@ -99,17 +95,12 @@ func (s *Service) Register() error {
 	return nil
 }
 func (s *Service) Unregister() error {
-	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)
+		ticker := time.NewTicker(time.Second * 1)
 		for range ticker.C {
 			if ok, _ := s.healthCheck(); ok {
 				ticker.Stop()
@@ -118,11 +109,11 @@ func (s *Service) RegisterHealthChecks() {
 	}()
 
 	go func() { // TTL
-		ticker := time.NewTicker(s.ttl)
+		interval := s.ttl - (time.Second * 2) // 2 seconds overhead
+		ticker := time.NewTicker(interval)
 		for range ticker.C {
 			if _, err := s.healthCheck(); err != nil {
-				fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
+				fmt.Printf("TTL Error #: %v\n", err)
-				ticker.Stop()
 			}
 		}
 	}()
@@ -187,27 +178,20 @@ func (s *Service) healthCheck() (bool, error) {
 func (s *Service) getTags() []string {
 	tags := []string{
 		"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", "http://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=PathPrefix(`" + s.pathPrefix + "`)",
-		// "traefik.http.routers." + s.Name + ".rule=Host(`" + s.domain + "`)",
 		"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 + ",requestid_" + 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=http",
 		"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=false",
-		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=1s",
+		"traefik.http.middlewares.auth_" + s.Name + ".plugin.auth.handlerURL=" + config.GetEnv("AUTH_HANDLER_URL", ""),
-		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authRequestHeaders=Cookie",
-		"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.authResponseHeaders=Set-Cookie, Server",
+		// "traefik.http.middlewares.auth_" + s.Name + ".forwardauth.trustForwardHeader=true",
+		"traefik.http.middlewares.requestid_" + s.Name + ".plugin.requestid.headerName=X-Request-ID",
+		"traefik.http.middlewares.stripprefix_" + s.Name + ".stripprefix.prefixes=" + s.pathPrefix,
 		"traefik.tls.certificates.certfile=/certs/client.cert",
 		"traefik.tls.certificates.keyfile=/certs/client.key",
 	}

go.mod

@@ -3,12 +3,13 @@ module git.pbiernat.io/egommerce/go-api-pkg
 go 1.18
 
 require (
-	git.pbiernat.io/egommerce/api-entities v0.2.3
+	git.pbiernat.io/egommerce/api-entities v0.0.26
 	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
 	github.com/hashicorp/consul/api v1.22.0
 	github.com/joho/godotenv v1.5.1
+	github.com/streadway/amqp v1.0.0
 )
 
 require (
@@ -70,7 +71,6 @@ require (
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rabbitmq/amqp091-go v1.10.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/stretchr/testify v1.8.3 // 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.pbiernat.dev/egommerce/api-entities v0.0.26 h1:Avz02GINwuYWOjw1fmZIJ3QgGEIz3a5vRQZNaxxUQIk=
+git.pbiernat.dev/egommerce/api-entities v0.0.26/go.mod h1:+BXvUcr6Cr6QNpJsW8BUfe1vVILdWDADNE0e3u0lNvU=
 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=
@@ -469,8 +470,6 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
-github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
-github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -488,6 +487,8 @@ github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d h1:bVQRCxQvfjNUeRqaY/uT0tFuvuFY0ulgnczuR684Xic=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
+github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=

rabbitmq/connect.go

@@ -3,7 +3,7 @@ package rabbitmq
 import (
 	"log"
 
-	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/streadway/amqp"
 )
 
 func Open(url string) (*amqp.Connection, *amqp.Channel, error) {

rabbitmq/queue.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"log"
 
-	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/streadway/amqp"
 )
 
 type Message map[string]interface{}
 
-func Serialize(msg any) (string, error) { // FIXME move to separate service
+func Serialize(msg any) (string, error) {
 	var b bytes.Buffer
 	encoder := json.NewEncoder(&b)
 	err := encoder.Encode(msg)
@@ -19,7 +19,7 @@ func Serialize(msg any) (string, error) { // FIXME move to separate service
 	return b.String(), err
 }
 
-func Deserialize(b []byte) (Message, error) { // FIXME move to separate service
+func Deserialize(b []byte) (Message, error) {
 	var msg Message
 	buf := bytes.NewBuffer(b)
 	decoder := json.NewDecoder(buf)

redis/cache.go

@@ -1,38 +0,0 @@
-package redis
-
-// import (
-// 	"context"
-// 	"strconv"
-// 	"time"
-
-// 	"github.com/go-redis/redis/v8"
-// )
-
-// func NewCache(host string, port int, password string) *redis.Client {
-// 	redis := redis.NewClient(&redis.Options{
-// 		Addr:     host + ":" + strconv.Itoa(port),
-// 		Password: password,
-// 		DB:       0,
-// 	})
-// 	defer redis.Close()
-
-// 	return redis
-// }
-
-// func Get(ctx context.Context, key string) (float64, error) {
-// 	// ctx := context.Background() // FIXME
-// 	price, err := s.cache.Get(ctx, key).Float64()
-// 	if err != nil {
-// 		s.log.Log("cache read error(key not exists): %#v", err)
-// 		return 0, err
-// 	}
-
-// 	return price, nil
-// }
-
-// func Set(ctx context.Context, key string, value any, exp time.Duration) error {
-// 	// ctx := context.Background() // FIXME
-// 	s.cache.Set(ctx, key, value, exp)
-
-// 	return nil
-// }