Fix linter warnings

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>

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/custom/custom_plugin_types.go

@@ -58,20 +58,18 @@ func (c *CustomPlugin) MakeNamespaced(ns string) {
 }
 
 func indentation(str string) string {
-	splits := strings.Split(str, "\n")
 	var buf bytes.Buffer
-	for _, i := range splits {
-		if i != "" {
-			buf.WriteString(fmt.Sprintf("    %s\n", strings.TrimSpace(i)))
+	for s := range strings.SplitSeq(str, "\n") {
+		if s != "" {
+			buf.WriteString(fmt.Sprintf("    %s\n", strings.TrimSpace(s)))
 		}
 	}
 	return buf.String()
 }
 
 func MakeCustomConfigNamespaced(customConfig string, namespace string) string {
 	var buf bytes.Buffer
-	sections := strings.Split(customConfig, "\n")
-	for _, section := range sections {
+	for section := range strings.SplitSeq(customConfig, "\n") {
 		section = strings.TrimSpace(section)
 		idx := strings.LastIndex(section, " ")
 		if strings.HasPrefix(section, "Match_Regex") {

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

@@ -18,23 +18,23 @@ type AWS struct {
 	ImdsVersion string `json:"imdsVersion,omitempty"`
 	// The availability zone; for example, "us-east-1a". Default is true.
 	AZ *bool `json:"az,omitempty"`
-	//The EC2 instance ID.Default is true.
+	// The EC2 instance ID.Default is true.
 	EC2InstanceID *bool `json:"ec2InstanceID,omitempty"`
-	//The EC2 instance type.Default is false.
+	// The EC2 instance type.Default is false.
 	EC2InstanceType *bool `json:"ec2InstanceType,omitempty"`
-	//The EC2 instance private ip.Default is false.
+	// The EC2 instance private ip.Default is false.
 	PrivateIP *bool `json:"privateIP,omitempty"`
-	//The EC2 instance image id.Default is false.
+	// The EC2 instance image id.Default is false.
 	AmiID *bool `json:"amiID,omitempty"`
-	//The account ID for current EC2 instance.Default is false.
+	// The account ID for current EC2 instance.Default is false.
 	AccountID *bool `json:"accountID,omitempty"`
-	//The hostname for current EC2 instance.Default is false.
+	// The hostname for current EC2 instance.Default is false.
 	HostName *bool `json:"hostName,omitempty"`
-	//The VPC ID for current EC2 instance.Default is false.
+	// The VPC ID for current EC2 instance.Default is false.
 	VpcID *bool `json:"vpcID,omitempty"`
 }
 
-func (_ *AWS) Name() string {
+func (*AWS) Name() string {
 	return "aws"
 }
 

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

@@ -19,7 +19,7 @@ type Grep struct {
 	Exclude string `json:"exclude,omitempty"`
 }
 
-func (_ *Grep) Name() string {
+func (*Grep) Name() string {
 	return "grep"
 }
 

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

@@ -109,7 +109,7 @@ type Kubernetes struct {
 	UseTagForMeta *bool `json:"useTagForMeta,omitempty"`
 }
 
-func (_ *Kubernetes) Name() string {
+func (*Kubernetes) Name() string {
 	return "kubernetes"
 }
 

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

@@ -51,7 +51,7 @@ type LogToMetrics struct {
 	DiscardLogs *bool `json:"discardLogs,omitempty"`
 }
 
-func (_ *LogToMetrics) Name() string {
+func (*LogToMetrics) Name() string {
 	return "log_to_metrics"
 }