fix golangci lint

Signed-off-by: Peter Wilcsinszky <[email protected]>
kube-logging · Sep 26, 2024 · 805b17a · 805b17a
1 parent 27bfb85
commit 805b17a
Show file tree

Hide file tree

Showing 35 changed files with 40 additions and 43 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,18 +1,14 @@
-run:
-    skip-dirs:
-        - .gen
-        - client
-
 linters-settings:
     revive:
         min-confidence: 0.9
     gocyclo:
         min-complexity: 15
 
-linters:
-
 issues:
-    exclude:
+  exclude-dirs:
+    - .gen
+    - client
+  exclude:
         - if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary)
         - "`if` block ends with a `return` statement, so drop this `else` and outdent its block"
         - "missing the call to method parallel"
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ ENVTEST_K8S_VERSION := 1.31.0
 ENVTEST_BINARY_ASSETS := ${ENVTEST_BIN_DIR}/bin
 
 GOLANGCI_LINT := ${BIN}/golangci-lint
-GOLANGCI_LINT_VERSION := v1.61.0
+GOLANGCI_LINT_VERSION := v1.60.1
 LINTER_FLAGS := --timeout 5m
 
 HELM_DOCS := ${BIN}/helm-docs

diff --git a/charts/logging-operator/crds/logging-extensions.banzaicloud.io_eventtailers.yaml b/charts/logging-operator/crds/logging-extensions.banzaicloud.io_eventtailers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: eventtailers.logging-extensions.banzaicloud.io
 spec:
   group: logging-extensions.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml b/charts/logging-operator/crds/logging-extensions.banzaicloud.io_hosttailers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: hosttailers.logging-extensions.banzaicloud.io
 spec:
   group: logging-extensions.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_clusterflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: clusterflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: clusteroutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_flows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: flows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: fluentbitagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: fluentdconfigs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggingroutes.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggingroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: loggingroutes.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: loggings.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: nodeagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: outputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusterflows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusterflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngclusterflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngclusteroutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngconfigs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngflows.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngoutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging-extensions.banzaicloud.io_eventtailers.yaml b/config/crd/bases/logging-extensions.banzaicloud.io_eventtailers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: eventtailers.logging-extensions.banzaicloud.io
 spec:
   group: logging-extensions.banzaicloud.io

diff --git a/config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml b/config/crd/bases/logging-extensions.banzaicloud.io_hosttailers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: hosttailers.logging-extensions.banzaicloud.io
 spec:
   group: logging-extensions.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml b/config/crd/bases/logging.banzaicloud.io_clusterflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: clusterflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: clusteroutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_flows.yaml b/config/crd/bases/logging.banzaicloud.io_flows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: flows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml b/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: fluentbitagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml b/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: fluentdconfigs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_loggingroutes.yaml b/config/crd/bases/logging.banzaicloud.io_loggingroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: loggingroutes.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_loggings.yaml b/config/crd/bases/logging.banzaicloud.io_loggings.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: loggings.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_nodeagents.yaml b/config/crd/bases/logging.banzaicloud.io_nodeagents.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: nodeagents.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_outputs.yaml b/config/crd/bases/logging.banzaicloud.io_outputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: outputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngclusterflows.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngclusterflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngclusterflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngclusteroutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngconfigs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngconfigs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngflows.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngflows.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngflows.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.1
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: syslogngoutputs.logging.banzaicloud.io
 spec:
   group: logging.banzaicloud.io

diff --git a/pkg/sdk/logging/model/output/logdna_test.go b/pkg/sdk/logging/model/output/logdna_test.go
@@ -17,9 +17,10 @@ package output_test
 import (
 	"testing"
 
+	"sigs.k8s.io/yaml"
+
 	"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/output"
 	"github.com/kube-logging/logging-operator/pkg/sdk/logging/model/render"
-	"sigs.k8s.io/yaml"
 )
 
 func TestLogDNAOutput(t *testing.T) {
@@ -60,7 +61,7 @@ buffer:
 	logdna := &output.LogDNAOutput{}
 	err := yaml.Unmarshal(CONFIG, logdna)
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err.Error())
 	}
 	test := render.NewOutputPluginTest(t, logdna)
 	test.DiffResult(expected)