potyarkin/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

lauch go fmt to format the change

Browse source
This commit is contained in:
disaster 2016-06-24 18:23:28 +00:00
parent 4f6c1d470f
commit cc40650b80
3 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli_handlers.go
View file

@ -18,10 +18,10 @@ import (
"github.com/xenolf/lego/providers/dns/gandi" "github.com/xenolf/lego/providers/dns/gandi"
"github.com/xenolf/lego/providers/dns/googlecloud" "github.com/xenolf/lego/providers/dns/googlecloud"
"github.com/xenolf/lego/providers/dns/namecheap" "github.com/xenolf/lego/providers/dns/namecheap"
"github.com/xenolf/lego/providers/dns/ovh"
"github.com/xenolf/lego/providers/dns/rfc2136" "github.com/xenolf/lego/providers/dns/rfc2136"
"github.com/xenolf/lego/providers/dns/route53" "github.com/xenolf/lego/providers/dns/route53"
"github.com/xenolf/lego/providers/dns/vultr" "github.com/xenolf/lego/providers/dns/vultr"
"github.com/xenolf/lego/providers/dns/ovh"
"github.com/xenolf/lego/providers/http/webroot" "github.com/xenolf/lego/providers/http/webroot"
) )

14
providers/dns/ovh/ovh.go
View file

@ -5,17 +5,16 @@ package ovh
import ( import (
"fmt" "fmt"
"os" "os"
"sync"
"strings" "strings"
"sync"
"github.com/xenolf/lego/acme"
"github.com/ovh/go-ovh/ovh" "github.com/ovh/go-ovh/ovh"
"github.com/xenolf/lego/acme"
) )
// OVH API reference: https://eu.api.ovh.com/ // OVH API reference: https://eu.api.ovh.com/
// Create a Token: https://eu.api.ovh.com/createToken/ // Create a Token: https://eu.api.ovh.com/createToken/
// DNSProvider is an implementation of the acme.ChallengeProvider interface // DNSProvider is an implementation of the acme.ChallengeProvider interface
// that uses OVH's REST API to manage TXT records for a domain. // that uses OVH's REST API to manage TXT records for a domain.
type DNSProvider struct { type DNSProvider struct {
@ -24,7 +23,6 @@ type DNSProvider struct {
recordIDsMu sync.Mutex recordIDsMu sync.Mutex
} }
// NewDNSProvider returns a DNSProvider instance configured for OVH // NewDNSProvider returns a DNSProvider instance configured for OVH
// Credentials must be passed in the environment variable: // Credentials must be passed in the environment variable:
// OVH_ENDPOINT : it must be ovh-eu or ovh-ca // OVH_ENDPOINT : it must be ovh-eu or ovh-ca
@ -39,7 +37,6 @@ func NewDNSProvider() (*DNSProvider, error) {
return NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey) return NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey)
} }
// NewDNSProviderCredentials uses the supplied credentials to return a // NewDNSProviderCredentials uses the supplied credentials to return a
// DNSProvider instance configured for OVH. // DNSProvider instance configured for OVH.
func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey string) (*DNSProvider, error) { func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, consumerKey string) (*DNSProvider, error) {
@ -60,7 +57,6 @@ func NewDNSProviderCredentials(apiEndpoint, applicationKey, applicationSecret, c
}, nil }, nil
} }
// Present creates a TXT record to fulfil the dns-01 challenge. // Present creates a TXT record to fulfil the dns-01 challenge.
func (d *DNSProvider) Present(domain, token, keyAuth string) error { func (d *DNSProvider) Present(domain, token, keyAuth string) error {
@ -93,7 +89,6 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
authZone = acme.UnFqdn(authZone) authZone = acme.UnFqdn(authZone)
subDomain := d.extractRecordName(fqdn, authZone) subDomain := d.extractRecordName(fqdn, authZone)
reqURL := fmt.Sprintf("/domain/zone/%s/record", authZone) reqURL := fmt.Sprintf("/domain/zone/%s/record", authZone)
reqData := txtRecordRequest{FieldType: "TXT", SubDomain: subDomain, Target: value, TTL: ttl} reqData := txtRecordRequest{FieldType: "TXT", SubDomain: subDomain, Target: value, TTL: ttl}
var respData txtRecordResponse var respData txtRecordResponse
@ -117,12 +112,9 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
d.recordIDs[fqdn] = respData.ID d.recordIDs[fqdn] = respData.ID
d.recordIDsMu.Unlock() d.recordIDsMu.Unlock()
return nil return nil
} }
// CleanUp removes the TXT record matching the specified parameters // CleanUp removes the TXT record matching the specified parameters
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error { func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
fqdn, _, _ := acme.DNS01Record(domain, keyAuth) fqdn, _, _ := acme.DNS01Record(domain, keyAuth)
@ -135,7 +127,6 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
return fmt.Errorf("unknown record ID for '%s'", fqdn) return fmt.Errorf("unknown record ID for '%s'", fqdn)
} }
authZone, err := acme.FindZoneByFqdn(acme.ToFqdn(domain), acme.RecursiveNameservers) authZone, err := acme.FindZoneByFqdn(acme.ToFqdn(domain), acme.RecursiveNameservers)
if err != nil { if err != nil {
return fmt.Errorf("Could not determine zone for domain: '%s'. %s", domain, err) return fmt.Errorf("Could not determine zone for domain: '%s'. %s", domain, err)
@ -151,7 +142,6 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
return err return err
} }
// Delete record ID from map // Delete record ID from map
d.recordIDsMu.Lock() d.recordIDsMu.Lock()
delete(d.recordIDs, fqdn) delete(d.recordIDs, fqdn)

2
providers/dns/ovh/ovh_test.go
View file

@ -51,7 +51,6 @@ func TestNewDNSProviderMissingCredErr(t *testing.T) {
_, err := NewDNSProvider() _, err := NewDNSProvider()
assert.EqualError(t, err, "OVH credentials missing") assert.EqualError(t, err, "OVH credentials missing")
os.Setenv("OVH_ENDPOINT", "ovh-eu") os.Setenv("OVH_ENDPOINT", "ovh-eu")
os.Setenv("OVH_APPLICATION_KEY", "") os.Setenv("OVH_APPLICATION_KEY", "")
os.Setenv("OVH_APPLICATION_SECRET", "5678") os.Setenv("OVH_APPLICATION_SECRET", "5678")
@ -60,7 +59,6 @@ func TestNewDNSProviderMissingCredErr(t *testing.T) {
_, err = NewDNSProvider() _, err = NewDNSProvider()
assert.EqualError(t, err, "OVH credentials missing") assert.EqualError(t, err, "OVH credentials missing")
os.Setenv("OVH_ENDPOINT", "ovh-eu") os.Setenv("OVH_ENDPOINT", "ovh-eu")
os.Setenv("OVH_APPLICATION_KEY", "1234") os.Setenv("OVH_APPLICATION_KEY", "1234")
os.Setenv("OVH_APPLICATION_SECRET", "") os.Setenv("OVH_APPLICATION_SECRET", "")