added CORS dev config

f* CORS, define it on app level
2022-12-24 06:07:03 +01:00 · 2022-12-24 06:03:21 +01:00 · 2022-12-24 06:01:12 +01:00 · 2022-12-24 05:58:38 +01:00 · 2022-12-24 05:50:46 +01:00 · 2022-12-24 05:49:58 +01:00
3 changed files with 100 additions and 68 deletions
--- a/consul/discovery.go
+++ b/consul/discovery.go
@@ -2,7 +2,6 @@ package consul

 import (
 	"fmt"
-	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -11,31 +10,33 @@ import (
 )

 type Service struct {
-	AppID       string
 	Name    string
 	Address string
-	IP          string
-	Port        int
-	TTL         time.Duration
-	ConsulAgent *consul.Agent
+	appID   string
+	domain  string
+	port    int
+	ttl     time.Duration
+	agent   *consul.Agent
+	kv      *consul.KV
 }

 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")

-func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Service, error) {
 	s := new(Service)
-	s.AppID = appID
-	s.Name = appName
-	s.Address = domain
-	s.IP = ip
-	s.Port = appPort
-	s.TTL = time.Second * 15
+	s.Name = name
+	s.Address = hostname
+	s.appID = id
+	s.domain = domain
+	s.port = appPort
+	s.ttl = time.Second * 15

-	client, err := consul.NewClient(newClientConfig(serverAddr))
+	client, err := consul.NewClient(newClientConfig(servAddr))
 	if err != nil {
 		return nil, err
 	}
-	s.ConsulAgent = client.Agent()
+	s.agent = client.Agent()
+	s.kv = client.KV()

 	return s, nil
 }
@@ -48,98 +49,113 @@ func newClientConfig(serverAddr string) *consul.Config {
 }

 func (s *Service) GetID() string {
-	return fmt.Sprintf("%s_%s", s.Name, s.AppID)
+	return fmt.Sprintf("%s_%s", s.Name, s.appID)
 }

 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("http://%s:%d/", s.IP, s.Port)
+	return fmt.Sprintf("http://%s:%d/", s.Address, s.port)
 }

 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
 		Name:    s.Name,
-		Address: s.IP,
-		Port:    s.Port,
+		Address: s.Address,
+		Port:    s.port,
 		Tags:    s.getTags(),
-		Meta:    s.getMetadata(),
 		Check: &consul.AgentServiceCheck{
-			TTL: s.TTL.String(),
+			TTL:                            s.ttl.String(),
+			DeregisterCriticalServiceAfter: "5s",
 		},
 	}

-	if err := s.ConsulAgent.ServiceRegister(def); err != nil {
+	if err := s.agent.ServiceRegister(def); err != nil {
 		return err
 	}
-	go s.UpdateTTL(def)
+
+	go func(s *Service) { // startup register
+		ticker := time.NewTicker(time.Millisecond * 100)
+		for range ticker.C {
+			ok, _ := s.healthCheck()
+			if ok {
+				ticker.Stop()
+			}
+		}
+	}(s)
+
+	go func(s *Service) { // TTL
+		interval := s.ttl - time.Second*2
+		ticker := time.NewTicker(interval)
+		for range ticker.C {
+			_, err := s.healthCheck()
+			if err != nil {
+				fmt.Printf("TTL Error: %v\n", err)
+			}
+		}
+	}(s)

 	return nil
 }
 func (s *Service) Unregister() error {
-	return s.ConsulAgent.ServiceDeregister(s.GetID())
+	return s.agent.ServiceDeregister(s.GetID())
 }

-func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
-	ticker := time.NewTicker(s.TTL / 2)
-	for range ticker.C {
-		ok, err := s.check()
-		if !ok {
-			if err := s.ConsulAgent.FailTTL("service:"+s.GetID(), err.Error()); err != nil {
-				log.Println(err)
-			}
-		} else {
-			if err := s.ConsulAgent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
-				log.Println(err)
-			}
-		}
-	}
+func (s *Service) KV() *consul.KV {
+	return s.kv
 }

