Fix linter warnings

Signed-off-by: Marco Franssen <[email protected]>

Author: marcofranssen

apis/fluentbit/v1alpha2/clusterfluentbitconfig_types.go

@@ -550,11 +550,11 @@ func (cfg ClusterFluentBitConfig) RenderNamespacedLuaScript(
 		for _, f := range nsfilters.Items {
 			for _, p := range f.Spec.FilterItems {
 				if p.Lua != nil && p.Lua.Script.Key != "" {
-					script, err := cl.LoadConfigMap(p.Lua.Script, f.ObjectMeta.Namespace)
+					script, err := cl.LoadConfigMap(p.Lua.Script, f.Namespace)
 					if err != nil {
 						return nil, err
 					}
-					namespacedScriptName := fmt.Sprintf("%x-%s", md5.Sum([]byte(f.ObjectMeta.Namespace)), p.Lua.Script.Key)
+					namespacedScriptName := fmt.Sprintf("%x-%s", md5.Sum([]byte(f.Namespace)), p.Lua.Script.Key)
 					scripts = append(scripts, Script{Name: namespacedScriptName, Content: script})
 				}
 			}

apis/fluentbit/v1alpha2/collector_types.go

@@ -114,25 +114,25 @@ type Collector struct {
 
 // IsBeingDeleted returns true if a deletion timestamp is set
 func (co *Collector) IsBeingDeleted() bool {
-	return !co.ObjectMeta.DeletionTimestamp.IsZero()
+	return !co.DeletionTimestamp.IsZero()
 }
 
 // CollectorFinalizerName is the name of the fluentbit finalizer
 const CollectorFinalizerName = "collector.fluent.io"
 
 // HasFinalizer returns true if the item has the specified finalizer
 func (co *Collector) HasFinalizer(finalizerName string) bool {
-	return slices.Contains(co.ObjectMeta.Finalizers, finalizerName)
+	return slices.Contains(co.Finalizers, finalizerName)
 }
 
 // AddFinalizer adds the specified finalizer
 func (co *Collector) AddFinalizer(finalizerName string) {
-	co.ObjectMeta.Finalizers = append(co.ObjectMeta.Finalizers, finalizerName)
+	co.Finalizers = append(co.Finalizers, finalizerName)
 }
 
 // RemoveFinalizer removes the specified finalizer
 func (co *Collector) RemoveFinalizer(finalizerName string) {
-	co.ObjectMeta.Finalizers = slices.DeleteFunc(co.ObjectMeta.Finalizers, func(s string) bool { return s == finalizerName })
+	co.Finalizers = slices.DeleteFunc(co.Finalizers, func(s string) bool { return s == finalizerName })
 }
 
 // +kubebuilder:object:root=true

apis/fluentbit/v1alpha2/fluentbit_types.go

@@ -142,25 +142,25 @@ type FluentBit struct {
 
 // IsBeingDeleted returns true if a deletion timestamp is set
 func (fb *FluentBit) IsBeingDeleted() bool {
-	return !fb.ObjectMeta.DeletionTimestamp.IsZero()
+	return !fb.DeletionTimestamp.IsZero()
 }
 
 // FluentBitFinalizerName is the name of the fluentbit finalizer
 const FluentBitFinalizerName = "fluentbit.fluent.io"
 
 // HasFinalizer returns true if the item has the specified finalizer
 func (fb *FluentBit) HasFinalizer(finalizerName string) bool {
-	return slices.Contains(fb.ObjectMeta.Finalizers, finalizerName)
+	return slices.Contains(fb.Finalizers, finalizerName)
 }
 
 // AddFinalizer adds the specified finalizer
 func (fb *FluentBit) AddFinalizer(finalizerName string) {
-	fb.ObjectMeta.Finalizers = append(fb.ObjectMeta.Finalizers, finalizerName)
+	fb.Finalizers = append(fb.Finalizers, finalizerName)
 }
 
 // RemoveFinalizer removes the specified finalizer
 func (fb *FluentBit) RemoveFinalizer(finalizerName string) {
-	fb.ObjectMeta.Finalizers = slices.DeleteFunc(fb.ObjectMeta.Finalizers, func(s string) bool { return s == finalizerName })
+	fb.Finalizers = slices.DeleteFunc(fb.Finalizers, func(s string) bool { return s == finalizerName })
 }
 
 // +kubebuilder:object:root=true

apis/fluentbit/v1alpha2/plugins/common_types.go

@@ -12,7 +12,8 @@ type CommonParams struct {
 
 	// Alias for the plugin
 	Alias string `json:"alias,omitempty"`
-	// RetryLimit describes how many times fluent-bit should retry to send data to a specific output. If set to false fluent-bit will try indefinetly. If set to any integer N>0 it will try at most N+1 times. Leading zeros are not allowed (values such as 007, 0150, 01 do not work). If this property is not defined fluent-bit will use the default value: 1.
+	// RetryLimit describes how many times fluent-bit should retry to send data to a specific output. If set to false fluent-bit will try indefinitely. If set to any integer N>0 it will try at most N+1 times. Leading zeros are not allowed (values such as 007, 0150, 01 do not work). If this property is not defined fluent-bit will use the default value: 1.
+	// nolint:misspell
 	// +kubebuilder:validation:Pattern="^(((f|F)alse)|(no_limits)|(no_retries)|([1-9]+[0-9]*))$"
 	RetryLimit string `json:"retryLimit,omitempty"`
 }

apis/fluentbit/v1alpha2/plugins/configmap_types.go

@@ -3,10 +3,11 @@ package plugins
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	"github.com/go-openapi/errors"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 type ConfigMapLoader struct {
@@ -30,6 +31,6 @@ func (cl ConfigMapLoader) LoadConfigMap(selector v1.ConfigMapKeySelector, namesp
 	if v, ok := configMap.Data[selector.Key]; !ok {
 		return "", errors.NotFound(fmt.Sprintf("The key %s is not found.", selector.Key))
 	} else {
-		return strings.TrimSuffix(fmt.Sprintf("%s", v), "\n"), nil
+		return strings.TrimSuffix(v, "\n"), nil
 	}
 }

apis/fluentbit/v1alpha2/plugins/filter/lua_types.go

@@ -55,7 +55,7 @@ func (l *Lua) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 	}
 
 	if l.Code != "" {
-		var singleLineLua string = ""
+		var singleLineLua = ""
 		lineTrim := ""
 		for _, line := range strings.Split(strings.TrimSuffix(l.Code, "\n"), "\n") {
 			lineTrim = strings.TrimSpace(line)
@@ -77,11 +77,11 @@ func (l *Lua) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 
 	kvs.Insert("call", l.Call)
 
-	if l.TypeIntKey != nil && len(l.TypeIntKey) > 0 {
+	if len(l.TypeIntKey) > 0 {
 		kvs.Insert("type_int_key", strings.Join(l.TypeIntKey, " "))
 	}
 
-	if l.TypeArrayKey != nil && len(l.TypeArrayKey) > 0 {
+	if len(l.TypeArrayKey) > 0 {
 		kvs.Insert("type_array_key", strings.Join(l.TypeArrayKey, " "))
 	}
 

apis/fluentbit/v1alpha2/plugins/filter/multiline_types.go

@@ -19,10 +19,10 @@ type Multiline struct {
 
 type Multi struct {
 	// Specify one or multiple Multiline Parsing definitions to apply to the content.
-	//You can specify multiple multiline parsers to detect different formats by separating them with a comma.
+	// You can specify multiple multiline parsers to detect different formats by separating them with a comma.
 	Parser string `json:"parser"`
-	//Key name that holds the content to process.
-	//Note that a Multiline Parser definition can already specify the key_content to use, but this option allows to overwrite that value for the purpose of the filter.
+	// Key name that holds the content to process.
+	// Note that a Multiline Parser definition can already specify the key_content to use, but this option allows to overwrite that value for the purpose of the filter.
 	KeyContent string `json:"keyContent,omitempty"`
 	// +kubebuilder:validation:Enum:=parser;partial_message
 	Mode string `json:"mode,omitempty"`
@@ -52,29 +52,29 @@ func (m *Multiline) Params(_ plugins.SecretLoader) (*params.KVs, error) {
 		return kvs, err
 	}
 	if m.Multi != nil {
-		if m.Multi.Parser != "" {
-			kvs.Insert("multiline.parser", m.Multi.Parser)
+		if m.Parser != "" {
+			kvs.Insert("multiline.parser", m.Parser)
 		}
-		if m.Multi.KeyContent != "" {
-			kvs.Insert("multiline.key_content", m.Multi.KeyContent)
+		if m.KeyContent != "" {
+			kvs.Insert("multiline.key_content", m.KeyContent)
 		}
-		if m.Multi.Mode != "" {
-			kvs.Insert("mode", m.Multi.Mode)
+		if m.Mode != "" {
+			kvs.Insert("mode", m.Mode)
 		}
-		if m.Multi.Buffer != false {
-			kvs.Insert("buffer", fmt.Sprint(m.Multi.Buffer))
+		if m.Buffer {
+			kvs.Insert("buffer", fmt.Sprint(m.Buffer))
 		}
-		if m.Multi.FlushMS != 0 {
-			kvs.Insert("flush_ms", fmt.Sprint(m.Multi.FlushMS))
+		if m.FlushMS != 0 {
+			kvs.Insert("flush_ms", fmt.Sprint(m.FlushMS))
 		}
-		if m.Multi.EmitterName != "" {
-			kvs.Insert("emitter_name", m.Multi.EmitterName)
+		if m.EmitterName != "" {
+			kvs.Insert("emitter_name", m.EmitterName)
 		}
-		if m.Multi.EmitterType != "" {
-			kvs.Insert("emitter_storage.type", m.Multi.EmitterType)
+		if m.EmitterType != "" {
+			kvs.Insert("emitter_storage.type", m.EmitterType)
 		}
-		if m.Multi.EmitterMemBufLimit != 0 {
-			kvs.Insert("emitter_mem_buf_limit", fmt.Sprintf("%dMB", m.Multi.EmitterMemBufLimit))
+		if m.EmitterMemBufLimit != 0 {
+			kvs.Insert("emitter_mem_buf_limit", fmt.Sprintf("%dMB", m.EmitterMemBufLimit))
 		}
 	}
 	return kvs, nil

apis/fluentbit/v1alpha2/plugins/input/dummy_types.go

@@ -13,7 +13,7 @@ import (
 // It is useful for testing, debugging, benchmarking and getting started with Fluent Bit. <br />
 // **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/inputs/dummy**
 type Dummy struct {
-	// Tag name associated to all records comming from this plugin.
+	// Tag name associated to all records coming from this plugin.
 	Tag string `json:"tag,omitempty"`
 	// Dummy JSON record.
 	Dummy string `json:"dummy,omitempty"`

apis/fluentbit/v1alpha2/plugins/input/forward.go

@@ -9,7 +9,7 @@ import (
 
 // +kubebuilder:object:generate:=true
 
-// Forward defines the in_forward Input plugin that listens to TCP socket to recieve the event stream.
+// Forward defines the in_forward Input plugin that listens to TCP socket to receive the event stream.
 // **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/inputs/forward**
 type Forward struct {
 	// Port for forward plugin instance.
@@ -22,11 +22,11 @@ type Forward struct {
 	Tag string `json:"tag,omitempty"`
 	// Adds the prefix to incoming event's tag
 	TagPrefix string `json:"tagPrefix,omitempty"`
-	// Specify the path to unix socket to recieve a forward message. If set, Listen and port are ignnored.
+	// Specify the path to unix socket to receive a forward message. If set, Listen and port are ignnored.
 	UnixPath string `json:"unixPath,omitempty"`
 	// Set the permission of unix socket file.
 	UnixPerm string `json:"unixPerm,omitempty"`
-	// Specify maximum buffer memory size used to recieve a forward message.
+	// Specify maximum buffer memory size used to receive a forward message.
 	// The value must be according to the Unit Size specification.
 	// +kubebuilder:validation:Pattern:="^\\d+(k|K|KB|kb|m|M|MB|mb|g|G|GB|gb)?$"
 	BufferMaxSize string `json:"bufferMaxSize,omitempty"`

apis/fluentbit/v1alpha2/plugins/input/http.go

@@ -34,7 +34,7 @@ type HTTP struct {
 	*plugins.TLS     `json:"tls,omitempty"`
 }
 
-func (_ *HTTP) Name() string {
+func (*HTTP) Name() string {
 	return "http"
 }