[chore](internal): fix gofumpt issues part 2

internal/components/extensions/jaeger_query_extension.go

@@ -20,9 +20,7 @@ const (
 	port = 16686
 )
 
-var (
-	_ components.Parser = &components.GenericParser[*JaegerQueryExtensionConfig]{}
-)
+var _ components.Parser = &components.GenericParser[*JaegerQueryExtensionConfig]{}
 
 type JaegerQueryExtensionConfig struct {
 	HTTP jaegerHTTPAddress `mapstructure:"http,omitempty" yaml:"http,omitempty"`

internal/components/generic_parser.go

@@ -12,9 +12,7 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 )
 
-var (
-	_ Parser = &GenericParser[SingleEndpointConfig]{}
-)
+var _ Parser = &GenericParser[SingleEndpointConfig]{}
 
 // GenericParser serves as scaffolding for custom parsing logic by isolating
 // functionality to idempotent functions.

internal/components/single_endpoint.go

@@ -16,9 +16,7 @@ import (
 
 const DefaultRecAddress = "0.0.0.0"
 
-var (
-	_ Parser = &GenericParser[*SingleEndpointConfig]{}
-)
+var _ Parser = &GenericParser[*SingleEndpointConfig]{}
 
 // SingleEndpointConfig represents the minimal struct for a given YAML configuration input containing either
 // endpoint or listen_address.

internal/controllers/builder_test.go

@@ -44,27 +44,23 @@ var (
 	pathTypePrefix = networkingv1.PathTypePrefix
 )
 
-var (
-	opampbridgeSelectorLabels = map[string]string{
-		"app.kubernetes.io/managed-by": "opentelemetry-operator",
-		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/component":  "opentelemetry-opamp-bridge",
-		"app.kubernetes.io/instance":   "test.test",
-	}
-)
+var opampbridgeSelectorLabels = map[string]string{
+	"app.kubernetes.io/managed-by": "opentelemetry-operator",
+	"app.kubernetes.io/part-of":    "opentelemetry",
+	"app.kubernetes.io/component":  "opentelemetry-opamp-bridge",
+	"app.kubernetes.io/instance":   "test.test",
+}
 
-var (
-	taSelectorLabels = map[string]string{
-		"app.kubernetes.io/managed-by": "opentelemetry-operator",
-		"app.kubernetes.io/part-of":    "opentelemetry",
-		"app.kubernetes.io/component":  "opentelemetry-targetallocator",
-		"app.kubernetes.io/instance":   "test.test",
-		"app.kubernetes.io/name":       "test-targetallocator",
-	}
-)
+var taSelectorLabels = map[string]string{
+	"app.kubernetes.io/managed-by": "opentelemetry-operator",
+	"app.kubernetes.io/part-of":    "opentelemetry",
+	"app.kubernetes.io/component":  "opentelemetry-targetallocator",
+	"app.kubernetes.io/instance":   "test.test",
+	"app.kubernetes.io/name":       "test-targetallocator",
+}
 
 func TestBuildCollector(t *testing.T) {
-	var goodConfigYaml = `receivers:
+	goodConfigYaml := `receivers:
   examplereceiver:
     endpoint: "0.0.0.0:12345"
 exporters:
@@ -1054,7 +1050,6 @@ func TestBuildAll_OpAMPBridge(t *testing.T) {
 		wantErr bool
 	}{
 		{
-
 			name: "base case",
 			args: args{
 				instance: v1alpha1.OpAMPBridge{
@@ -1219,7 +1214,8 @@ componentsAllowed:
   receivers:
   - otlp
 endpoint: ws://opamp-server:4320/v1/opamp
-`},
+`,
+					},
 				},
 				&corev1.ServiceAccount{
 					ObjectMeta: metav1.ObjectMeta{
@@ -1291,7 +1287,7 @@ endpoint: ws://opamp-server:4320/v1/opamp
 }
 
 func TestBuildCollectorTargetAllocatorCR(t *testing.T) {
-	var goodConfigYaml = `
+	goodConfigYaml := `
 receivers:
   prometheus:
     config:

internal/controllers/clusterobservability_controller.go

@@ -242,7 +242,6 @@ func (r *ClusterObservabilityReconciler) reconcileOpenTelemetryResource(ctx cont
 
 				return r.Update(ctx, latest)
 			})
-
 			if err != nil {
 				return fmt.Errorf("failed to update OpenTelemetryCollector %s: %w", key, err)
 			}
@@ -272,7 +271,6 @@ func (r *ClusterObservabilityReconciler) reconcileOpenTelemetryResource(ctx cont
 
 				return r.Update(ctx, latest)
 			})
-
 			if err != nil {
 				return fmt.Errorf("failed to update Instrumentation %s: %w", key, err)
 			}

internal/controllers/opampbridge_controller_test.go

@@ -32,18 +32,20 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
 )
 
-var opampBridgeLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")
-var opampBridgeMockAutoDetector = &mockAutoDetect{
-	OpenShiftRoutesAvailabilityFunc: func() (openshift.RoutesAvailability, error) {
-		return openshift.RoutesAvailable, nil
-	},
-	PrometheusCRsAvailabilityFunc: func() (prometheus.Availability, error) {
-		return prometheus.Available, nil
-	},
-	RBACPermissionsFunc: func(context.Context) (rbac.Availability, error) {
-		return rbac.Available, nil
-	},
-}
+var (
+	opampBridgeLogger           = logf.Log.WithName("opamp-bridge-controller-unit-tests")
+	opampBridgeMockAutoDetector = &mockAutoDetect{
+		OpenShiftRoutesAvailabilityFunc: func() (openshift.RoutesAvailability, error) {
+			return openshift.RoutesAvailable, nil
+		},
+		PrometheusCRsAvailabilityFunc: func() (prometheus.Availability, error) {
+			return prometheus.Available, nil
+		},
+		RBACPermissionsFunc: func(context.Context) (rbac.Availability, error) {
+			return rbac.Available, nil
+		},
+	}
+)
 
 func TestNewObjectsOnReconciliation_OpAMPBridge(t *testing.T) {
 	// prepare

internal/controllers/opentelemetrycollector_controller.go

@@ -48,12 +48,10 @@ import (
 
 const resourceOwnerKey = ".metadata.owner"
 
-var (
-	ownedClusterObjectTypes = []client.Object{
-		&rbacv1.ClusterRole{},
-		&rbacv1.ClusterRoleBinding{},
-	}
-)
+var ownedClusterObjectTypes = []client.Object{
+	&rbacv1.ClusterRole{},
+	&rbacv1.ClusterRoleBinding{},
+}
 
 // OpenTelemetryCollectorReconciler reconciles a OpenTelemetryCollector object.
 type OpenTelemetryCollectorReconciler struct {

internal/controllers/reconcile_test.go

@@ -62,16 +62,14 @@ const (
 	annotationVal  = "true"
 )
 
-var (
-	extraPorts = v1beta1.PortsSpec{
-		ServicePort: v1.ServicePort{
-			Name:       "port-web",
-			Protocol:   "TCP",
-			Port:       8080,
-			TargetPort: intstr.FromInt32(8080),
-		},
-	}
-)
+var extraPorts = v1beta1.PortsSpec{
+	ServicePort: v1.ServicePort{
+		Name:       "port-web",
+		Protocol:   "TCP",
+		Port:       8080,
+		TargetPort: intstr.FromInt32(8080),
+	},
+}
 
 type check[T any] func(t *testing.T, params T)
 
@@ -1481,7 +1479,7 @@ func TestUpgrade(t *testing.T) {
 	}
 }
 
-func namespacedObjectName(name string, namespace string) types.NamespacedName {
+func namespacedObjectName(name, namespace string) types.NamespacedName {
 	return types.NamespacedName{
 		Namespace: namespace,
 		Name:      name,

internal/controllers/suite_test.go

@@ -318,7 +318,8 @@ func testCollectorWithModeAndReplicas(t *testing.T, name string, mode v1beta1.Mo
 							IntVal: 80,
 						},
 						NodePort: 0,
-					}}},
+					},
+				}},
 				Replicas: &replicas,
 			},
 			Config: otelConfig,
@@ -327,7 +328,7 @@ func testCollectorWithModeAndReplicas(t *testing.T, name string, mode v1beta1.Mo
 	}
 }
 
