upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

errwrap.Wrapf() mop-up (#11779)

Browse source
This commit is contained in:
Lars Lehtonen 2021-06-07 09:18:03 -07:00 committed by GitHub
parent 4239ea87a6
commit b69998de5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
serviceregistration/consul/consul_service_registration.go
View file

@ -15,7 +15,6 @@ import (
"time"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/errwrap"
log "github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/sdk/helper/consts"
"github.com/hashicorp/vault/sdk/helper/parseutil"
@ -152,7 +151,7 @@ func NewServiceRegistration(conf map[string]string, logger log.Logger, state sr.
consulConf.HttpClient = &http.Client{Transport: consulConf.Transport}
client, err := api.NewClient(consulConf)
if err != nil {
return nil, errwrap.Wrapf("client setup failed: {{err}}", err)
return nil, fmt.Errorf("client setup failed: %w", err)
}
// Setup the backend

4
shamir/shamir.go
View file

@ -6,8 +6,6 @@ import (
"fmt"
mathrand "math/rand"
"time"
"github.com/hashicorp/errwrap"
)
const (
@ -164,7 +162,7 @@ func Split(secret []byte, parts, threshold int) ([][]byte, error) {
for idx, val := range secret {
p, err := makePolynomial(val, uint8(threshold-1))
if err != nil {
return nil, errwrap.Wrapf("failed to generate polynomial: {{err}}", err)
return nil, fmt.Errorf("failed to generate polynomial: %w", err)
}
// Generate a `parts` number of (x,y) pairs