Homogenization of the providers (part 1) #2518
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ldez
force-pushed
the
refactor/homogenization-providers
branch
from
59d7949
to
1787729
Compare
nmengin
requested changes
Dec 5, 2017
| tmpl := p.frontEndRuleTemplate | ||
| tmpl, err := tmpl.Parse(customFrontendRule) | ||
| if err != nil { | ||
| log.Errorf("failed to parse Consul Catalog custom frontend rule: %s", err) |
| var buffer bytes.Buffer | ||
| err = tmpl.Execute(&buffer, templateObjects) | ||
| if err != nil { | ||
| log.Errorf("failed to execute Consul Catalog custom frontend rule template: %s", err) |
| return func(app *marathon.Application) { | ||
| app.AddLabel(types.LabelPrefix+serviceName+"."+property, value) | ||
| app.AddLabel(label.Prefix+serviceName+"."+property, value) |
There was a problem hiding this comment.
Should not we use fmt.Sprintf?
| tmpl := p.frontEndRuleTemplate | ||
| tmpl, err := tmpl.Parse(customFrontendRule) | ||
| if err != nil { | ||
| log.Errorf("failed to parse Consul Catalog custom frontend rule: %s", err) |
| var buffer bytes.Buffer | ||
| err = tmpl.Execute(&buffer, templateObjects) | ||
| if err != nil { | ||
| log.Errorf("failed to execute Consul Catalog custom frontend rule template: %s", err) |
provider/mesos/config_test.go
Outdated
| t.Fatalf("expected %#v, got %#v", c.expectedBackends, actualConfig.Backends) | ||
| } | ||
| if !reflect.DeepEqual(actualConfig.Frontends, c.expectedFrontends) { | ||
| t.Fatalf("expected %#v, got %#v", c.expectedFrontends, actualConfig.Frontends) |
provider/mesos/config_test.go
Outdated
|
|
||
| var p = taskRecords(taskState) | ||
| if len(p) == 0 { | ||
| t.Fatal("taskRecord should return at least one task") |
There was a problem hiding this comment.
Can you add the word Function at the beginning,? Thus the falal log begins with an upper case.
| } | ||
|
|
||
| func (p *Provider) getFrontendRule(service rancherData) string { | ||
| defaultRule := "Host:" + strings.ToLower(strings.Replace(service.Name, "/", ".", -1)) + "." + p.Domain |
There was a problem hiding this comment.
Should not we use fmt.Sprintf?
provider/consul/consul_catalog.go
Outdated
|
|
||
| data, meta, err := catalog.Services(options) | ||
| if err != nil { | ||
| log.Errorf("Failed to list services: %s", err) |
There was a problem hiding this comment.
Should not we use %v instead of %s to log an err?
provider/consul/consul_catalog.go
Outdated
| for key, value := range data { | ||
| nodes, _, err := catalog.Service(key, "", &api.QueryOptions{}) | ||
| if err != nil { | ||
| log.Errorf("Failed to get detail of service %s: %s", key, err) |
There was a problem hiding this comment.
Should not we use %v instead of %s to log an err?
ldez
force-pushed
the
refactor/homogenization-providers
branch
from
1787729
to
73de2bf
Compare
traefiker
approved these changes
Dec 5, 2017
|
😢 I failed to review this PR, but that's awesome job @ldez 👏 👏 👏 |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
The first step a the homogenization of the providers.
Rewrite Labels/Annotations system (provider with template)
map[string]stringmap[string]stringmap[string]string*map[string]stringmap[string]stringtask.Labelsmap[string]*stringmore:
No-Rewrite
Motivation
make it easier to add new label.
More