-func (s *Service) check() (bool, error) {
+func (s *Service) healthCheck() (bool, error) {
+	alive := func() bool {
 		client := &http.Client{}
-	healthUrl := fmt.Sprintf("http://%s/health", s.GetFullAddr())
+		healthUrl := s.GetFullAddr() + "health"
 		req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
 		if err != nil {
-		return false, ErrServiceUnavailable
+			return false
 		}
 		req.Header.Set("User-Agent", "Health Check")

 		resp, err := client.Do(req)
 		if err != nil {
-		return false, ErrServiceUnavailable
+			return false
 		}
 		defer resp.Body.Close()

-	if resp.StatusCode == http.StatusOK {
+		return resp.StatusCode == http.StatusOK
+	}()
+
+	if alive {
+		if err := s.agent.PassTTL("service:"+s.GetID(), "OK"); err != nil {
+			return false, err
+		}
 		return true, nil
 	}

+	if err := s.agent.FailTTL("service:"+s.GetID(), ErrServiceUnavailable.Error()); err != nil {
+		return false, err
+	}
 	return false, ErrServiceUnavailable
 }

-func (s *Service) getMetadata() map[string]string {
-	m := map[string]string{}
-	m["traefik/http/services/"+s.Name+"/loadBalancer/servers/0/url"] = s.GetFullAddr()
-
-	return m
-}
-
 func (s *Service) getTags() []string {
-	// fullName := fmt.Sprintf("%s-%s", s.Name, s.AppID)
-	// bFullAddr := fmt.Sprintf("http://%s:%d/", s.IP, s.Port) // FIXME: declare one once - dont need to refresh....
-
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Address + "`)",
+		"traefik.http.routers." + s.Name + ".rule=Header(`X-API-SERVICE`, `" + s.Name + "`)",
 		"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=compress,requestid",
-		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
+		"traefik.http.routers." + s.Name + ".middlewares=compress,requestid,cors",
 		"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.server.port=" + strconv.Itoa(s.port),
 		"traefik.http.middlewares.compress.compress=true",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
+		"traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*",
+		"traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*",
+		// "traefik.http.middlewares.cors.headers.accessControlExposeHeaders=true",
+		// "traefik.http.middlewares.cors.headers.accesscontrolmaxage=100",
+		// "traefik.http.middlewares.cors.headers.addvaryheader=true",
+		"traefik.tls.certificates.certfile=/certs/client.cert",
+		"traefik.tls.certificates.keyfile=/certs/client.key",
+		// "traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,
 		// "traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,7 @@ go 1.18

 require (
 	github.com/fluent/fluent-logger-golang v1.9.0
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/hashicorp/consul/api v1.18.0
 	github.com/streadway/amqp v1.0.0
 )
@@ -11,6 +12,8 @@ require (
 require (
 	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
 	github.com/hashicorp/go-hclog v0.12.0 // indirect
--- a/go.sum
+++ b/go.sum
@@ -6,15 +6,22 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fluent/fluent-logger-golang v1.9.0 h1:zUdY44CHX2oIUc7VTNZc+4m+ORuO/mldQDA7czhWXEg=
 github.com/fluent/fluent-logger-golang v1.9.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF3zzzAuy6Xlk6FCMV5eU=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
@@ -85,6 +92,9 @@ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUb
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ=
@@ -149,6 +159,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -161,7 +172,9 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Author	SHA1	Message	Date
Piotr Biernat	f5d75ae991	added CORS dev config	2022-12-24 06:07:03 +01:00
Piotr Biernat	867e7d57b7	f* CORS, define it on app level	2022-12-24 06:03:21 +01:00
Piotr Biernat	31f6a7d7e6	f* CORS, define it on app level	2022-12-24 06:01:12 +01:00
Piotr Biernat	e04efcade4	added CORS dev config	2022-12-24 05:58:38 +01:00
Piotr Biernat	c44da161b1	added CORS dev config	2022-12-24 05:50:46 +01:00
Piotr Biernat	ab36ac80ed	added CORS dev config	2022-12-24 05:49:58 +01:00
Piotr Biernat	4dc279440c	added CORS dev config	2022-12-24 05:45:03 +01:00
Piotr Biernat	4f3386d548	upgrade to traefik v3	2022-12-10 05:18:44 +01:00
Piotr Biernat	660e58d36a	Added deregister_critical_service_after=5s opt	2022-12-07 04:11:20 +01:00
Piotr Biernat	179dd3d850	enabled tls again	2022-12-06 02:21:07 +01:00
Piotr Biernat	4e4d436e7a	disable tls	2022-12-06 02:19:04 +01:00
Piotr Biernat	0fcbe0d0ad	disable tls	2022-12-06 02:14:03 +01:00
Piotr Biernat	f138b9b61e	fixes in Consul KV base support	2022-12-05 21:20:38 +01:00
Piotr Biernat	39a8327463	Added Consul KV base support	2022-12-05 19:23:32 +01:00
Piotr Biernat	faace02cb4	added tls support...	2022-12-04 06:05:27 +01:00
Piotr Biernat	7c69590a1d	revert: disabled tls on backends	2022-12-04 05:15:46 +01:00
Piotr Biernat	d5f0314b58	disabled tls on backends	2022-12-04 02:05:59 +01:00
Piotr Biernat	4f183541e6	route rule fix	2022-12-03 03:12:07 +01:00
Piotr Biernat	003bf2bb88	route rule change	2022-12-03 02:10:12 +01:00
Piotr Biernat	03ec5a0a5a	consul ttl fix	2022-12-02 19:02:21 +01:00
Piotr Biernat	fb251e3648	consul ttl fix	2022-12-02 18:55:40 +01:00
Piotr Biernat	32a89d9747	consul ttl fix	2022-12-02 18:48:12 +01:00
Piotr Biernat	3b6acdc195	consul ttl fix	2022-12-02 17:42:39 +01:00
Piotr Biernat	128e3db0b6	register fix	2022-12-02 16:18:00 +01:00
Piotr Biernat	e0a18538d4	register fix	2022-12-02 14:24:27 +01:00
Piotr Biernat	d99436d2d6	register fix	2022-12-02 14:21:33 +01:00
Piotr Biernat	bc27da0be3	register fix	2022-12-02 03:28:38 +01:00
Piotr Biernat	b8cfbf6b99	register fix	2022-12-02 03:22:36 +01:00
Piotr Biernat	2204f6116b	register fix	2022-12-02 01:20:55 +01:00
Piotr Biernat	65dbbc16df	register fix	2022-12-01 23:37:43 +01:00
Piotr Biernat	e5c95b0476	register fix	2022-12-01 23:24:25 +01:00
Piotr Biernat	34ace207a7	register fix	2022-12-01 23:12:53 +01:00
Piotr Biernat	ad4368cdf8	register fix	2022-12-01 22:55:42 +01:00
Piotr Biernat	a4f4b6e059	register fix	2022-12-01 20:28:23 +01:00
Piotr Biernat	5bf58aad16	register fix	2022-12-01 20:26:22 +01:00
Piotr Biernat	ba6bd4137c	register fix	2022-12-01 20:19:28 +01:00
Piotr Biernat	48a7e968d1	register fix	2022-12-01 19:54:59 +01:00
Piotr Biernat	6c46a0e6a4	register fix	2022-12-01 19:45:47 +01:00
Piotr Biernat	ceaeecf1b4	register fix	2022-12-01 19:43:35 +01:00