DEBUG change

consul/discovery.go

@@ -10,24 +10,26 @@ import (
 )
 
 type Service struct {
-	Name    string
+	Name       string
-	Address string
+	Address    string
-	appID   string
+	appID      string
-	domain  string
+	domain     string
-	port    int
+	pathPrefix string
-	ttl     time.Duration
+	port       int
-	agent   *consul.Agent
+	ttl        time.Duration
-	kv      *consul.KV
+	agent      *consul.Agent
+	kv         *consul.KV
 }
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, name, hostname, domain 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 = hostname
 	s.appID = id
 	s.domain = domain
+	s.pathPrefix = pathPrefix
 	s.port = appPort
 	s.ttl = time.Second * 15
 
@@ -139,20 +141,25 @@ func (s *Service) healthCheck() (bool, error) {
 func (s *Service) getTags() []string {
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Header(`X-API-SERVICE`, `" + s.Name + "`)",
+		// "traefik.http.routers." + s.Name + ".rule=Header(`X-API-SERVICE`, `" + s.Name + "`)",
+		"traefik.http.routers." + s.Name + ".rule=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=compress,requestid",
+		"traefik.http.routers." + s.Name + ".middlewares=requestid,compress,stripPrefix",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
 		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
-		"traefik.http.middlewares.compress.compress=true",
+		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
-		"traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*",
+		"traefik.http.middlewares.stripPrefix.stripprefix.prefixes=`{$s.pathPrefix}`",
-		"traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*",
+		"traefik.http.middlewares.compress.compress=true",
+		// "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",