Skip to content

Commit 70cd25f

Browse files
committed
chore: enable errorlint linter
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 9a95743 commit 70cd25f

45 files changed

Lines changed: 122 additions & 100 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.golangci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ linters:
314314
- durationcheck
315315
- errcheck
316316
- errchkjson
317+
- errorlint
317318
- ginkgolinter
318319
- goconst
319320
- goheader

internal/hook/wait_exec_hook_handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (e *DefaultWaitExecHookHandler) HandleHooks(
190190
var hookErr error
191191
if hookErr = e.PodCommandExecutor.ExecutePodCommand(hookLog, podMap, pod.Namespace, pod.Name, hook.HookName, eh); hookErr != nil {
192192
hookLog.WithError(hookErr).Error("Error executing hook")
193-
hookErr = fmt.Errorf("hook %s in container %s failed to execute, err: %v", hook.HookName, hook.Hook.Container, hookErr)
193+
hookErr = fmt.Errorf("hook %s in container %s failed to execute, err: %w", hook.HookName, hook.Hook.Container, hookErr)
194194
errors = append(errors, hookErr)
195195
hookFailed = true
196196
}
@@ -243,7 +243,7 @@ func (e *DefaultWaitExecHookHandler) HandleHooks(
243243
if hook.executed {
244244
continue
245245
}
246-
err := fmt.Errorf("hook %s in container %s in pod %s not executed: %v", hook.HookName, hook.Hook.Container, kube.NamespaceAndName(pod), ctx.Err())
246+
err := fmt.Errorf("hook %s in container %s in pod %s not executed: %w", hook.HookName, hook.Hook.Container, kube.NamespaceAndName(pod), ctx.Err())
247247
hookLog := log.WithFields(
248248
logrus.Fields{
249249
"hookSource": hook.HookSource,

internal/resourcemodifiers/json_merge_patch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ type JSONMergePatcher struct {
2020
func (p *JSONMergePatcher) Patch(u *unstructured.Unstructured, _ logrus.FieldLogger) (*unstructured.Unstructured, error) {
2121
objBytes, err := u.MarshalJSON()
2222
if err != nil {
23-
return nil, fmt.Errorf("error in marshaling object %s", err)
23+
return nil, fmt.Errorf("error in marshaling object %w", err)
2424
}
2525

2626
for _, patch := range p.patches {
2727
patchBytes, err := yaml.YAMLToJSON([]byte(patch.PatchData))
2828
if err != nil {
29-
return nil, fmt.Errorf("error in converting YAML to JSON %s", err)
29+
return nil, fmt.Errorf("error in converting YAML to JSON %w", err)
3030
}
3131

3232
objBytes, err = jsonpatch.MergePatch(objBytes, patchBytes)

internal/resourcemodifiers/resource_modifiers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func unmarshalResourceModifiers(yamlData []byte) (*ResourceModifiers, error) {
194194
resModifiers := &ResourceModifiers{}
195195
err := yaml.UnmarshalStrict(yamlData, resModifiers)
196196
if err != nil {
197-
return nil, fmt.Errorf("failed to decode yaml data into resource modifiers, err: %s", err)
197+
return nil, fmt.Errorf("failed to decode yaml data into resource modifiers, err: %w", err)
198198
}
199199
return resModifiers, nil
200200
}
@@ -217,7 +217,7 @@ func (r *ResourceModifierRule) applyPatch(u *unstructured.Unstructured, scheme *
217217

218218
updated, err := p.Patch(u, logger)
219219
if err != nil {
220-
return fmt.Errorf("error in applying patch %s", err)
220+
return fmt.Errorf("error in applying patch %w", err)
221221
}
222222

223223
u.SetUnstructuredContent(updated.Object)

internal/resourcemodifiers/strategic_merge_patch.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package resourcemodifiers
22

33
import (
4+
"errors"
45
"fmt"
56
"net/http"
67

@@ -37,7 +38,7 @@ func (p *StrategicMergePatcher) Patch(u *unstructured.Unstructured, _ logrus.Fie
3738
for _, patch := range p.patches {
3839
patchBytes, err := yaml.YAMLToJSON([]byte(patch.PatchData))
3940
if err != nil {
40-
return nil, fmt.Errorf("error in converting YAML to JSON %s", err)
41+
return nil, fmt.Errorf("error in converting YAML to JSON %w", err)
4142
}
4243

4344
err = strategicPatchObject(origin, patchBytes, updated, schemaReferenceObj)
@@ -127,10 +128,15 @@ func applyPatchToObject(
127128

128129
// interpretStrategicMergePatchError interprets the error type and returns an error with appropriate HTTP code.
129130
func interpretStrategicMergePatchError(err error) error {
130-
switch err {
131-
case mergepatch.ErrBadJSONDoc, mergepatch.ErrBadPatchFormatForPrimitiveList, mergepatch.ErrBadPatchFormatForRetainKeys, mergepatch.ErrBadPatchFormatForSetElementOrderList, mergepatch.ErrUnsupportedStrategicMergePatchFormat:
131+
switch {
132+
case errors.Is(err, mergepatch.ErrBadJSONDoc),
133+
errors.Is(err, mergepatch.ErrBadPatchFormatForPrimitiveList),
134+
errors.Is(err, mergepatch.ErrBadPatchFormatForRetainKeys),
135+
errors.Is(err, mergepatch.ErrBadPatchFormatForSetElementOrderList),
136+
errors.Is(err, mergepatch.ErrUnsupportedStrategicMergePatchFormat):
132137
return apierrors.NewBadRequest(err.Error())
133-
case mergepatch.ErrNoListOfLists, mergepatch.ErrPatchContentNotMatchRetainKeys:
138+
case errors.Is(err, mergepatch.ErrNoListOfLists),
139+
errors.Is(err, mergepatch.ErrPatchContentNotMatchRetainKeys):
134140
return apierrors.NewGenericServerResponse(http.StatusUnprocessableEntity, "", schema.GroupResource{}, "", err.Error(), 0, false)
135141
default:
136142
return err

internal/resourcepolicies/resource_policies.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func unmarshalResourcePolicies(yamlData *string) (*ResourcePolicies, error) {
7474
resPolicies := &ResourcePolicies{}
7575
err := decodeStruct(strings.NewReader(*yamlData), resPolicies)
7676
if err != nil {
77-
return nil, fmt.Errorf("failed to decode yaml data into resource policies %v", err)
77+
return nil, fmt.Errorf("failed to decode yaml data into resource policies %w", err)
7878
}
7979

8080
for _, vp := range resPolicies.VolumePolicies {

internal/resourcepolicies/volume_resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func parseCapacity(cap string) (*capacity, error) {
230230
} else {
231231
quantity, err := resource.ParseQuantity(strings.TrimSpace(v))
232232
if err != nil {
233-
return nil, fmt.Errorf("wrong format of Capacity %v with err %v", v, err)
233+
return nil, fmt.Errorf("wrong format of Capacity %v with err %w", v, err)
234234
}
235235
quantities = append(quantities, quantity)
236236
}

pkg/backup/backup.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,8 @@ func (kb *kubernetesBackupper) waitUntilPVBsProcessed(ctx context.Context, log l
855855

856856
func (kb *kubernetesBackupper) backupItem(log logrus.FieldLogger, gr schema.GroupResource, itemBackupper *itemBackupper, unstructured *unstructured.Unstructured, preferredGVR schema.GroupVersionResource, itemBlock *BackupItemBlock) bool {
857857
backedUpItem, _, err := itemBackupper.backupItem(log, unstructured, gr, preferredGVR, false, false, itemBlock)
858-
if aggregate, ok := err.(kubeerrs.Aggregate); ok {
858+
var aggregate kubeerrs.Aggregate
859+
if errors.As(err, &aggregate) {
859860
log.WithField("name", unstructured.GetName()).Infof("%d errors encountered backup up item", len(aggregate.Errors()))
860861
// log each error separately so we get error location info in the log, and an
861862
// accurate count of errors
@@ -880,7 +881,8 @@ func (kb *kubernetesBackupper) finalizeItem(
880881
preferredGVR schema.GroupVersionResource,
881882
) (bool, []FileForArchive) {
882883
backedUpItem, updateFiles, err := itemBackupper.backupItem(log, unstructured, gr, preferredGVR, true, true, nil)
883-
if aggregate, ok := err.(kubeerrs.Aggregate); ok {
884+
var aggregate kubeerrs.Aggregate
885+
if errors.As(err, &aggregate) {
884886
log.WithField("name", unstructured.GetName()).Infof("%d errors encountered backup up item", len(aggregate.Errors()))
885887
// log each error separately so we get error location info in the log, and an
886888
// accurate count of errors

pkg/backup/backup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4402,7 +4402,7 @@ func assertTarballFileContents(t *testing.T, backupFile io.Reader, want map[stri
44024402

44034403
for {
44044404
hdr, err := r.Next()
4405-
if err == io.EOF {
4405+
if errors.Is(err, io.EOF) {
44064406
break
44074407
}
44084408
require.NoError(t, err)

pkg/cmd/cli/backup/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (l *LogsOptions) Run(c *cobra.Command, f client.Factory) error {
6666
if apierrors.IsNotFound(err) {
6767
return fmt.Errorf("backup %q does not exist", l.BackupName)
6868
} else if err != nil {
69-
return fmt.Errorf("error checking for backup %q: %v", l.BackupName, err)
69+
return fmt.Errorf("error checking for backup %q: %w", l.BackupName, err)
7070
}
7171

7272
switch backup.Status.Phase {

0 commit comments

Comments
 (0)