Skip to content

Commit 1d86762

Browse files
committed
lint
Signed-off-by: Pavel Okhlopkov <pavel.okhlopkov@flant.com>
1 parent 367c73c commit 1d86762

File tree

8 files changed

+31
-17
lines changed

8 files changed

+31
-17
lines changed

.golangci.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@ linters:
1111
- depguard
1212
- dogsled
1313
- durationcheck
14+
- errcheck
1415
- gochecknoinits
1516
- gocritic
1617
- goprintffuncname
1718
- govet
1819
- ineffassign
1920
- misspell
21+
- musttag
2022
- nolintlint
2123
- nonamedreturns
2224
- prealloc
2325
- revive
2426
- sloglint
2527
- staticcheck
2628
- unconvert
29+
- unparam
2730
- unused
2831
- whitespace
32+
- usestdlibvars
2933
settings:
3034
depguard:
3135
rules:

pkg/debug/debug-cmd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ func DefineDebugCommands(kpApp *kingpin.Application) {
5555
return err
5656
}
5757

58-
output.Write(out)
58+
_, _ = output.Write(out)
5959
if !watch {
6060
break
6161
}
6262

6363
time.Sleep(refreshInterval)
6464
output.ClearScreen()
6565
output.MoveCursor(1, 1)
66-
output.WriteString(time.Now().Format(time.RFC3339))
66+
_, _ = output.WriteString(time.Now().Format(time.RFC3339))
6767
output.MoveCursor(3, 1)
6868
}
6969

pkg/hook/config/config_v1.go

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,7 @@ func (cv1 *HookConfigV1) ConvertAndCheck(c *HookConfig) error {
212212
return fmt.Errorf("invalid kubernetesValidating config [%d]: %w", i, err)
213213
}
214214

215-
validating, err := convertValidating(rawValidating)
216-
if err != nil {
217-
return err
218-
}
215+
validating := convertValidating(rawValidating)
219216

220217
c.KubernetesValidating = append(c.KubernetesValidating, validating)
221218
}
@@ -237,10 +234,7 @@ func (cv1 *HookConfigV1) ConvertAndCheck(c *HookConfig) error {
237234
return fmt.Errorf("invalid kubernetesMutating config [%d]: %w", i, err)
238235
}
239236

240-
mutating, err := convertMutating(rawMutating)
241-
if err != nil {
242-
return err
243-
}
237+
mutating := convertMutating(rawMutating)
244238

245239
c.KubernetesMutating = append(c.KubernetesMutating, mutating)
246240
}
@@ -421,7 +415,7 @@ func (cv1 *HookConfigV1) CheckAdmission(kubeConfigs []htypes.OnKubernetesEventCo
421415
return allErr
422416
}
423417

