consul/discovery.go

@@ -10,26 +10,24 @@ import (
 )
 
 type Service struct {
-	Name       string
+	Name    string
-	Address    string
+	Address string
-	appID      string
+	appID   string
-	domain     string
+	domain  string
-	pathPrefix string
+	port    int
-	port       int
+	ttl     time.Duration
-	ttl        time.Duration
+	agent   *consul.Agent
-	agent      *consul.Agent
+	kv      *consul.KV
-	kv         *consul.KV
 }
 
 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, hostname, domain 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
 
@@ -142,7 +140,7 @@ 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=PathPrefix(`{$s.pathPrefix}`)",
+		"traefik.http.routers." + s.Name + ".rule=PathPrefix(`/catalog`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
 		"traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,
@@ -151,7 +149,7 @@ func (s *Service) getTags() []string {
 		"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
 		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
-		"traefik.http.middlewares.stripPrefix.stripprefix.prefixes=`{$s.pathPrefix}`",
+		"traefik.http.middlewares.stripPrefix.stripprefix.prefixes=/foobar"
 		"traefik.http.middlewares.compress.compress=true",
 		// "traefik.http.middlewares.cors.headers.accesscontrolallowmethods=*",
 		// "traefik.http.middlewares.cors.headers.accesscontrolalloworiginlist=*",