mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-02 03:27:54 +00:00
Errwrap everywhere (#4252)
* package api * package builtin/credential * package builtin/logical * package command * package helper * package http and logical * package physical * package shamir * package vault * package vault * address feedback * more fixes
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/vault/helper/certutil"
|
||||
"github.com/hashicorp/vault/helper/errutil"
|
||||
"github.com/hashicorp/vault/logical"
|
||||
@@ -87,7 +88,7 @@ func (b *backend) pathGenerateIntermediate(ctx context.Context, req *logical.Req
|
||||
|
||||
csrb, err := parsedBundle.ToCSRBundle()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("Error converting raw CSR bundle to CSR bundle: %s", err)
|
||||
return nil, errwrap.Wrapf("error converting raw CSR bundle to CSR bundle: {{err}}", err)
|
||||
}
|
||||
|
||||
resp = &logical.Response{
|
||||
@@ -197,12 +198,12 @@ func (b *backend) pathSetSignedIntermediate(ctx context.Context, req *logical.Re
|
||||
}
|
||||
|
||||
if err := inputBundle.Verify(); err != nil {
|
||||
return nil, fmt.Errorf("verification of parsed bundle failed: %s", err)
|
||||
return nil, errwrap.Wrapf("verification of parsed bundle failed: {{err}}", err)
|
||||
}
|
||||
|
||||
cb, err = inputBundle.ToCertBundle()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error converting raw values into cert bundle: %s", err)
|
||||
return nil, errwrap.Wrapf("error converting raw values into cert bundle: {{err}}", err)
|
||||
}
|
||||
|
||||
entry, err = logical.StorageEntryJSON("config/ca_bundle", cb)
|
||||
|
||||
Reference in New Issue
Block a user