Skip to content

Commit fc42a0a

Browse files
committed
use go1.13 error wrapping
1 parent 8932099 commit fc42a0a

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

pkg/client/fake/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func NewFakeClientWithScheme(clientScheme *runtime.Scheme, initObjs ...runtime.O
5757
for _, obj := range initObjs {
5858
err := tracker.Add(obj)
5959
if err != nil {
60-
panic(fmt.Errorf("failed to add object %v to fake client: %v", obj, err))
60+
panic(fmt.Errorf("failed to add object %v to fake client: %w", obj, err))
6161
}
6262
}
6363
return &fakeClient{

pkg/envtest/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func (te *Environment) Start() (*rest.Config, error) {
188188
}
189189

190190
if err := te.defaultTimeouts(); err != nil {
191-
return nil, fmt.Errorf("failed to default controlplane timeouts: %v", err)
191+
return nil, fmt.Errorf("failed to default controlplane timeouts: %w", err)
192192
}
193193
te.ControlPlane.Etcd.StartTimeout = te.ControlPlaneStartTimeout
194194
te.ControlPlane.Etcd.StopTimeout = te.ControlPlaneStopTimeout
@@ -228,7 +228,7 @@ func (te *Environment) startControlPlane() error {
228228
log.Error(err, "unable to start the controlplane", "tries", numTries)
229229
}
230230
if numTries == maxRetries {
231-
return fmt.Errorf("failed to start the controlplane. retried %d times: %v", numTries, err)
231+
return fmt.Errorf("failed to start the controlplane. retried %d times: %w", numTries, err)
232232
}
233233
return nil
234234
}

pkg/internal/recorder/recorder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type provider struct {
4242
func NewProvider(config *rest.Config, scheme *runtime.Scheme, logger logr.Logger, broadcaster record.EventBroadcaster) (recorder.Provider, error) {
4343
clientSet, err := kubernetes.NewForConfig(config)
4444
if err != nil {
45-
return nil, fmt.Errorf("failed to init clientSet: %v", err)
45+
return nil, fmt.Errorf("failed to init clientSet: %w", err)
4646
}
4747

4848
p := &provider{scheme: scheme, logger: logger, eventBroadcaster: broadcaster}

pkg/leaderelection/leader_election.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewResourceLock(config *rest.Config, recorderProvider recorder.Provider, op
6262
var err error
6363
options.LeaderElectionNamespace, err = getInClusterNamespace()
6464
if err != nil {
65-
return nil, fmt.Errorf("unable to find leader election namespace: %v", err)
65+
return nil, fmt.Errorf("unable to find leader election namespace: %w", err)
6666
}
6767
}
6868

@@ -98,13 +98,13 @@ func getInClusterNamespace() (string, error) {
9898
if os.IsNotExist(err) {
9999
return "", fmt.Errorf("not running in-cluster, please specify LeaderElectionNamespace")
100100
} else if err != nil {
101-
return "", fmt.Errorf("error checking namespace file: %v", err)
101+
return "", fmt.Errorf("error checking namespace file: %w", err)
102102
}
103103

104104
// Load the namespace file and return its content
105105
namespace, err := ioutil.ReadFile(inClusterNamespacePath)
106106
if err != nil {
107-
return "", fmt.Errorf("error reading namespace file: %v", err)
107+
return "", fmt.Errorf("error reading namespace file: %w", err)
108108
}
109109
return string(namespace), nil
110110
}

pkg/metrics/listener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewListener(addr string) (net.Listener, error) {
4040
log.Info("metrics server is starting to listen", "addr", addr)
4141
ln, err := net.Listen("tcp", addr)
4242
if err != nil {
43-
er := fmt.Errorf("error listening on %s: %v", addr, err)
43+
er := fmt.Errorf("error listening on %s: %w", addr, err)
4444
log.Error(er, "metrics server failed to listen. You may want to disable the metrics server or use another port if it is due to conflicts")
4545
return nil, er
4646
}

pkg/webhook/admission/multi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (hs multiMutating) Handle(ctx context.Context, req Request) Response {
4747
var err error
4848
marshaledPatch, err := json.Marshal(patches)
4949
if err != nil {
50-
return Errored(http.StatusBadRequest, fmt.Errorf("error when marshaling the patch: %v", err))
50+
return Errored(http.StatusBadRequest, fmt.Errorf("error when marshaling the patch: %w", err))
5151
}
5252
return Response{
5353
AdmissionResponse: admissionv1beta1.AdmissionResponse{

pkg/webhook/conversion/conversion.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ func (wh *Webhook) convertViaHub(src, dst conversion.Convertible) error {
161161

162162
err = src.ConvertTo(hub)
163163
if err != nil {
164-
return fmt.Errorf("%T failed to convert to hub version %T : %v", src, hub, err)
164+
return fmt.Errorf("%T failed to convert to hub version %T : %w", src, hub, err)
165165
}
166166

167167
err = dst.ConvertFrom(hub)
168168
if err != nil {
169-
return fmt.Errorf("%T failed to convert from hub version %T : %v", dst, hub, err)
169+
return fmt.Errorf("%T failed to convert from hub version %T : %w", dst, hub, err)
170170
}
171171

172172
return nil
@@ -187,7 +187,7 @@ func (wh *Webhook) getHub(obj runtime.Object) (conversion.Hub, error) {
187187
for _, gvk := range gvks {
188188
instance, err := wh.scheme.New(gvk)
189189
if err != nil {
190-
return nil, fmt.Errorf("failed to allocate an instance for gvk %v %v", gvk, err)
190+
return nil, fmt.Errorf("failed to allocate an instance for gvk %v: %w", gvk, err)
191191
}
192192
if val, isHub := instance.(conversion.Hub); isHub {
193193
if hubFoundAlready {
@@ -237,7 +237,7 @@ func IsConvertible(scheme *runtime.Scheme, obj runtime.Object) (bool, error) {
237237
for _, gvk := range gvks {
238238
instance, err := scheme.New(gvk)
239239
if err != nil {
240-
return false, fmt.Errorf("failed to allocate an instance for gvk %v %v", gvk, err)
240+
return false, fmt.Errorf("failed to allocate an instance for gvk %v: %w", gvk, err)
241241
}
242242

243243
if isHub(instance) {

0 commit comments

Comments
 (0)