424-
func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConfig, error) {
418+
func convertValidating(cfgV1 KubernetesAdmissionConfigV1) htypes.ValidatingConfig {
425419
cfg := htypes.ValidatingConfig{}
426420

427421
cfg.Group = cfgV1.Group
@@ -435,23 +429,28 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf
435429
Name: cfgV1.Name,
436430
Rules: cfgV1.Rules,
437431
}
432+
438433
if cfgV1.Namespace != nil {
439434
webhook.NamespaceSelector = cfgV1.Namespace.LabelSelector
440435
}
436+
441437
if cfgV1.LabelSelector != nil {
442438
webhook.ObjectSelector = cfgV1.LabelSelector
443439
}
440+
444441
if cfgV1.FailurePolicy != nil {
445442
webhook.FailurePolicy = cfgV1.FailurePolicy
446443
} else {
447444
defaultFailurePolicy := v1.FailurePolicyType(app.ValidatingWebhookSettings.DefaultFailurePolicy)
448445
webhook.FailurePolicy = &defaultFailurePolicy
449446
}
447+
450448
if cfgV1.SideEffects != nil {
451449
webhook.SideEffects = cfgV1.SideEffects
452450
} else {
453451
webhook.SideEffects = &DefaultSideEffects
454452
}
453+
455454
if cfgV1.TimeoutSeconds != nil {
456455
webhook.TimeoutSeconds = cfgV1.TimeoutSeconds
457456
} else {
@@ -463,13 +462,14 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (htypes.ValidatingConf
463462
cfg.Webhook = &admission.ValidatingWebhookConfig{
464463
ValidatingWebhook: webhook,
465464
}
465+
466466
cfg.Webhook.Metadata.LogLabels = map[string]string{}
467467
cfg.Webhook.Metadata.MetricLabels = map[string]string{}
468468

469-
return cfg, nil
469+
return cfg
470470
}
471471

472-
func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig, error) {
472+
func convertMutating(cfgV1 KubernetesAdmissionConfigV1) htypes.MutatingConfig {
473473
cfg := htypes.MutatingConfig{}
474474

475475
cfg.Group = cfgV1.Group
@@ -484,22 +484,27 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
484484
Name: cfgV1.Name,
485485
Rules: cfgV1.Rules,
486486
}
487+
487488
if cfgV1.Namespace != nil {
488489
webhook.NamespaceSelector = cfgV1.Namespace.LabelSelector
489490
}
491+
490492
if cfgV1.LabelSelector != nil {
491493
webhook.ObjectSelector = cfgV1.LabelSelector
492494
}
495+
493496
if cfgV1.FailurePolicy != nil {
494497
webhook.FailurePolicy = cfgV1.FailurePolicy
495498
} else {
496499
webhook.FailurePolicy = &DefaultFailurePolicy
497500
}
501+
498502
if cfgV1.SideEffects != nil {
499503
webhook.SideEffects = cfgV1.SideEffects
500504
} else {
501505
webhook.SideEffects = &DefaultSideEffects
502506
}
507+
503508
if cfgV1.TimeoutSeconds != nil {
504509
webhook.TimeoutSeconds = cfgV1.TimeoutSeconds
505510
} else {
@@ -511,10 +516,11 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
511516
cfg.Webhook = &admission.MutatingWebhookConfig{
512517
MutatingWebhook: webhook,
513518
}
519+
514520
cfg.Webhook.Metadata.LogLabels = map[string]string{}
515521
cfg.Webhook.Metadata.MetricLabels = map[string]string{}
516522

517-
return cfg, nil
523+
return cfg
518524
}
519525

520526
func (cv1 *HookConfigV1) CheckConversion(kubeConfigs []htypes.OnKubernetesEventConfig, cfgV1 KubernetesConversionConfigV1) error {

pkg/kube_events_manager/namespace_informer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (ni *namespaceInformer) createSharedInformer(addFn func(string), delFn func
7070
ni.SharedInformer = corev1.NewFilteredNamespaceInformer(ni.KubeClient, resyncPeriod, indexers, tweakListOptions)
7171
ni.addFn = addFn
7272
ni.delFn = delFn
73-
ni.SharedInformer.AddEventHandler(ni) // SharedNamespaceInformerEventHandler(ni, addFn, delFn))
73+
_, _ = ni.SharedInformer.AddEventHandler(ni) // SharedNamespaceInformerEventHandler(ni, addFn, delFn))
7474

7575
listOptions := metav1.ListOptions{}
7676
tweakListOptions(&listOptions)

pkg/kube_events_manager/types/types_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1010
)
1111

12+
//nolint:unparam
1213
func newObj(kind, ns, name, filterResult string) *ObjectAndFilterResult {
1314
return &ObjectAndFilterResult{
1415
FilterResult: filterResult,

pkg/shell-operator/combine_binding_context.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type CombineResult struct {
2323
// If input task has no metadata, result will be nil.
2424
// Metadata should implement HookNameAccessor, BindingContextAccessor and MonitorIDAccessor interfaces.
2525
// DEV WARNING! Do not use HookMetadataAccessor here. Use only *Accessor interfaces because this method is used from addon-operator.
26+
// nolint: unparam
2627
func (op *ShellOperator) combineBindingContextForHook(tqs *queue.TaskQueueSet, q *queue.TaskQueue, t task.Task, stopCombineFn func(tsk task.Task) bool) *CombineResult {
2728
if q == nil {
2829
return nil

pkg/utils/file/file_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ func prepareTestDirTree() (string, error) {
4949

5050
func createExecutableFile(file string) error {
5151
if _, err := os.Create(file); err != nil {
52-
return err
52+
return fmt.Errorf("create: %w", err)
5353
}
54-
os.Chmod(file, 0o777)
54+
55+
_ = os.Chmod(file, 0o777)
5556

5657
return nil
5758
}

test/hook/context/generator_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
func parseContexts(contexts string) []bctx.BindingContext {
1515
var parsedBindingContexts []bctx.BindingContext
16+
//nolint: musttag
1617
_ = json.Unmarshal([]byte(contexts), &parsedBindingContexts)
1718
return parsedBindingContexts
1819
}

0 commit comments

Comments
 (0)