-func testCollectorAssertNoErr(t *testing.T, name string, taContainerImage string, file string) v1beta1.OpenTelemetryCollector {
+func testCollectorAssertNoErr(t *testing.T, name, taContainerImage, file string) v1beta1.OpenTelemetryCollector {
 	p, err := testCollectorWithConfigFile(name, taContainerImage, file)
 	assert.NoError(t, err)
 	if len(taContainerImage) == 0 {
@@ -336,7 +337,7 @@ func testCollectorAssertNoErr(t *testing.T, name string, taContainerImage string
 	return p
 }
 
-func testCollectorWithConfigFile(name string, taContainerImage string, file string) (v1beta1.OpenTelemetryCollector, error) {
+func testCollectorWithConfigFile(name, taContainerImage, file string) (v1beta1.OpenTelemetryCollector, error) {
 	replicas := int32(1)
 	var configYAML []byte
 	var err error
@@ -375,7 +376,8 @@ func testCollectorWithConfigFile(name string, taContainerImage string, file stri
 							IntVal: 80,
 						},
 						NodePort: 0,
-					}}},
+					},
+				}},
 				Replicas: &replicas,
 			},
 			Mode: v1beta1.ModeStatefulSet,
@@ -419,7 +421,8 @@ func testCollectorWithHPA(t *testing.T, minReps, maxReps int32) v1beta1.OpenTele
 							IntVal: 80,
 						},
 						NodePort: 0,
-					}}},
+					},
+				}},
 			},
 
 			Config: otelConfig,
@@ -484,7 +487,8 @@ func testCollectorWithPDB(t *testing.T, minAvailable, maxUnavailable int32) v1be
 							IntVal: 80,
 						},
 						NodePort: 0,
