update YAML path for HTTP TLS redactor

replicatedhq · Jan 3, 2025 · 19c1d5a · 19c1d5a
1 parent 9e6affc
commit 19c1d5a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/pkg/redact/redact.go b/pkg/redact/redact.go
@@ -475,8 +475,13 @@ func getRedactors(path string) ([]Redactor, error) {
 	// todo: any other TLS keys to redact?
 	tlsKeys := []string{"clientKey"}
 	for _, key := range tlsKeys {
-		yamlPath := fmt.Sprintf("spec.collectors.*.*.tls.%s", key)
-		redactors = append(redactors, NewYamlRedactor(yamlPath, constants.SPEC_FILENAME, "Redact TLS private key"))
+		yamlPaths := []string{
+			fmt.Sprintf("spec.collectors.*.*.tls.%s", key),   // Database collector
+			fmt.Sprintf("spec.collectors.*.*.*.tls.%s", key), // HTTP collector
+		}
+		for _, yamlPath := range yamlPaths {
+			redactors = append(redactors, NewYamlRedactor(yamlPath, constants.SPEC_FILENAME, "Redact TLS private key"))
+		}
 	}
 
 	return redactors, nil

diff --git a/pkg/supportbundle/supportbundle_test.go b/pkg/supportbundle/supportbundle_test.go
@@ -136,6 +136,14 @@ func Test_saveAndRedactFinalSpec(t *testing.T) {
 						ClientKey:  `PRIVATE KEY`,
 					},
 				},
+				HTTP: &troubleshootv1beta2.HTTP{
+					Get: &troubleshootv1beta2.Get{
+						URL: "http:api:3000/healthz",
+						TLS: &troubleshootv1beta2.TLSParams{
+							ClientKey: `PRIVATE KEY`,
+						},
+					},
+				},
 			},
 		},
 	}
@@ -157,6 +165,11 @@ spec:
         cacert: CA CERT
         clientCert: CLIENT CERT
         clientKey: "***HIDDEN***"
+    http:
+      get:
+        url: http:api:3000/healthz
+        tls:
+          clientKey: "***HIDDEN***"
 status: {}
 `