Add secret key length check

enix · Dec 12, 2024 · f0447e6 · f0447e6
1 parent 94d471d
commit f0447e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/kubernetes.go b/internal/kubernetes.go
@@ -248,7 +248,7 @@ func (exporter *Exporter) filterSecrets(secrets []v1.Secret, includedLabels, exc
 func (exporter *Exporter) checkHasIncludedType(secret *v1.Secret) (bool, error) {
 	for _, secretType := range exporter.KubeSecretTypes {
 		for key := range secret.Data {
-			if secretType.Matches(string(secret.Type), key) {
+			if len(secret.Data[key]) > 0 && secretType.Matches(string(secret.Type), key) {
 				return true, nil
 			}
 		}
@@ -268,7 +268,7 @@ func (exporter *Exporter) shrinkSecret(secret v1.Secret) v1.Secret {
 
 	for _, secretType := range exporter.KubeSecretTypes {
 		for key := range secret.Data {
-			if secretType.Matches(string(secret.Type), key) {
+			if len(secret.Data[key]) > 0 && secretType.Matches(string(secret.Type), key) {
 				result.Data[key] = secret.Data[key]
 			}
 		}

diff --git a/internal/kubernetes_test.go b/internal/kubernetes_test.go
@@ -364,7 +364,7 @@ func TestKubeEmptyStringKey(t *testing.T) {
 		},
 	}, func(m []model.MetricFamily) {
 		metrics := getMetricsForName(m, "x509_read_errors")
-		assert.Equal(t, 1., metrics[0].GetGauge().GetValue())
+		assert.Equal(t, 0., metrics[0].GetGauge().GetValue())
 	})
 }