fix: export collector config to ignore empty string (#1674)

hsmatulis · web-flow · commit c8695de5dfa6 · 2025-06-19T10:52:39.000-04:00
Compression and CredentialsFile could be empty string, in these cases
they should not be populated into collector configmap.
diff --git a/pkg/operator/collection.go b/pkg/operator/collection.go
@@ -276,18 +276,18 @@ func (r *collectionReconciler) ensureCollectorConfig(ctx context.Context, spec *
 		return fmt.Errorf("generate Prometheus config: %w", err)
 	}
 
-	var credentialsFile string
-	if spec.Credentials != nil {
-		credentialsFile = path.Join(secretsDir, pathForSelector(r.opts.PublicNamespace, &monitoringv1.SecretOrConfigMap{Secret: spec.Credentials}))
-	}
-
 	cfg.GoogleCloud = &GoogleCloudConfig{
 		Export: &GoogleCloudExportConfig{
-			Compression:     ptr.To(string(compression)),
-			CredentialsFile: ptr.To(credentialsFile),
-			Match:           spec.Filter.MatchOneOf,
+			Match: spec.Filter.MatchOneOf,
 		},
 	}
+	if string(compression) != "" {
+		cfg.GoogleCloud.Export.Compression = ptr.To(string(compression))
+	}
+	if spec.Credentials != nil {
+		credentialsFile := path.Join(secretsDir, pathForSelector(r.opts.PublicNamespace, &monitoringv1.SecretOrConfigMap{Secret: spec.Credentials}))
+		cfg.GoogleCloud.Export.CredentialsFile = ptr.To(credentialsFile)
+	}
 
 	cfgEncoded, err := yaml.Marshal(cfg)
 	if err != nil {
diff --git a/pkg/operator/collection_test.go b/pkg/operator/collection_test.go
@@ -110,11 +110,12 @@ func TestCollectionReconcile(t *testing.T) {
 			Interval: "10s",
 		},
 	}
-
+	exampleCollectorConfigMapWithoutScrapeConfig := "global: {}\ngoogle_cloud:\n    export: {}\n"
 	testCases := []struct {
-		desc     string
-		input    monitoringv1.MonitoringCRD
-		expected monitoringv1.MonitoringCRD
+		desc                       string
+		input                      monitoringv1.MonitoringCRD
+		expected                   monitoringv1.MonitoringCRD
+		expectedCollectorConfigMap *string
 	}{
 		{
 			desc: "podmonitoring: no update",
@@ -413,6 +414,7 @@ func TestCollectionReconcile(t *testing.T) {
 					},
 				},
 			},
+			expectedCollectorConfigMap: &exampleCollectorConfigMapWithoutScrapeConfig,
 		},
 	}
 
@@ -466,6 +468,21 @@ func TestCollectionReconcile(t *testing.T) {
 				t.Fatal(err)
 			}
 
+			if tc.expectedCollectorConfigMap != nil {
+				collectorConfigMap := &corev1.ConfigMap{
+					ObjectMeta: metav1.ObjectMeta{
+						Namespace: opts.OperatorNamespace,
+						Name:      NameCollector,
+					},
+				}
+				if err := kubeClient.Get(ctx, client.ObjectKeyFromObject(collectorConfigMap), collectorConfigMap); err != nil {
+					t.Fatal(err)
+				}
+				if diff := cmp.Diff(*tc.expectedCollectorConfigMap, collectorConfigMap.Data["config.yaml"]); diff != "" {
+					t.Fatalf("unexpected collector configmap (-want, +got): %s", diff)
+				}
+			}
+
 			if err := kubeClient.Get(ctx, client.ObjectKeyFromObject(tc.input), tc.input); err != nil {
 				t.Fatal(err)
 			}
