Merge pull request #1385 from splunk/CSPL_2823

CSPL-2823 - Addresses PR#1372
splunk · Oct 10, 2024 · 1b1a385 · 1b1a385
2 parents 8393b3c + da71f09
commit 1b1a385
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/splunk/enterprise/searchheadcluster.go b/pkg/splunk/enterprise/searchheadcluster.go
@@ -309,7 +309,7 @@ func ApplyShcSecret(ctx context.Context, mgr *searchHeadClusterPodManager, repli
 		// Retrieve shc_secret password from Pod
 		shcSecret, err := splutil.GetSpecificSecretTokenFromPod(ctx, mgr.c, shPodName, mgr.cr.GetNamespace(), "shc_secret")
 		if err != nil {
-			return fmt.Errorf("couldn't retrieve shc_secret from secret data")
+			return fmt.Errorf("couldn't retrieve shc_secret from secret data, error: %s", err.Error())
 		}
 
 		// set the targetPodName here
@@ -320,7 +320,7 @@ func ApplyShcSecret(ctx context.Context, mgr *searchHeadClusterPodManager, repli
 		// Retrieve admin password from Pod
 		adminPwd, err := splutil.GetSpecificSecretTokenFromPod(ctx, mgr.c, shPodName, mgr.cr.GetNamespace(), "password")
 		if err != nil {
-			return fmt.Errorf("couldn't retrieve admin password from secret data")
+			return fmt.Errorf("couldn't retrieve admin password from secret data, error: %s", err.Error())
 		}
 
 		// If shc secret is different from namespace scoped secret change it

diff --git a/pkg/splunk/enterprise/searchheadcluster_test.go b/pkg/splunk/enterprise/searchheadcluster_test.go
@@ -600,8 +600,10 @@ func TestApplyShcSecret(t *testing.T) {
 		t.Errorf("Couldn't update resource")
 	}
 
+	errMsg := fmt.Sprintf(splcommon.SecretTokenNotRetrievable, "shc_secret") + ", error: invalid secret data"
+
 	err = ApplyShcSecret(ctx, mgr, 1, mockPodExecClient)
-	if err.Error() != fmt.Sprintf(splcommon.SecretTokenNotRetrievable, "shc_secret") {
+	if err.Error() != errMsg {
 		t.Errorf("Couldn't recognize missing shc_secret %s", err.Error())
 	}
 
@@ -621,8 +623,9 @@ func TestApplyShcSecret(t *testing.T) {
 		t.Errorf("Couldn't update resource")
 	}
 
+	errMsg = fmt.Sprintf(splcommon.SecretTokenNotRetrievable, "admin password") + ", error: invalid secret data"
 	err = ApplyShcSecret(ctx, mgr, 1, mockPodExecClient)
-	if err.Error() != fmt.Sprintf(splcommon.SecretTokenNotRetrievable, "admin password") {
+	if err.Error() != errMsg {
 		t.Errorf("Couldn't recognize missing admin password %s", err.Error())
 	}