controller/k8stools: add more error context to GetGredFromSecret

f41gh7 · f41gh7 · commit 27ad7e1e2868 · 2024-09-24T15:43:37.000+02:00
It should help to debug failed e2e tests

Signed-off-by: f41gh7 &lt;nik@victoriametrics.com&gt;
diff --git a/internal/controller/operator/factory/k8stools/secret_content.go b/internal/controller/operator/factory/k8stools/secret_content.go
@@ -111,13 +111,6 @@ func LoadBasicAuthSecret(ctx context.Context, rclient client.Client, ns string,
 	return bac, nil
 }
 
-func extractCredKey(secret *corev1.Secret, sel *corev1.SecretKeySelector) (string, error) {
-	if s, ok := secret.Data[sel.Key]; ok {
-		return maybeTrimSpace(string(s)), nil
-	}
-	return "", &KeyNotFoundError{sel.Key, sel.Name, "secret"}
-}
-
 // GetCredFromSecret fetch content of secret by given key
 func GetCredFromSecret(
 	ctx context.Context,
@@ -139,7 +132,10 @@ func GetCredFromSecret(
 		}
 		cache[cacheKey] = s
 	}
-	return extractCredKey(s, sel)
+	if s, ok := s.Data[sel.Key]; ok {
+		return maybeTrimSpace(string(s)), nil
+	}
+	return "", &KeyNotFoundError{sel.Key, cacheKey, "secret"}
 }
 
 // GetCredFromConfigMap fetches content of configmap by given key

Original file line number	Diff line number	Diff line change
`@@ -111,13 +111,6 @@ func LoadBasicAuthSecret(ctx context.Context, rclient client.Client, ns string,`
`111`	`111`	`return bac, nil`
`112`	`112`	`}`
`113`	`113`
`114`		`-func extractCredKey(secret corev1.Secret, sel corev1.SecretKeySelector) (string, error) {`
`115`		`- if s, ok := secret.Data[sel.Key]; ok {`
`116`		`- return maybeTrimSpace(string(s)), nil`
`117`		`- }`
`118`		`- return "", &KeyNotFoundError{sel.Key, sel.Name, "secret"}`
`119`		`-}`
`120`		`-`
`121`	`114`	`// GetCredFromSecret fetch content of secret by given key`
`122`	`115`	`func GetCredFromSecret(`
`123`	`116`	`ctx context.Context,`
`@@ -139,7 +132,10 @@ func GetCredFromSecret(`
`139`	`132`	`}`
`140`	`133`	`cache[cacheKey] = s`
`141`	`134`	`}`
`142`		`- return extractCredKey(s, sel)`
	`135`	`+ if s, ok := s.Data[sel.Key]; ok {`
	`136`	`+ return maybeTrimSpace(string(s)), nil`
	`137`	`+ }`
	`138`	`+ return "", &KeyNotFoundError{sel.Key, cacheKey, "secret"}`
`143`	`139`	`}`
`144`	`140`
`145`	`141`	`// GetCredFromConfigMap fetches content of configmap by given key`