[chore]: enable nestingReduce issues from gocritic (#4840)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Author: mmorel-35

.golangci.yaml

@@ -31,7 +31,6 @@ linters:
         - exitAfterDefer
         - hugeParam
         - importShadow
-        - nestingReduce
         - offBy1
         - paramTypeCombine
         - rangeValCopy

pkg/collector/upgrade/v0_31_0.go

@@ -42,13 +42,14 @@ func upgrade0_31_0(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (
 				return otelcol, nil
 			}
 			for fieldKey := range influxdbConfig {
-				if strings.HasPrefix(fieldKey.(string), "metrics_schema") {
-					delete(influxdbConfig, fieldKey)
-					existing := &corev1.ConfigMap{}
-					updated := existing.DeepCopy()
-					u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.31.0 dropped the 'metrics_schema' field from %q receiver", k))
+				if !strings.HasPrefix(fieldKey.(string), "metrics_schema") {
 					continue
 				}
+				delete(influxdbConfig, fieldKey)
+				existing := &corev1.ConfigMap{}
+				updated := existing.DeepCopy()
+				u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.31.0 dropped the 'metrics_schema' field from %q receiver", k))
+				continue
 			}
 		}
 	}

pkg/collector/upgrade/v0_36_0.go

@@ -60,13 +60,14 @@ func upgrade0_36_0(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (
 							}
 							for k4, v4 := range grpcHTTPConfig {
 								// change tls_settings to tls
-								if k4.(string) == "tls_settings" {
-									grpcHTTPConfig["tls"] = v4
-									delete(grpcHTTPConfig, "tls_settings")
-									existing := &corev1.ConfigMap{}
-									updated := existing.DeepCopy()
-									u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.36.0 has changed the tls_settings field name to tls in %s protocol of %s receiver", k3, k1))
+								if k4.(string) != "tls_settings" {
+									continue
 								}
+								grpcHTTPConfig["tls"] = v4
+								delete(grpcHTTPConfig, "tls_settings")
+								existing := &corev1.ConfigMap{}
+								updated := existing.DeepCopy()
+								u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.36.0 has changed the tls_settings field name to tls in %s protocol of %s receiver", k3, k1))
 							}
 						}
 					}

pkg/collector/upgrade/v0_39_0.go

@@ -49,46 +49,47 @@ func upgrade0_39_0(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (
 	receivers, _ := cfg["receivers"].(map[any]any)
 
 	for k1, v1 := range receivers {
-		if strings.HasPrefix(k1.(string), "httpd") {
-			// Rename httpd with apache
-			apacheKey := strings.Replace(k1.(string), "httpd", "apache", 1)
-			receivers[apacheKey] = v1
-			delete(receivers, k1)
-
-			// rename receiver name in service pipelines config
-			serviceConfig, ok := cfg["service"].(map[any]any)
-			if !ok {
-				// no serviceConfig?
-				return otelcol, nil
-			}
+		if !strings.HasPrefix(k1.(string), "httpd") {
+			continue
+		}
+		// Rename httpd with apache
+		apacheKey := strings.Replace(k1.(string), "httpd", "apache", 1)
+		receivers[apacheKey] = v1
+		delete(receivers, k1)
+
+		// rename receiver name in service pipelines config
+		serviceConfig, ok := cfg["service"].(map[any]any)
+		if !ok {
+			// no serviceConfig?
+			return otelcol, nil
+		}
 
-			pipelinesConfig, ok := serviceConfig["pipelines"].(map[any]any)
-			if !ok {
-				// no pipelinesConfig?
-				return otelcol, nil
-			}
+		pipelinesConfig, ok := serviceConfig["pipelines"].(map[any]any)
+		if !ok {
+			// no pipelinesConfig?
+			return otelcol, nil
+		}
 
-			for k2, v2 := range pipelinesConfig {
-				if k2.(string) == "metrics" {
-					metricsConfig, ok := v2.(map[any]any)
-					if !ok {
-						// no metricsConfig in service pipelines?
-						return otelcol, nil
-					}
-					for k3, v3 := range metricsConfig {
-						if k3.(string) == "receivers" {
-							receiversList, ok := v3.([]any)
-							if !ok {
-								// no receivers list in service pipeline?
-								return otelcol, nil
-							}
-							for i, k4 := range receiversList {
-								if strings.HasPrefix(k4.(string), "httpd") {
-									receiversList[i] = strings.Replace(k4.(string), "httpd", "apache", 1)
-									existing := &corev1.ConfigMap{}
-									updated := existing.DeepCopy()
-									u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.39.0 has dropped the ballast_size_mib field name from %s processor", receiversList[i]))
-								}
+		for k2, v2 := range pipelinesConfig {
+			if k2.(string) == "metrics" {
+				metricsConfig, ok := v2.(map[any]any)
+				if !ok {
+					// no metricsConfig in service pipelines?
+					return otelcol, nil
+				}
+				for k3, v3 := range metricsConfig {
+					if k3.(string) == "receivers" {
+						receiversList, ok := v3.([]any)
+						if !ok {
+							// no receivers list in service pipeline?
+							return otelcol, nil
+						}
+						for i, k4 := range receiversList {
+							if strings.HasPrefix(k4.(string), "httpd") {
+								receiversList[i] = strings.Replace(k4.(string), "httpd", "apache", 1)
+								existing := &corev1.ConfigMap{}
+								updated := existing.DeepCopy()
+								u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.39.0 has dropped the ballast_size_mib field name from %s processor", receiversList[i]))
 							}
 						}
 					}

pkg/collector/upgrade/v0_41_0.go

@@ -28,20 +28,21 @@ func upgrade0_41_0(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (
 			otlpReceiver, _ := v1.(map[any]any)
 			var createdCors bool
 			for k2, v2 := range otlpReceiver {
-				if k2.(string) == "cors_allowed_origins" || k2.(string) == "cors_allowed_headers" {
-					if !createdCors {
-						otlpReceiver["cors"] = make(map[any]any)
-						createdCors = true
-					}
-					newsCorsKey := strings.Replace(k2.(string), "cors_", "", 1)
-					otlpCors, _ := otlpReceiver["cors"].(map[any]any)
-					otlpCors[newsCorsKey] = v2
-					delete(otlpReceiver, k2)
-
-					existing := &corev1.ConfigMap{}
-					updated := existing.DeepCopy()
-					u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.41.0 has re-structured the %s inside otlp "+"receiver config according to the upstream otlp receiver changes in 0.41.0 release.", k2))
+				if k2.(string) != "cors_allowed_origins" && k2.(string) != "cors_allowed_headers" {
+					continue
 				}
+				if !createdCors {
+					otlpReceiver["cors"] = make(map[any]any)
+					createdCors = true
+				}
+				newsCorsKey := strings.Replace(k2.(string), "cors_", "", 1)
+				otlpCors, _ := otlpReceiver["cors"].(map[any]any)
+				otlpCors[newsCorsKey] = v2
+				delete(otlpReceiver, k2)
+
+				existing := &corev1.ConfigMap{}
+				updated := existing.DeepCopy()
+				u.Recorder.Event(updated, "Normal", "Upgrade", fmt.Sprintf("upgrade to v0.41.0 has re-structured the %s inside otlp "+"receiver config according to the upstream otlp receiver changes in 0.41.0 release.", k2))
 			}
 		}
 	}