From e3722c4a36c42814458e7eb4a8a0d211cf4b2e23 Mon Sep 17 00:00:00 2001 From: Sveta Smirnova Date: Wed, 15 May 2024 19:35:38 +0300 Subject: [PATCH] PT-2299 - collect openssl x509 certificate information for each secret - Added resourceType to the switch calls as suggested by Nickolay --- src/go/pt-k8s-debug-collector/dumper/dumper.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/go/pt-k8s-debug-collector/dumper/dumper.go b/src/go/pt-k8s-debug-collector/dumper/dumper.go index 5c803861..ef746419 100644 --- a/src/go/pt-k8s-debug-collector/dumper/dumper.go +++ b/src/go/pt-k8s-debug-collector/dumper/dumper.go @@ -74,7 +74,7 @@ func New(location, namespace, resource string, kubeconfig string, forwardport st "persistentvolumes", } - switch resource { + switch resourceType(resource) { case "auto": result, err := d.runCmd("api-resources", "-o", "name") if err != nil { @@ -124,7 +124,7 @@ func New(location, namespace, resource string, kubeconfig string, forwardport st } sslSecrets := make([]sslSecret, 0) filePaths := make([]string, 0) - switch resource { + switch resourceType(resource) { case "pg": sslSecrets = append(sslSecrets, sslSecret{ @@ -652,7 +652,9 @@ func (d *Dumper) getSSLCertificates(secret sslSecret, namespace string, tw *tar. } func resourceType(s string) string { - if s == "pxc" || strings.HasPrefix(s, "pxc/") { + if s == "auto" { + return "auto" + } else if s == "pxc" || strings.HasPrefix(s, "pxc/") { return "pxc" } else if s == "psmdb" || strings.HasPrefix(s, "psmdb/") { return "psmdb"