mirror of
https://github.com/StackExchange/dnscontrol.git
synced 2024-05-11 05:55:12 +00:00
Switch to Go 1.13 error wrapping (#604)
* 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:
committed by
Tom Limoncelli
parent
cae35a2c8f
commit
825ba2d081
@@ -1,10 +1,9 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// SetTargetTLSA sets the TLSA fields.
|
||||
@@ -32,14 +31,14 @@ func (rc *RecordConfig) SetTargetTLSAStrings(usage, selector, matchingtype, targ
|
||||
}
|
||||
}
|
||||
}
|
||||
return errors.Wrap(err, "TLSA has value that won't fit in field")
|
||||
return fmt.Errorf("TLSA has value that won't fit in field: %w", err)
|
||||
}
|
||||
|
||||
// SetTargetTLSAString is like SetTargetTLSA but accepts one big string.
|
||||
func (rc *RecordConfig) SetTargetTLSAString(s string) error {
|
||||
part := strings.Fields(s)
|
||||
if len(part) != 4 {
|
||||
return errors.Errorf("TLSA value does not contain 4 fields: (%#v)", s)
|
||||
return fmt.Errorf("TLSA value does not contain 4 fields: (%#v)", s)
|
||||
}
|
||||
return rc.SetTargetTLSAStrings(part[0], part[1], part[2], part[3])
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user