mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

Switch to Go 1.13 error wrapping (#604)

Browse Source 
* Replaced errors.Wrap with fmt.Errorf (#589)

* Find:    errors\.Wrap\(([^,]+),\s+(["`][^"`]*)(["`])\)
  Replace: fmt.Errorf($2: %w$3, $1)

* Replaced errors.Wrapf with fmt.Errorf (#589)

* Find:    errors\.Wrapf\(([^,]+),\s+(["`][^"`]*)(["`])\)
  Replace: fmt.Errorf($2: %w$3, $1)
* Find:    errors\.Wrapf\(([^,]+),\s+(["`][^"`]*)(["`])(,[^)]+)\)
* Replace: fmt.Errorf($2: %w$3$4, $1)

* Replaced errors.Errorf with fmt.Errorf (#589)

* Find:    errors\.Errorf
  Replace: fmt.Errorf

* Cleaned up remaining imports

* Cleanup

* Regenerate provider support matrix

This was broken by #533 ... and it's now the third time this has been missed.
This commit is contained in:
Patrick Gaskin
2020-01-28 11:06:56 -05:00
committed by Tom Limoncelli
parent cae35a2c8f
commit 825ba2d081
64 changed files with 328 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
providers/linode/linodeProvider.go
View File

@@ -5,19 +5,16 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"regexp"
"strings"
"github.com/miekg/dns/dnsutil"
"golang.org/x/oauth2"
"github.com/StackExchange/dnscontrol/v2/models"
"github.com/StackExchange/dnscontrol/v2/providers"
"github.com/StackExchange/dnscontrol/v2/providers/diff"
"github.com/miekg/dns/dnsutil"
"github.com/pkg/errors"
"net/url"
"regexp"
"strings"
"golang.org/x/oauth2"
)
/*
@@ -64,7 +61,7 @@ var defaultNameServerNames = []string{
// NewLinode creates the provider.
func NewLinode(m map[string]string, metadata json.RawMessage) (providers.DNSServiceProvider, error) {
if m["token"] == "" {
return nil, errors.Errorf("Missing Linode token")
return nil, fmt.Errorf("Missing Linode token")
}
ctx := context.Background()
@@ -75,7 +72,7 @@ func NewLinode(m map[string]string, metadata json.RawMessage) (providers.DNSServ
baseURL, err := url.Parse(defaultBaseURL)
if err != nil {
return nil, errors.Errorf("Linode base URL not valid")
return nil, fmt.Errorf("Linode base URL not valid")
}
api := &LinodeApi{client: client, baseURL: baseURL}
@@ -119,7 +116,7 @@ func (api *LinodeApi) GetDomainCorrections(dc *models.DomainConfig) ([]*models.C
}
domainID, ok := api.domainIndex[dc.Name]
if !ok {
return nil, errors.Errorf("%s not listed in domains for Linode account", dc.Name)
return nil, fmt.Errorf("%s not listed in domains for Linode account", dc.Name)
}
records, err := api.getRecords(domainID)
@@ -277,7 +274,7 @@ func toReq(dc *models.DomainConfig, rc *models.RecordConfig) (*recordEditRequest
result := srvRegexp.FindStringSubmatch(req.Name)
if len(result) != 3 {
return nil, errors.Errorf("SRV Record must match format \"_service._protocol\" not %s", req.Name)
return nil, fmt.Errorf("SRV Record must match format \"_service._protocol\" not %s", req.Name)
}
var serviceName, protocol string = result[1], strings.ToLower(result[2])