From 961c04cae992eadb42d286d2f85f8a675bdc68c8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Mon, 29 Jan 2018 14:17:40 -0800 Subject: Upgrading server dependancies (#8154) --- vendor/github.com/xenolf/lego/README.md | 2 +- vendor/github.com/xenolf/lego/acme/http.go | 1 + vendor/github.com/xenolf/lego/cli.go | 2 +- .../xenolf/lego/providers/dns/exoscale/exoscale.go | 26 +++++++++------------- 4 files changed, 14 insertions(+), 17 deletions(-) (limited to 'vendor/github.com/xenolf') diff --git a/vendor/github.com/xenolf/lego/README.md b/vendor/github.com/xenolf/lego/README.md index b9c374432..9ec7e1f38 100644 --- a/vendor/github.com/xenolf/lego/README.md +++ b/vendor/github.com/xenolf/lego/README.md @@ -229,7 +229,7 @@ myUser := MyUser{ // A client facilitates communication with the CA server. This CA URL is // configured for a local dev instance of Boulder running in Docker in a VM. -client, err := acme.NewClient("http://192.168.99.100:4000", &myUser, acme.RSA2048) +client, err := acme.NewClient("http://192.168.99.100:4000/directory", &myUser, acme.RSA2048) if err != nil { log.Fatal(err) } diff --git a/vendor/github.com/xenolf/lego/acme/http.go b/vendor/github.com/xenolf/lego/acme/http.go index fd6018a10..e469e0de2 100644 --- a/vendor/github.com/xenolf/lego/acme/http.go +++ b/vendor/github.com/xenolf/lego/acme/http.go @@ -18,6 +18,7 @@ var UserAgent string // HTTPClient is an HTTP client with a reasonable timeout value. var HTTPClient = http.Client{ Transport: &http.Transport{ + Proxy: http.ProxyFromEnvironment, Dial: (&net.Dialer{ Timeout: 30 * time.Second, KeepAlive: 30 * time.Second, diff --git a/vendor/github.com/xenolf/lego/cli.go b/vendor/github.com/xenolf/lego/cli.go index 3aac9e253..58567be9f 100644 --- a/vendor/github.com/xenolf/lego/cli.go +++ b/vendor/github.com/xenolf/lego/cli.go @@ -172,7 +172,7 @@ func main() { }, cli.StringSliceFlag{ Name: "dns-resolvers", - Usage: "Set the resolvers to use for performing recursive DNS queries. Supported: host:port. The default is to use Google's DNS resolvers.", + Usage: "Set the resolvers to use for performing recursive DNS queries. Supported: host:port. The default is to use the system resolvers, or Google's DNS resolvers if the system's cannot be determined.", }, cli.BoolFlag{ Name: "pem", diff --git a/vendor/github.com/xenolf/lego/providers/dns/exoscale/exoscale.go b/vendor/github.com/xenolf/lego/providers/dns/exoscale/exoscale.go index 7b2fccc98..4b125e8df 100644 --- a/vendor/github.com/xenolf/lego/providers/dns/exoscale/exoscale.go +++ b/vendor/github.com/xenolf/lego/providers/dns/exoscale/exoscale.go @@ -48,25 +48,25 @@ func (c *DNSProvider) Present(domain, token, keyAuth string) error { return err } - recordId, err := c.FindExistingRecordId(zone, recordName) + recordID, err := c.FindExistingRecordId(zone, recordName) if err != nil { return err } record := egoscale.DNSRecord{ Name: recordName, - Ttl: ttl, + TTL: ttl, Content: value, RecordType: "TXT", } - if recordId == 0 { + if recordID == 0 { _, err := c.client.CreateRecord(zone, record) if err != nil { return errors.New("Error while creating DNS record: " + err.Error()) } } else { - record.Id = recordId + record.ID = recordID _, err := c.client.UpdateRecord(zone, record) if err != nil { return errors.New("Error while updating DNS record: " + err.Error()) @@ -84,17 +84,13 @@ func (c *DNSProvider) CleanUp(domain, token, keyAuth string) error { return err } - recordId, err := c.FindExistingRecordId(zone, recordName) + recordID, err := c.FindExistingRecordId(zone, recordName) if err != nil { return err } - if recordId != 0 { - record := egoscale.DNSRecord{ - Id: recordId, - } - - err = c.client.DeleteRecord(zone, record) + if recordID != 0 { + err = c.client.DeleteRecord(zone, recordID) if err != nil { return errors.New("Error while deleting DNS record: " + err.Error()) } @@ -106,13 +102,13 @@ func (c *DNSProvider) CleanUp(domain, token, keyAuth string) error { // Query Exoscale to find an existing record for this name. // Returns nil if no record could be found func (c *DNSProvider) FindExistingRecordId(zone, recordName string) (int64, error) { - responses, err := c.client.GetRecords(zone) + records, err := c.client.GetRecords(zone) if err != nil { return -1, errors.New("Error while retrievening DNS records: " + err.Error()) } - for _, response := range responses { - if response.Record.Name == recordName { - return response.Record.Id, nil + for _, record := range records { + if record.Name == recordName { + return record.ID, nil } } return 0, nil -- cgit v1.2.3-1-g7c22