Skip to content

Commit 7a50e61

Browse files
dtan4dtan4
authored
deps: Get rid of pkg/errors (#286)
1 parent ab40132 commit 7a50e61

File tree

11 files changed

+55
-55
lines changed

11 files changed

+55
-55
lines changed

‎cmd/dump.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package cmd
33
import (
44
"bufio"
55
"context"
6+
"errors"
67
"fmt"
78
"io"
89
"os"
910
"sort"
1011
"strconv"
1112

1213
"github.com/dtan4/k8sec/pkg/client"
13-
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"
1515
)
1616

@@ -44,14 +44,14 @@ database-url=postgres://example.com:5432/dbname
4444
`,
4545
RunE: func(cmd *cobra.Command, args []string) error {
4646
if len(args) > 1 {
47-
return errors.New("Too many arguments.")
47+
return errors.New("too many arguments")
4848
}
4949

5050
ctx := context.Background()
5151

5252
k8sclient, err := client.New(rootOpts.kubeconfig, rootOpts.context)
5353
if err != nil {
54-
return errors.Wrap(err, "Failed to initialize Kubernetes API client.")
54+
return fmt.Errorf("initialize Kubernetes API client: %w", err)
5555
}
5656

5757
var namespace string
@@ -78,7 +78,7 @@ func runDump(ctx context.Context, k8sclient client.Client, namespace string, arg
7878
if len(args) == 1 {
7979
secret, err := k8sclient.GetSecret(ctx, namespace, args[0])
8080
if err != nil {
81-
return errors.Wrapf(err, "Failed to get secret. name=%s", args[0])
81+
return fmt.Errorf("get secret %q: %w", args[0], err)
8282
}
8383

8484
for key, value := range secret.Data {
@@ -91,7 +91,7 @@ func runDump(ctx context.Context, k8sclient client.Client, namespace string, arg
9191
} else {
9292
secrets, err := k8sclient.ListSecrets(ctx, namespace)
9393
if err != nil {
94-
return errors.Wrap(err, "Failed to list secret.")
94+
return fmt.Errorf("list secret: %w", err)
9595
}
9696

9797
for _, secret := range secrets.Items {
@@ -110,7 +110,7 @@ func runDump(ctx context.Context, k8sclient client.Client, namespace string, arg
110110
if opts.filename != "" {
111111
f, err := os.Create(opts.filename)
112112
if err != nil {
113-
return errors.Wrapf(err, "Failed to open file. filename=%s", opts.filename)
113+
return fmt.Errorf("open file %q: %w", opts.filename, err)
114114
}
115115
defer f.Close()
116116

@@ -119,7 +119,7 @@ func runDump(ctx context.Context, k8sclient client.Client, namespace string, arg
119119
for _, line := range lines {
120120
_, err := w.WriteString(line + "\n")
121121
if err != nil {
122-
return errors.Wrapf(err, "Failed to write to file. filename=%s", opts.filename)
122+
return fmt.Errorf("write to file %q: %w", opts.filename, err)
123123
}
124124
}
125125

‎cmd/dump_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"bytes"
55
"context"
6-
"fmt"
6+
"errors"
77
"io"
88
"os"
99
"path/filepath"
@@ -67,8 +67,8 @@ token="thisistoken"
6767
args: []string{},
6868
filename: "",
6969
noquotes: false,
70-
err: fmt.Errorf("cannot retrieve secret rails"),
71-
wantErr: fmt.Errorf("Failed to list secret.: cannot retrieve secret rails"),
70+
err: errors.New("cannot retrieve secret rails"),
71+
wantErr: errors.New("list secret: cannot retrieve secret rails"),
7272
},
7373

7474
"one secret arg": {
@@ -135,8 +135,8 @@ token=thisistoken
135135
args: []string{"rails"},
136136
filename: "",
137137
noquotes: false,
138-
err: fmt.Errorf("cannot retrieve secret rails"),
139-
wantErr: fmt.Errorf("Failed to get secret. name=rails: cannot retrieve secret rails"),
138+
err: errors.New("cannot retrieve secret rails"),
139+
wantErr: errors.New(`get secret "rails": cannot retrieve secret rails`),
140140
},
141141
}
142142

‎cmd/list.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cmd
33
import (
44
"context"
55
"encoding/base64"
6+
"errors"
67
"fmt"
78
"io"
89
"sort"
@@ -11,7 +12,6 @@ import (
1112
"text/tabwriter"
1213

1314
"github.com/dtan4/k8sec/pkg/client"
14-
"github.com/pkg/errors"
1515
"github.com/spf13/cobra"
1616
)
1717

@@ -39,14 +39,14 @@ rails Opaque database-url cG9zdGdyZXM6Ly9leGFtcGxlLmNvbTo1NDMyL2RibmFtZQ==
3939
`,
4040
RunE: func(cmd *cobra.Command, args []string) error {
4141
if len(args) > 1 {
42-
return errors.New("Too many arguments.")
42+
return errors.New("too many arguments")
4343
}
4444

4545
ctx := context.Background()
4646

4747
k8sclient, err := client.New(rootOpts.kubeconfig, rootOpts.context)
4848
if err != nil {
49-
return errors.Wrap(err, "Failed to initialize Kubernetes API client.")
49+
return fmt.Errorf("initialize Kubernetes API client: %w", err)
5050
}
5151

5252
var namespace string
@@ -85,7 +85,7 @@ func runList(ctx context.Context, k8sclient client.Client, namespace string, arg
8585
if len(args) == 1 {
8686
secret, err := k8sclient.GetSecret(ctx, namespace, args[0])
8787
if err != nil {
88-
return errors.Wrap(err, "Failed to retrieve secrets.")
88+
return fmt.Errorf("get secret %q: %w", args[0], err)
8989
}
9090

9191
for key, value := range secret.Data {
@@ -110,7 +110,7 @@ func runList(ctx context.Context, k8sclient client.Client, namespace string, arg
110110
} else {
111111
ss, err := k8sclient.ListSecrets(ctx, namespace)
112112
if err != nil {
113-
return errors.Wrap(err, "Failed to retrieve secrets.")
113+
return fmt.Errorf("list secrets: %w", err)
114114
}
115115

116116
for _, secret := range ss.Items {

‎cmd/list_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"bytes"
55
"context"
6-
"fmt"
6+
"errors"
77
"testing"
88

99
v1 "k8s.io/api/core/v1"
@@ -61,8 +61,8 @@ rails Opaque rails-env "production"
6161

6262
"no secret arg and error": {
6363
args: []string{},
64-
err: fmt.Errorf("cannot retrieve secret rails"),
65-
wantErr: fmt.Errorf("Failed to retrieve secrets.: cannot retrieve secret rails"),
64+
err: errors.New("cannot retrieve secret rails"),
65+
wantErr: errors.New("list secrets: cannot retrieve secret rails"),
6666
},
6767

6868
"one secret arg": {
@@ -109,8 +109,8 @@ rails Opaque rails-env cHJvZHVjdGlvbg==
109109

110110
"one secret and error": {
111111
args: []string{"rails"},
112-
err: fmt.Errorf("cannot retrieve secret rails"),
113-
wantErr: fmt.Errorf("Failed to retrieve secrets.: cannot retrieve secret rails"),
112+
err: errors.New("cannot retrieve secret rails"),
113+
wantErr: errors.New(`get secret "rails": cannot retrieve secret rails`),
114114
},
115115
}
116116

‎cmd/load.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package cmd
33
import (
44
"bufio"
55
"context"
6+
"errors"
7+
"fmt"
68
"io"
79
"os"
810
"strconv"
911
"strings"
1012

1113
"github.com/dtan4/k8sec/pkg/client"
12-
"github.com/pkg/errors"
1314
"github.com/spf13/cobra"
1415
)
1516

@@ -35,14 +36,14 @@ $ cat .env | k8sec load rails
3536
`,
3637
RunE: func(cmd *cobra.Command, args []string) error {
3738
if len(args) != 1 {
38-
return errors.New("Variable name must be specified.")
39+
return fmt.Errorf("variable name must be specified.")
3940
}
4041

4142
ctx := context.Background()
4243

4344
k8sclient, err := client.New(rootOpts.kubeconfig, rootOpts.context)
4445
if err != nil {
45-
return errors.Wrap(err, "Failed to initialize Kubernetes API client.")
46+
return fmt.Errorf("initialize Kubernetes API client: %w", err)
4647
}
4748

4849
var namespace string
@@ -64,7 +65,7 @@ $ cat .env | k8sec load rails
6465

6566
func runLoad(ctx context.Context, k8sclient client.Client, namespace string, args []string, in io.Reader, out io.Writer, opts *loadOpts) error {
6667
if len(args) != 1 {
67-
return errors.New("Variable name must be specified.")
68+
return fmt.Errorf("Variable name must be specified.")
6869
}
6970
name := args[0]
7071

@@ -74,7 +75,7 @@ func runLoad(ctx context.Context, k8sclient client.Client, namespace string, arg
7475
if opts.filename != "" {
7576
f, err := os.Open(opts.filename)
7677
if err != nil {
77-
return errors.Wrapf(err, "Failed to open file. filename=%s", opts.filename)
78+
return fmt.Errorf("open file %q: %w", opts.filename, err)
7879
}
7980
defer f.Close()
8081

@@ -88,7 +89,7 @@ func runLoad(ctx context.Context, k8sclient client.Client, namespace string, arg
8889
ary := strings.SplitN(line, "=", 2)
8990

9091
if len(ary) != 2 {
91-
return errors.Errorf("Line should be key=value format. line=%q", line)
92+
return errors.New("line must be key=value format")
9293
}
9394

9495
k, v := ary[0], ary[1]
@@ -104,7 +105,7 @@ func runLoad(ctx context.Context, k8sclient client.Client, namespace string, arg
104105

105106
s, err := k8sclient.GetSecret(ctx, namespace, name)
106107
if err != nil {
107-
return errors.Wrapf(err, "Failed to get secret. name=%s", name)
108+
return fmt.Errorf("get secret %q: %w", name, err)
108109
}
109110

110111
for k, v := range data {
@@ -113,7 +114,7 @@ func runLoad(ctx context.Context, k8sclient client.Client, namespace string, arg
113114

114115
_, err = k8sclient.UpdateSecret(ctx, namespace, s)
115116
if err != nil {
116-
return errors.Wrapf(err, "Failed to set secret. name=%s", name)
117+
return fmt.Errorf("set secret %q: %w", name, err)
117118
}
118119

119120
return nil

‎cmd/load_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"bytes"
55
"context"
6-
"fmt"
6+
"errors"
77
"strings"
88
"testing"
99

@@ -58,8 +58,8 @@ rails-env="production"`,
5858
args: []string{
5959
"rails",
6060
},
61-
err: fmt.Errorf("cannot list secret"),
62-
wantErr: fmt.Errorf("Failed to get secret. name=rails: cannot list secret"),
61+
err: errors.New("cannot list secret"),
62+
wantErr: errors.New(`get secret "rails": cannot list secret`),
6363
},
6464
}
6565

‎cmd/set.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package cmd
33
import (
44
"context"
55
"encoding/base64"
6+
"errors"
67
"fmt"
78
"io"
89
"strings"
910

1011
"github.com/dtan4/k8sec/pkg/client"
11-
"github.com/pkg/errors"
1212
"github.com/spf13/cobra"
1313
v1 "k8s.io/api/core/v1"
1414
)
@@ -46,14 +46,14 @@ rails Opaque foo "dtan4"
4646
`,
4747
RunE: func(cmd *cobra.Command, args []string) error {
4848
if len(args) < 2 {
49-
return errors.New("Too few arguments.")
49+
return fmt.Errorf("too few arguments")
5050
}
5151

5252
ctx := context.Background()
5353

5454
k8sclient, err := client.New(rootOpts.kubeconfig, rootOpts.context)
5555
if err != nil {
56-
return errors.Wrap(err, "Failed to initialize Kubernetes API client.")
56+
return fmt.Errorf("initialize Kubernetes API client: %w", err)
5757
}
5858

5959
var namespace string
@@ -82,15 +82,15 @@ func runSet(ctx context.Context, k8sclient client.Client, namespace string, args
8282
ary := strings.SplitN(kv, "=", 2)
8383

8484
if len(ary) != 2 {
85-
return errors.Errorf("Argument should be in key=value format. argument=%q", kv)
85+
return errors.New("argument should be in key=value format argument")
8686
}
8787

8888
k, v := ary[0], ary[1]
8989

9090
if opts.base64encoded {
9191
_v, err := base64.StdEncoding.DecodeString(v)
9292
if err != nil {
93-
return errors.Wrapf(err, "Failed to decode value as base64-encoded string. value=%q", v)
93+
return fmt.Errorf("decode value as base64-encoded string: %w", err)
9494
}
9595

9696
data[k] = _v
@@ -101,7 +101,7 @@ func runSet(ctx context.Context, k8sclient client.Client, namespace string, args
101101

102102
ss, err := k8sclient.ListSecrets(ctx, namespace)
103103
if err != nil {
104-
return errors.Wrapf(err, "Failed to get current secret. name=%s", name)
104+
return fmt.Errorf("get current secret %q: %w", name, err)
105105
}
106106

107107
exists := false
@@ -118,7 +118,7 @@ func runSet(ctx context.Context, k8sclient client.Client, namespace string, args
118118
if exists {
119119
s, err = k8sclient.GetSecret(ctx, namespace, name)
120120
if err != nil {
121-
return errors.Wrapf(err, "Failed to get current secret. name=%s", name)
121+
return fmt.Errorf("get current secret %q: %w", name, err)
122122
}
123123

124124
if s.Data == nil {
@@ -131,7 +131,7 @@ func runSet(ctx context.Context, k8sclient client.Client, namespace string, args
131131

132132
_, err = k8sclient.UpdateSecret(ctx, namespace, s)
133133
if err != nil {
134-
return errors.Wrapf(err, "Failed to update secret. name=%s", name)
134+
return fmt.Errorf("update secret %q: %w", name, err)
135135
}
136136
} else {
137137
s = &v1.Secret{
@@ -141,7 +141,7 @@ func runSet(ctx context.Context, k8sclient client.Client, namespace string, args
141141

142142
_, err = k8sclient.CreateSecret(ctx, namespace, s)
143143
if err != nil {
144-
return errors.Wrapf(err, "Failed to create secret. name=%s", name)
144+
return fmt.Errorf("create secret %q: %w", name, err)
145145
}
146146
}
147147

‎cmd/set_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"bytes"
55
"context"
6-
"fmt"
6+
"errors"
77
"testing"
88

99
v1 "k8s.io/api/core/v1"
@@ -82,8 +82,8 @@ func TestRunSet(t *testing.T) {
8282
secrets: &v1.SecretList{
8383
Items: []v1.Secret{},
8484
},
85-
err: fmt.Errorf("cannot list secret"),
86-
wantErr: fmt.Errorf("Failed to get current secret. name=rails: cannot list secret"),
85+
err: errors.New("cannot list secret"),
86+
wantErr: errors.New(`get current secret "rails": cannot list secret`),
8787
},
8888
}
8989

0 commit comments

Comments
 (0)