baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change getLabel signature to return bool instead of error.

Browse source 
The comma ok idiom fits better.
This commit is contained in:
Timo Reimann 2017-04-20 22:06:27 +02:00
parent 49a9aeb95f
commit f1bc80ca12
1 changed files with 29 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
provider/marathon/marathon.go
View file

@ -205,7 +205,7 @@ func (p *Provider) taskFilter(task marathon.Task, applications *marathon.Applica
label, _ := p.getLabel(application, "traefik.tags") label, _ := p.getLabel(application, "traefik.tags")
constraintTags := strings.Split(label, ",") constraintTags := strings.Split(label, ",")
if p.MarathonLBCompatibility { if p.MarathonLBCompatibility {
if label, err := p.getLabel(application, "HAPROXY_GROUP"); err == nil { if label, ok := p.getLabel(application, "HAPROXY_GROUP"); ok {
constraintTags = append(constraintTags, label) constraintTags = append(constraintTags, label)
} }
} }
@ -262,7 +262,7 @@ func (p *Provider) applicationFilter(app marathon.Application, filteredTasks []m
label, _ := p.getLabel(app, "traefik.tags") label, _ := p.getLabel(app, "traefik.tags")
constraintTags := strings.Split(label, ",") constraintTags := strings.Split(label, ",")
if p.MarathonLBCompatibility { if p.MarathonLBCompatibility {
if label, err := p.getLabel(app, "HAPROXY_GROUP"); err == nil { if label, ok := p.getLabel(app, "HAPROXY_GROUP"); ok {
constraintTags = append(constraintTags, label) constraintTags = append(constraintTags, label)
} }
} }
@ -291,13 +291,13 @@ func isApplicationEnabled(application marathon.Application, exposedByDefault boo
return exposedByDefault && (*application.Labels)["traefik.enable"] != "false" || (*application.Labels)["traefik.enable"] == "true" return exposedByDefault && (*application.Labels)["traefik.enable"] != "false" || (*application.Labels)["traefik.enable"] == "true"
} }
func (p *Provider) getLabel(application marathon.Application, label string) (string, error) { func (p *Provider) getLabel(application marathon.Application, label string) (string, bool) {
for key, value := range *application.Labels { for key, value := range *application.Labels {
if key == label { if key == label {
return value, nil return value, true
} }
} }
return "", errors.New("Label not found:" + label) return "", false
} }
func (p *Provider) getPort(task marathon.Task, applications []marathon.Application) string { func (p *Provider) getPort(task marathon.Task, applications []marathon.Application) string {
@ -307,12 +307,12 @@ func (p *Provider) getPort(task marathon.Task, applications []marathon.Applicati
return "" return ""
} }
ports := processPorts(application, task) ports := processPorts(application, task)
if portIndexLabel, err := p.getLabel(application, "traefik.portIndex"); err == nil { if portIndexLabel, ok := p.getLabel(application, "traefik.portIndex"); ok {
if index, err := strconv.Atoi(portIndexLabel); err == nil { if index, err := strconv.Atoi(portIndexLabel); err == nil {
return strconv.Itoa(ports[index]) return strconv.Itoa(ports[index])
} }
} }
if portValueLabel, err := p.getLabel(application, "traefik.port"); err == nil { if portValueLabel, ok := p.getLabel(application, "traefik.port"); ok {
return portValueLabel return portValueLabel
} }
@ -328,14 +328,14 @@ func (p *Provider) getWeight(task marathon.Task, applications []marathon.Applica
log.Errorf("Unable to get marathon application from task %s", task.AppID) log.Errorf("Unable to get marathon application from task %s", task.AppID)
return "0" return "0"
} }
if label, err := p.getLabel(application, "traefik.weight"); err == nil { if label, ok := p.getLabel(application, "traefik.weight"); ok {
return label return label
} }
return "0" return "0"
} }
func (p *Provider) getDomain(application marathon.Application) string { func (p *Provider) getDomain(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.domain"); err == nil { if label, ok := p.getLabel(application, "traefik.domain"); ok {
return label return label
} }
return p.Domain return p.Domain
@ -347,35 +347,35 @@ func (p *Provider) getProtocol(task marathon.Task, applications []marathon.Appli
log.Errorf("Unable to get marathon application from task %s", task.AppID) log.Errorf("Unable to get marathon application from task %s", task.AppID)
return "http" return "http"
} }
if label, err := p.getLabel(application, "traefik.protocol"); err == nil { if label, ok := p.getLabel(application, "traefik.protocol"); ok {
return label return label
} }
return "http" return "http"
} }
func (p *Provider) getSticky(application marathon.Application) string { func (p *Provider) getSticky(application marathon.Application) string {
if sticky, err := p.getLabel(application, "traefik.backend.loadbalancer.sticky"); err == nil { if sticky, ok := p.getLabel(application, "traefik.backend.loadbalancer.sticky"); ok {
return sticky return sticky
} }
return "false" return "false"
} }
func (p *Provider) getPassHostHeader(application marathon.Application) string { func (p *Provider) getPassHostHeader(application marathon.Application) string {
if passHostHeader, err := p.getLabel(application, "traefik.frontend.passHostHeader"); err == nil { if passHostHeader, ok := p.getLabel(application, "traefik.frontend.passHostHeader"); ok {
return passHostHeader return passHostHeader
} }
return "true" return "true"
} }
func (p *Provider) getPriority(application marathon.Application) string { func (p *Provider) getPriority(application marathon.Application) string {
if priority, err := p.getLabel(application, "traefik.frontend.priority"); err == nil { if priority, ok := p.getLabel(application, "traefik.frontend.priority"); ok {
return priority return priority
} }
return "0" return "0"
} }
func (p *Provider) getEntryPoints(application marathon.Application) []string { func (p *Provider) getEntryPoints(application marathon.Application) []string {
if entryPoints, err := p.getLabel(application, "traefik.frontend.entryPoints"); err == nil { if entryPoints, ok := p.getLabel(application, "traefik.frontend.entryPoints"); ok {
return strings.Split(entryPoints, ",") return strings.Split(entryPoints, ",")
} }
return []string{} return []string{}
@ -384,11 +384,11 @@ func (p *Provider) getEntryPoints(application marathon.Application) []string {
// getFrontendRule returns the frontend rule for the specified application, using // getFrontendRule returns the frontend rule for the specified application, using
// it's label. It returns a default one (Host) if the label is not present. // it's label. It returns a default one (Host) if the label is not present.
func (p *Provider) getFrontendRule(application marathon.Application) string { func (p *Provider) getFrontendRule(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.frontend.rule"); err == nil { if label, ok := p.getLabel(application, "traefik.frontend.rule"); ok {
return label return label
} }
if p.MarathonLBCompatibility { if p.MarathonLBCompatibility {
if label, err := p.getLabel(application, "HAPROXY_0_VHOST"); err == nil { if label, ok := p.getLabel(application, "HAPROXY_0_VHOST"); ok {
return "Host:" + label return "Host:" + label
} }
} }
@ -405,7 +405,7 @@ func (p *Provider) getBackend(task marathon.Task, applications []marathon.Applic
} }
func (p *Provider) getFrontendBackend(application marathon.Application) string { func (p *Provider) getFrontendBackend(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.backend"); err == nil { if label, ok := p.getLabel(application, "traefik.backend"); ok {
return label return label
} }
return provider.Replace("/", "-", application.ID) return provider.Replace("/", "-", application.ID)
@ -422,33 +422,26 @@ func (p *Provider) getSubDomain(name string) string {
} }
func (p *Provider) hasCircuitBreakerLabels(application marathon.Application) bool { func (p *Provider) hasCircuitBreakerLabels(application marathon.Application) bool {
if _, err := p.getLabel(application, "traefik.backend.circuitbreaker.expression"); err != nil { _, ok := p.getLabel(application, "traefik.backend.circuitbreaker.expression")
return false return ok
}
return true
} }
func (p *Provider) hasLoadBalancerLabels(application marathon.Application) bool { func (p *Provider) hasLoadBalancerLabels(application marathon.Application) bool {
_, errMethod := p.getLabel(application, "traefik.backend.loadbalancer.method") _, errMethod := p.getLabel(application, "traefik.backend.loadbalancer.method")
_, errSticky := p.getLabel(application, "traefik.backend.loadbalancer.sticky") _, errSticky := p.getLabel(application, "traefik.backend.loadbalancer.sticky")
if errMethod != nil && errSticky != nil { return errMethod || errSticky
return false
}
return true
} }
func (p *Provider) hasMaxConnLabels(application marathon.Application) bool { func (p *Provider) hasMaxConnLabels(application marathon.Application) bool {
if _, err := p.getLabel(application, "traefik.backend.maxconn.amount"); err != nil { if _, ok := p.getLabel(application, "traefik.backend.maxconn.amount"); !ok {
return false return false
} }
if _, err := p.getLabel(application, "traefik.backend.maxconn.extractorfunc"); err != nil { _, ok := p.getLabel(application, "traefik.backend.maxconn.extractorfunc")
return false return ok
}
return true
} }
func (p *Provider) getMaxConnAmount(application marathon.Application) int64 { func (p *Provider) getMaxConnAmount(application marathon.Application) int64 {
if label, err := p.getLabel(application, "traefik.backend.maxconn.amount"); err == nil { if label, ok := p.getLabel(application, "traefik.backend.maxconn.amount"); ok {
i, errConv := strconv.ParseInt(label, 10, 64) i, errConv := strconv.ParseInt(label, 10, 64)
if errConv != nil { if errConv != nil {
log.Errorf("Unable to parse traefik.backend.maxconn.amount %s", label) log.Errorf("Unable to parse traefik.backend.maxconn.amount %s", label)
@ -460,28 +453,27 @@ func (p *Provider) getMaxConnAmount(application marathon.Application) int64 {
} }
func (p *Provider) getMaxConnExtractorFunc(application marathon.Application) string { func (p *Provider) getMaxConnExtractorFunc(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.backend.maxconn.extractorfunc"); err == nil { if label, ok := p.getLabel(application, "traefik.backend.maxconn.extractorfunc"); ok {
return label return label
} }
return "request.host" return "request.host"
} }
func (p *Provider) getLoadBalancerMethod(application marathon.Application) string { func (p *Provider) getLoadBalancerMethod(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.backend.loadbalancer.method"); err == nil { if label, ok := p.getLabel(application, "traefik.backend.loadbalancer.method"); ok {
return label return label
} }
return "wrr" return "wrr"
} }
func (p *Provider) getCircuitBreakerExpression(application marathon.Application) string { func (p *Provider) getCircuitBreakerExpression(application marathon.Application) string {
if label, err := p.getLabel(application, "traefik.backend.circuitbreaker.expression"); err == nil { if label, ok := p.getLabel(application, "traefik.backend.circuitbreaker.expression"); ok {
return label return label
} }
return "NetworkErrorRatio() > 1" return "NetworkErrorRatio() > 1"
} }
func processPorts(application marathon.Application, task marathon.Task) []int { func processPorts(application marathon.Application, task marathon.Task) []int {
// Using default port configuration // Using default port configuration
if task.Ports != nil && len(task.Ports) > 0 { if task.Ports != nil && len(task.Ports) > 0 {
return task.Ports return task.Ports
@ -520,8 +512,8 @@ func (p *Provider) getBackendServer(task marathon.Task, applications []marathon.
} else if len(task.IPAddresses) == 1 { } else if len(task.IPAddresses) == 1 {
return task.IPAddresses[0].IPAddress return task.IPAddresses[0].IPAddress
} else { } else {
ipAddressIdxStr, err := p.getLabel(application, "traefik.ipAddressIdx") ipAddressIdxStr, ok := p.getLabel(application, "traefik.ipAddressIdx")
if err != nil { if !ok {
log.Errorf("Unable to get marathon IPAddress from task %s", task.AppID) log.Errorf("Unable to get marathon IPAddress from task %s", task.AppID)
return "" return ""
} }