Skip to content

Commit 66e5a75

Browse files
author
Craig Peterson
committed
lint
1 parent 4d4b2b1 commit 66e5a75

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

providers/dns/dns_providers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func NewDNSChallengeProviderByName(name string) (acme.ChallengeProvider, error)
9090
case "manual":
9191
return acme.NewDNSProviderManual()
9292
case "multi":
93-
return multi.New()
93+
return multi.NewDNSProvider()
9494
case "namecheap":
9595
return namecheap.NewDNSProvider()
9696
case "namedotcom":

providers/dns/multi/multi.go

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,22 @@ type DNSProvider struct {
5656
providers map[string]acme.ChallengeProvider
5757
}
5858

59+
// NewDNSProvider creates a new multiple-provider meta-provider. It will look for a json configuration in "MULTI_CONFIG", or on disk from "MULTI_CONFIG_FILE"
60+
func NewDNSProvider() (*DNSProvider, error) {
61+
config, err := getConfig()
62+
if err != nil {
63+
return nil, err
64+
}
65+
return &DNSProvider{
66+
providers: map[string]acme.ChallengeProvider{},
67+
config: config,
68+
}, nil
69+
}
70+
5971
// AggregateProvider is simply a list of dns providers. All Challenges are filled by all members of the aggregate.
6072
type AggregateProvider []acme.ChallengeProvider
6173

74+
// Present creates the txt record in all child dns providers
6275
func (a AggregateProvider) Present(domain, token, keyAuth string) error {
6376
for _, p := range a {
6477
if err := p.Present(domain, token, keyAuth); err != nil {
@@ -67,6 +80,8 @@ func (a AggregateProvider) Present(domain, token, keyAuth string) error {
6780
}
6881
return nil
6982
}
83+
84+
// CleanUp removes the txt record from all dns providers
7085
func (a AggregateProvider) CleanUp(domain, token, keyAuth string) error {
7186
for _, p := range a {
7287
if err := p.CleanUp(domain, token, keyAuth); err != nil {
@@ -83,6 +98,7 @@ type AggregateProviderTimeout struct {
8398
AggregateProvider
8499
}
85100

101+
// Timeout gives the largest timeout values from any child provider that supports timeouts.
86102
func (a AggregateProviderTimeout) Timeout() (timeout, interval time.Duration) {
87103
for _, p := range a.AggregateProvider {
88104
if to, ok := p.(acme.ChallengeProviderTimeout); ok {
@@ -171,17 +187,6 @@ func (d *DNSProvider) buildProvider(name string, params map[string]string) (acme
171187
return prv, nil
172188
}
173189

174-
func New() (*DNSProvider, error) {
175-
config, err := getConfig()
176-
if err != nil {
177-
return nil, err
178-
}
179-
return &DNSProvider{
180-
providers: map[string]acme.ChallengeProvider{},
181-
config: config,
182-
}, nil
183-
}
184-
185190
func (d *DNSProvider) Present(domain, token, keyAuth string) error {
186191
provider, err := d.getProviderForDomain(domain)
187192
if err != nil {

0 commit comments

Comments
 (0)