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

9
models/t_caa.go
View File

@@ -1,10 +1,9 @@
package models
import (
"fmt"
"strconv"
"strings"
"github.com/pkg/errors"
)
// SetTargetCAA sets the CAA fields.
@@ -20,7 +19,7 @@ func (rc *RecordConfig) SetTargetCAA(flag uint8, tag string, target string) erro
}
if tag != "issue" && tag != "issuewild" && tag != "iodef" {
return errors.Errorf("CAA tag (%v) is not one of issue/issuewild/iodef", tag)
return fmt.Errorf("CAA tag (%v) is not one of issue/issuewild/iodef", tag)
}
return nil
@@ -30,7 +29,7 @@ func (rc *RecordConfig) SetTargetCAA(flag uint8, tag string, target string) erro
func (rc *RecordConfig) SetTargetCAAStrings(flag, tag, target string) error {
i64flag, err := strconv.ParseUint(flag, 10, 8)
if err != nil {
return errors.Wrap(err, "CAA flag does not fit in 8 bits")
return fmt.Errorf("CAA flag does not fit in 8 bits: %w", err)
}
return rc.SetTargetCAA(uint8(i64flag), tag, target)
}
@@ -40,7 +39,7 @@ func (rc *RecordConfig) SetTargetCAAStrings(flag, tag, target string) error {
func (rc *RecordConfig) SetTargetCAAString(s string) error {
part := strings.Fields(s)
if len(part) != 3 {
return errors.Errorf("CAA value does not contain 3 fields: (%#v)", s)
return fmt.Errorf("CAA value does not contain 3 fields: (%#v)", s)
}
return rc.SetTargetCAAStrings(part[0], part[1], StripQuotes(part[2]))
}