1
0
Fork 0

Rename NameProvider to Name

Because golint is gonna cry at some point otherwise.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2015-11-02 19:48:34 +01:00
parent de0a57ec76
commit cdade5f649
10 changed files with 50 additions and 50 deletions

View file

@ -15,7 +15,7 @@ import (
"github.com/gambol99/go-marathon"
)
type MarathonProvider struct {
type Marathon struct {
Watch bool
Endpoint string
marathonClient marathon.Marathon
@ -24,7 +24,7 @@ type MarathonProvider struct {
NetworkInterface string
}
func (provider *MarathonProvider) Provide(configurationChan chan<- types.ConfigMessage) error {
func (provider *Marathon) Provide(configurationChan chan<- types.ConfigMessage) error {
config := marathon.NewDefaultConfig()
config.URL = provider.Endpoint
config.EventsInterface = provider.NetworkInterface
@ -57,7 +57,7 @@ func (provider *MarathonProvider) Provide(configurationChan chan<- types.ConfigM
return nil
}
func (provider *MarathonProvider) loadMarathonConfig() *types.Configuration {
func (provider *Marathon) loadMarathonConfig() *types.Configuration {
var MarathonFuncMap = template.FuncMap{
"getPort": func(task marathon.Task) string {
for _, port := range task.Ports {
@ -225,7 +225,7 @@ func getApplication(task marathon.Task, apps []marathon.Application) (marathon.A
return marathon.Application{}, errors.New("Application not found: " + task.AppID)
}
func (provider *MarathonProvider) getLabel(application marathon.Application, label string) (string, error) {
func (provider *Marathon) getLabel(application marathon.Application, label string) (string, error) {
for key, value := range application.Labels {
if key == label {
return value, nil
@ -234,18 +234,18 @@ func (provider *MarathonProvider) getLabel(application marathon.Application, lab
return "", errors.New("Label not found:" + label)
}
func (provider *MarathonProvider) getEscapedName(name string) string {
func (provider *Marathon) getEscapedName(name string) string {
return strings.Replace(name, "/", "", -1)
}
func (provider *MarathonProvider) GetFrontendValue(application marathon.Application) string {
func (provider *Marathon) GetFrontendValue(application marathon.Application) string {
if label, err := provider.getLabel(application, "traefik.frontend.value"); err == nil {
return label
}
return provider.getEscapedName(application.ID) + "." + provider.Domain
}
func (provider *MarathonProvider) GetFrontendRule(application marathon.Application) string {
func (provider *Marathon) GetFrontendRule(application marathon.Application) string {
if label, err := provider.getLabel(application, "traefik.frontend.rule"); err == nil {
return label
}