Create init method on provider interface #3580
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
vdemeester
reviewed
Jul 9, 2018
configuration/provider_aggregator.go
Outdated
| err := provider.Init(constraint) | ||
| if err != nil { | ||
| providerType := reflect.TypeOf(provider) | ||
| log.Errorf("Error initializing provider %v: %v", providerType, err) |
There was a problem hiding this comment.
Why not using %T instead of %v and not use reflect above ?
mmatur
requested changes
Jul 10, 2018
configuration/provider_aggregator.go
Outdated
| if err != nil { | ||
| log.Errorf("Error starting provider %v: %s", providerType, err) | ||
| log.Errorf("Error starting provider %T: %s", p, err) |
provider/file/file.go
Outdated
| @@ -27,9 +27,15 @@ type Provider struct { | |||
| TraefikFile string | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/eureka/eureka.go
Outdated
| @@ -22,9 +22,15 @@ type Provider struct { | |||
| RefreshSeconds flaeg.Duration `description:"Override default configuration time between refresh" export:"true"` | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/ecs/ecs.go
Outdated
| @@ -65,6 +65,12 @@ type awsClient struct { | |||
| ec2 *ec2.EC2 | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/dynamodb/dynamodb.go
Outdated
| @@ -37,6 +37,12 @@ type dynamoClient struct { | |||
| db dynamodbiface.DynamoDBAPI | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/kubernetes/kubernetes.go
Outdated
| @@ -95,9 +95,15 @@ func (p *Provider) newK8sClient(ingressLabelSelector string) (Client, error) { | |||
| return cl, err | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/marathon/marathon.go
Outdated
| @@ -72,10 +72,15 @@ type Basic struct { | |||
| HTTPBasicPassword string `description:"Basic authentication Password"` | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/mesos/mesos.go
Outdated
| @@ -38,9 +38,15 @@ type Provider struct { | |||
| Masters []string | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/rancher/rancher.go
Outdated
| @@ -51,13 +51,19 @@ func (r rancherData) String() string { | |||
| return fmt.Sprintf("{name:%s, labels:%v, containers: %v, health: %s, state: %s}", r.Name, r.Labels, r.Containers, r.Health, r.State) | |||
| } | |||
|
|
|||
| // Init the provider | |||
| func (p *Provider) Init(constraints types.Constraints) error { | |||
| p.BaseProvider.Init(constraints) | |||
There was a problem hiding this comment.
return p.BaseProvider.Init(constraints)
provider/zk/zk.go
Outdated
| func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error { | ||
| // Init the provider | ||
| func (p *Provider) Init(constraints types.Constraints) error { | ||
| p.Provider.Init(constraints) |
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?
Create an
Initmethod onProviderMotivation
The goal is to separate
InitandProvidein order to be able to disable aProviderwhenInitfailed.More
Fix a bug with the ACME Provider, when the storage file was invalid, the configuration listener blocked the dynamic configuration refresh. Now, if the file is invalid, the
Initfail and then we disable ACME Provider.