remove stdErr output based decision if possible

Author: Patryk Wasielewski

pkg/splunk/enterprise/afwscheduler.go

@@ -767,15 +767,14 @@ func installApp(rctx context.Context, localCtx *localScopePlaybookContext, cr sp
 
 	stdOut, stdErr, err := localCtx.podExecClient.RunPodExecCommand(rctx, streamOptions, []string{"/bin/sh"})
 
-	// Handle FIPS messages in stderr - these are informational, not errors
-	if stdErr != "" && strings.Contains(stdErr, "FIPS provider enabled") {
-		scopedLog.Info("FIPS provider informational message detected during app install", "stderr", stdErr)
-		// Continue processing - FIPS messages don't indicate failure
-		stdErr = "" // Clear stderr so it doesn't trigger error handling below
+	// TODO(patrykw-splunk): remove this once we have confirm that we are not using stderr for error detection at all
+	// Log stderr content for debugging but don't use it for error detection
+	if stdErr != "" {
+		scopedLog.Info("App install command stderr output (informational only)", "stderr", stdErr)
 	}
 
-	// if the app was already installed previously, then just mark it for install complete
-	if stdErr != "" || err != nil {
+	// Check only the actual command execution error, not stderr content
+	if err != nil {
 		phaseInfo.FailCount++
 		scopedLog.Error(err, "local scoped app package install failed", "stdout", stdOut, "stderr", stdErr, "app pkg path", appPkgPathOnPod, "failCount", phaseInfo.FailCount)
 		return fmt.Errorf("local scoped app package install failed. stdOut: %s, stdErr: %s, app pkg path: %s, failCount: %d", stdOut, stdErr, appPkgPathOnPod, phaseInfo.FailCount)
@@ -807,13 +806,9 @@ func isAppAlreadyInstalled(ctx context.Context, cr splcommon.MetaObject, podExec
 		return false, nil
 	}
 
-	// Handle FIPS messages in stderr - these are informational, not errors
-	if stdErr != "" && strings.Contains(stdErr, "FIPS provider enabled") {
-		scopedLog.Info("FIPS provider informational message detected", "stderr", stdErr)
-		// Continue processing - FIPS messages don't indicate failure
-	} else if stdErr != "" {
-		// Log warning for any other stderr content we haven't seen before
-		scopedLog.Info("Unexpected stderr content detected - please review", "stderr", stdErr, "command", command)
+	// Log any other stderr content for debugging but don't use it for error detection
+	if stdErr != "" {
+		scopedLog.Info("Command stderr output (informational only)", "stderr", stdErr)
 	}
 
 	// Now check the actual command result
@@ -824,7 +819,7 @@ func isAppAlreadyInstalled(ctx context.Context, cr splcommon.MetaObject, podExec
 
 		// Check for grep exit code 1 (pattern not found)
 		if strings.Contains(errMsg, "exit status 1") || strings.Contains(errMsg, "command terminated with exit code 1") {
-			// grep exit code 1 means "ENABLED" pattern not found - app is not enabled
+			// grep exit code 1 means "ENABLED" pattern not found - app exists but is not enabled
 			scopedLog.Info("App not enabled - grep pattern not found", "stdout", stdOut, "stderr", stdErr)
 			return false, nil
 		}

pkg/splunk/enterprise/afwscheduler_test.go

@@ -3061,9 +3061,9 @@ func TestRunLocalScopedPlaybook(t *testing.T) {
 		t.Errorf("Failed to detect that steps to get installed app failed")
 	}
 
-	// Test3: get installed app name passes but isAppAlreadyInstalled fails with real error
+	// Test3: get installed app name passes but isAppAlreadyInstalled fails with real error (not "Could not find object")
 	mockPodExecReturnContexts[1].StdErr = ""
-	mockPodExecReturnContexts[2].StdErr = "Could not find object id=app1" // Non-FIPS error
+	mockPodExecReturnContexts[2].StdErr = "Some other real error message" // Real error, not "Could not find object"
 	mockPodExecReturnContexts[2].Err = fmt.Errorf("exit status 2") // Real error, not grep exit code 1
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3076,7 +3076,8 @@ func TestRunLocalScopedPlaybook(t *testing.T) {
 	mockPodExecReturnContexts[2].StdOut = "" // No stdout means grep didn't find ENABLED
 	mockPodExecReturnContexts[2].StdErr = "" // No stderr
 	mockPodExecReturnContexts[2].Err = fmt.Errorf("exit status 1") // grep exit code 1 = pattern not found
-	mockPodExecReturnContexts[3].StdErr = "real installation error" // Non-FIPS error should still fail
+	mockPodExecReturnContexts[3].StdErr = "real installation error" // This is just logged now
+	mockPodExecReturnContexts[3].Err = fmt.Errorf("install command failed") // This causes the actual failure
 
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3085,10 +3086,13 @@ func TestRunLocalScopedPlaybook(t *testing.T) {
 		t.Errorf("Expected app install failed")
 	}
 
-	// Test5: App not found scenario (Could not find object)
+	// Test5: App not found scenario (Could not find object) - should proceed to install but install fails
 	mockPodExecReturnContexts[2].StdOut = ""
 	mockPodExecReturnContexts[2].StdErr = "Could not find object id=app1"
 	mockPodExecReturnContexts[2].Err = nil // This should return false, nil (app not installed)
+	// Keep the installation error from previous test to make install fail
+	mockPodExecReturnContexts[3].StdErr = "real installation error" // Install should fail
+	mockPodExecReturnContexts[3].Err = fmt.Errorf("install failed")
 
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3097,9 +3101,11 @@ func TestRunLocalScopedPlaybook(t *testing.T) {
 		t.Errorf("Expected app install failed due to installation error")
 	}
 
-	// Test6: FIPS message should be handled gracefully during install
-	mockPodExecReturnContexts[3].StdErr = "FIPS provider enabled. name: OpenSSL FIPS Provider, version: 3.0.9, buildinfo: 3.0.9, status: Success" // FIPS message should be ignored
+	// Test6: Install succeeds with stderr content (should be ignored), but cleanup fails
+	mockPodExecReturnContexts[3].StdErr = "Some informational message in stderr" // Stderr content should be ignored
 	mockPodExecReturnContexts[3].Err = nil // No actual error for install
+	// Keep cleanup failure from previous test setup to make overall test fail
+	// mockPodExecReturnContexts[4] still has error from earlier
 
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3307,9 +3313,9 @@ func TestPremiumAppScopedPlaybook(t *testing.T) {
 		t.Errorf("Failed to detect that steps to get installed app failed")
 	}
 
-	// Test3: get installed app name passes but isAppAlreadyInstalled fails with non-FIPS error
+	// Test3: get installed app name passes but isAppAlreadyInstalled fails with real error (not "Could not find object")
 	mockPodExecReturnContexts[1].StdErr = ""
-	mockPodExecReturnContexts[2].StdErr = "Could not find object id=app1" // Non-FIPS error
+	mockPodExecReturnContexts[2].StdErr = "Some other real error message" // Real error, not "Could not find object"
 	mockPodExecReturnContexts[2].Err = fmt.Errorf("exit status 2")        // Real error, not grep exit code 1
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3319,11 +3325,12 @@ func TestPremiumAppScopedPlaybook(t *testing.T) {
 	}
 
 	// Test4: isAppAlreadyInstalled returns app is not enabled (grep exit code 1)
-	// so app install will run and it should fail with non-FIPS error
+	// so app install will run and it should fail with real error
 	mockPodExecReturnContexts[2].StdOut = ""                        // No stdout means grep didn't find ENABLED
 	mockPodExecReturnContexts[2].StdErr = ""                        // No stderr
 	mockPodExecReturnContexts[2].Err = fmt.Errorf("exit status 1")  // grep exit code 1 = pattern not found
-	mockPodExecReturnContexts[3].StdErr = "real installation error" // Non-FIPS error should still fail
+	mockPodExecReturnContexts[3].StdErr = "real installation error" // This is just logged now
+	mockPodExecReturnContexts[3].Err = fmt.Errorf("install command failed") // This causes the actual failure
 
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3332,9 +3339,9 @@ func TestPremiumAppScopedPlaybook(t *testing.T) {
 		t.Errorf("Expected app install failed")
 	}
 
-	// Test5: FIPS message during install should be handled gracefully, but es post install fails
-	mockPodExecReturnContexts[3].StdErr = "FIPS provider enabled. name: OpenSSL FIPS Provider, version: 3.0.9, buildinfo: 3.0.9, status: Success" // FIPS message should be ignored
-	mockPodExecReturnContexts[3].Err = nil                                                                                                        // No actual error for install
+	// Test5: Install succeeds with stderr content (should be ignored), but post install fails
+	mockPodExecReturnContexts[3].StdErr = "Some informational message in stderr" // Stderr content should be ignored
+	mockPodExecReturnContexts[3].Err = nil // No actual error for install
 
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
@@ -3353,21 +3360,21 @@ func TestPremiumAppScopedPlaybook(t *testing.T) {
 		t.Errorf("Expected es post  install succeeded but app arhive deletion failed")
 	}
 
-	// Test7: App already installed with FIPS message - should skip installation
+	// Test7: App already installed with stderr content - should skip installation
 	// Reset all mock contexts for this test
 	mockPodExecReturnContexts[0].Err = nil                                  // File exists check passes
 	mockPodExecReturnContexts[1].StdErr = ""                                // Get app name passes
 	mockPodExecReturnContexts[1].StdOut = "app1"                            // App name is found
 	mockPodExecReturnContexts[2].StdOut = "app1 CONFIGURED ENABLED VISIBLE" // App is already enabled
-	mockPodExecReturnContexts[2].StdErr = "FIPS provider enabled. name: OpenSSL FIPS Provider, version: 3.0.9, buildinfo: 3.0.9, status: Success"
+	mockPodExecReturnContexts[2].StdErr = "Some informational message in stderr"
 	mockPodExecReturnContexts[2].Err = nil // No error - app is found and enabled
 	// Install step should be skipped, but cleanup should still work
 	mockPodExecReturnContexts[5].StdErr = "" // Cleanup should succeed
 	localInstallCtxt.sem <- struct{}{}
 	waiter.Add(1)
 	err = pCtx.runPlaybook(ctx)
 	if err != nil {
-		t.Errorf("runPlayBook should not have returned error when app is already installed with FIPS message. err=%s", err.Error())
+		t.Errorf("runPlayBook should not have returned error when app is already installed with stderr content. err=%s", err.Error())
 	}
 
 	// Test8: successful scenario where everything succeeds
@@ -4530,22 +4537,22 @@ func TestIsAppAlreadyInstalled(t *testing.T) {
 			description:    "App not installed at all",
 		},
 		{
-			name:           "FIPS provider message with app enabled",
+			name:           "App enabled with stderr content",
 			stdOut:         "myapp CONFIGURED ENABLED VISIBLE",
-			stdErr:         "FIPS provider enabled. name: OpenSSL FIPS Provider, version: 3.0.9, buildinfo: 3.0.9, status: Success",
+			stdErr:         "Some informational message in stderr",
 			err:            nil,
 			expectedResult: true,
 			expectedError:  false,
-			description:    "FIPS message should be ignored when app is enabled",
+			description:    "Stderr content should be ignored when app is enabled",
 		},
 		{
-			name:           "FIPS provider message with app not enabled",
+			name:           "App not enabled with stderr content",
 			stdOut:         "",
-			stdErr:         "FIPS provider enabled. name: OpenSSL FIPS Provider, version: 3.0.9, buildinfo: 3.0.9, status: Success",
+			stdErr:         "Some informational message in stderr",
 			err:            fmt.Errorf("exit status 1"),
 			expectedResult: false,
 			expectedError:  false,
-			description:    "FIPS message should be ignored, grep exit code 1 means not enabled",
+			description:    "Stderr content should be ignored, grep exit code 1 means not enabled",
 		},
 		{
 			name:           "Real error - exit code 2",