-					}}},
+					},
+				}},
 				PodDisruptionBudget: pdb,
 			},
 

internal/fips/fipscheck.go

@@ -9,7 +9,7 @@ import (
 
 type FIPSCheck interface {
 	// DisabledComponents checks if a submitted components are denied or not.
-	DisabledComponents(receivers map[string]any, exporters map[string]any, processors map[string]any, extensions map[string]any) []string
+	DisabledComponents(receivers, exporters, processors, extensions map[string]any) []string
 }
 
 // FipsCheck holds configuration for FIPS deny list.
@@ -38,7 +38,7 @@ func listToMap(list []string) map[string]bool {
 	return m
 }
 
-func (fips fipsCheck) DisabledComponents(receivers map[string]any, exporters map[string]any, processors map[string]any, extensions map[string]any) []string {
+func (fips fipsCheck) DisabledComponents(receivers, exporters, processors, extensions map[string]any) []string {
 	var disabled []string
 	if comp := isDisabled(fips.receivers, receivers); comp != "" {
 		disabled = append(disabled, comp)

internal/instrumentation/apachehttpd.go

@@ -64,7 +64,8 @@ func injectApacheHttpdagent(_ logr.Logger, apacheSpec v1alpha1.ApacheHttpd, pod
 				EmptyDir: &corev1.EmptyDirVolumeSource{
 					SizeLimit: volumeSize(apacheSpec.VolumeSizeLimit),
 				},
-			}})
+			},
+		})
 
 		apacheConfDir := getApacheConfDir(apacheSpec.ConfigPath)
 
@@ -139,7 +140,8 @@ func injectApacheHttpdagent(_ logr.Logger, apacheSpec v1alpha1.ApacheHttpd, pod
 					Name:  apacheAttributesEnvVar,
 					Value: getApacheOtelConfig(pod, useLabelsForResourceAttributes, apacheSpec, container, otlpEndpoint, resourceMap),
 				},
-				{Name: apacheServiceInstanceIdEnvVar,
+				{
+					Name: apacheServiceInstanceIdEnvVar,
 					ValueFrom: &corev1.EnvVarSource{
 						FieldRef: &corev1.ObjectFieldSelector{
 							FieldPath: "metadata.name",

internal/instrumentation/exporter.go

@@ -79,7 +79,8 @@ func configureExporter(exporter v1alpha1.Exporter, pod *corev1.Pod, container *c
 					Secret: &corev1.SecretVolumeSource{
 						SecretName: exporter.TLS.SecretName,
 					},
-				}})
+				},
+			})
 		}
 		addVolumeMount := true
 		for _, vol := range container.VolumeMounts {
@@ -112,7 +113,8 @@ func configureExporter(exporter v1alpha1.Exporter, pod *corev1.Pod, container *c
 							Name: exporter.TLS.ConfigMapName,
 						},
 					},
-				}})
+				},
+			})
 		}
 		addVolumeMount := true
 		for _, vol := range container.VolumeMounts {

internal/instrumentation/helper.go

@@ -132,7 +132,8 @@ func instrVolume(volumeClaimTemplate corev1.PersistentVolumeClaimTemplate, name
 			EmptyDir: &corev1.EmptyDirVolumeSource{
 				SizeLimit: volumeSize(quantity),
 			},
-		}}
+		},
+	}
 }
 
 func volumeSize(quantity *resource.Quantity) *resource.Quantity {
@@ -158,7 +159,7 @@ func isValidContainersAnnotation(containersAnnotation string) error {
 }
 
 // setContainersFromAnnotation sets the containers associated to one intrumentation based on the content of the provided annotation.
-func setContainersFromAnnotation(inst *instrumentationWithContainers, annotation string, ns metav1.ObjectMeta, pod metav1.ObjectMeta) error {
+func setContainersFromAnnotation(inst *instrumentationWithContainers, annotation string, ns, pod metav1.ObjectMeta) error {
 	annotationValue := annotationValue(ns, pod, annotation)
 	if annotationValue == "" {
 		return nil

internal/instrumentation/helper_test.go

@@ -205,7 +205,8 @@ func TestInstrVolume(t *testing.T) {
 							},
 						},
 					},
-				}},
+				},
+			},
 		},
 		{
 			name:       "With volume size limit",
@@ -218,7 +219,8 @@ func TestInstrVolume(t *testing.T) {
 					EmptyDir: &corev1.EmptyDirVolumeSource{
 						SizeLimit: &defaultVolumeLimitSize,
 					},
-				}},
+				},
+			},
 		},
 		{
 			name:       "No volume or size limit",
@@ -231,7 +233,8 @@ func TestInstrVolume(t *testing.T) {
 					EmptyDir: &corev1.EmptyDirVolumeSource{
 						SizeLimit: &defaultSize,
 					},
-				}},
+				},
+			},
 		},
 		{
 			name: "With volume and size limit",
@@ -252,7 +255,8 @@ func TestInstrVolume(t *testing.T) {
 							},
 						},
 					},
-				}},
+				},
+			},
 		},
 	}