homelab/traefik
1
0
Fork 0
Code Activity

Fix period in frontend name in KV store

Browse source
This commit is contained in:
Emile Vauge 2016-04-12 09:49:37 +02:00 • committed by Poney baker
parent fad7ec6b7f
commit a9e615b3c7
7 changed files with 191 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

67
provider/consul_catalog.go
View file

@ -16,6 +16,8 @@ import (
const (
// DefaultWatchWaitTime is the duration to wait when polling consul
DefaultWatchWaitTime = 15 * time.Second
// DefaultConsulCatalogTagPrefix is a prefix for additional service/node configurations
DefaultConsulCatalogTagPrefix = "traefik"
)
// ConsulCatalog holds configurations of the Consul catalog provider.
@ -24,10 +26,16 @@ type ConsulCatalog struct {
Endpoint string
Domain string
client *api.Client
Prefix string
}
type serviceUpdate struct {
ServiceName string
Attributes []string
}
type catalogUpdate struct {
Service string
Service *serviceUpdate
Nodes []*api.ServiceEntry
}
@ -79,41 +87,76 @@ func (provider *ConsulCatalog) healthyNodes(service string) (catalogUpdate, erro
return catalogUpdate{}, err
}
set := map[string]bool{}
tags := []string{}
for _, node := range data {
for _, tag := range node.Service.Tags {
if _, ok := set[tag]; ok == false {
set[tag] = true
tags = append(tags, tag)
}
}
}
return catalogUpdate{
Service: service,
Nodes: data,
Service: &serviceUpdate{
ServiceName: service,
Attributes: tags,
},
Nodes: data,
}, nil
}
func (provider *ConsulCatalog) getEntryPoints(list string) []string {
return strings.Split(list, ",")
}
func (provider *ConsulCatalog) getBackend(node *api.ServiceEntry) string {
return strings.ToLower(node.Service.Service)
}
func (provider *ConsulCatalog) getFrontendValue(service string) string {
return "Host:" + service + "." + provider.Domain
func (provider *ConsulCatalog) getFrontendRule(service serviceUpdate) string {
customFrontendRule := provider.getAttribute("frontend.rule", service.Attributes, "")
if customFrontendRule != "" {
return customFrontendRule
}
return "Host:" + service.ServiceName + "." + provider.Domain
}
func (provider *ConsulCatalog) getAttribute(name string, tags []string, defaultValue string) string {
for _, tag := range tags {
if strings.Index(tag, DefaultConsulCatalogTagPrefix+".") == 0 {
if kv := strings.SplitN(tag[len(DefaultConsulCatalogTagPrefix+"."):], "=", 2); len(kv) == 2 && kv[0] == name {
return kv[1]
}
}
}
return defaultValue
}
func (provider *ConsulCatalog) buildConfig(catalog []catalogUpdate) *types.Configuration {
var FuncMap = template.FuncMap{
"getBackend": provider.getBackend,
"getFrontendValue": provider.getFrontendValue,
"replace": replace,
"getBackend": provider.getBackend,
"getFrontendRule": provider.getFrontendRule,
"getAttribute": provider.getAttribute,
"getEntryPoints": provider.getEntryPoints,
"replace": replace,
}
allNodes := []*api.ServiceEntry{}
serviceNames := []string{}
services := []*serviceUpdate{}
for _, info := range catalog {
if len(info.Nodes) > 0 {
serviceNames = append(serviceNames, info.Service)
services = append(services, info.Service)
allNodes = append(allNodes, info.Nodes...)
}
}
templateObjects := struct {
Services []string
Services []*serviceUpdate
Nodes []*api.ServiceEntry
}{
Services: serviceNames,
Services: services,
Nodes: allNodes,
}

88
provider/consul_catalog_test.go
View file

@ -14,17 +14,68 @@ func TestConsulCatalogGetFrontendRule(t *testing.T) {
}
services := []struct {
service string
service serviceUpdate
expected string
}{
{
service: "foo",
service: serviceUpdate{
ServiceName: "foo",
Attributes: []string{},
},
expected: "Host:foo.localhost",
},
{
service: serviceUpdate{
ServiceName: "foo",
Attributes: []string{
"traefik.frontend.rule=Host:*.example.com",
},
},
expected: "Host:*.example.com",
},
}
for _, e := range services {
actual := provider.getFrontendValue(e.service)
actual := provider.getFrontendRule(e.service)
if actual != e.expected {
t.Fatalf("expected %q, got %q", e.expected, actual)
}
}
}
func TestConsulCatalogGetAttribute(t *testing.T) {
provider := &ConsulCatalog{
Domain: "localhost",
}
services := []struct {
tags []string
key string
defaultValue string
expected string
}{
{
tags: []string{
"foo.bar=ramdom",
"traefik.backend.weight=42",
},
key: "backend.weight",
defaultValue: "",
expected: "42",
},
{
tags: []string{
"foo.bar=ramdom",
"traefik.backend.wei=42",
},
key: "backend.weight",
defaultValue: "",
expected: "",
},
}
for _, e := range services {
actual := provider.getAttribute(e.key, e.tags, e.defaultValue)
if actual != e.expected {
t.Fatalf("expected %q, got %q", e.expected, actual)
}
@ -49,7 +100,10 @@ func TestConsulCatalogBuildConfig(t *testing.T) {
{
nodes: []catalogUpdate{
{
Service: "test",
Service: &serviceUpdate{
ServiceName: "test",
Attributes: []string{},
},
},
},
expectedFrontends: map[string]*types.Frontend{},
@ -58,13 +112,26 @@ func TestConsulCatalogBuildConfig(t *testing.T) {
{
nodes: []catalogUpdate{
{
Service: "test",
Service: &serviceUpdate{
ServiceName: "test",
Attributes: []string{
"traefik.backend.loadbalancer=drr",
"traefik.backend.circuitbreaker=NetworkErrorRatio() > 0.5",
"random.foo=bar",
},
},
Nodes: []*api.ServiceEntry{
{
Service: &api.AgentService{
Service: "test",
Address: "127.0.0.1",
Port: 80,
Tags: []string{
"traefik.backend.weight=42",
"random.foo=bar",
"traefik.backend.passHostHeader=true",
"traefik.protocol=https",
},
},
Node: &api.Node{
Node: "localhost",
@ -88,11 +155,16 @@ func TestConsulCatalogBuildConfig(t *testing.T) {
"backend-test": {
Servers: map[string]types.Server{
"test--127-0-0-1--80": {
URL: "http://127.0.0.1:80",
URL: "https://127.0.0.1:80",
Weight: 42,
},
},
CircuitBreaker: nil,
LoadBalancer: nil,
CircuitBreaker: &types.CircuitBreaker{
Expression: "NetworkErrorRatio() > 0.5",
},
LoadBalancer: &types.LoadBalancer{
Method: "drr",
},
},
},
},