From 886786fbdfd707ab10d7991f66f574bae4704c61 Mon Sep 17 00:00:00 2001 From: Ida Hou Date: Fri, 31 Jan 2025 18:22:32 +0000 Subject: [PATCH] placed health check logs in the correct dir --- cmd/ops_agent_uap_plugin/service_linux.go | 5 +++-- cmd/ops_agent_uap_plugin/service_linux_test.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/ops_agent_uap_plugin/service_linux.go b/cmd/ops_agent_uap_plugin/service_linux.go index 8a835f60fc..b06eff7226 100644 --- a/cmd/ops_agent_uap_plugin/service_linux.go +++ b/cmd/ops_agent_uap_plugin/service_linux.go @@ -108,7 +108,7 @@ func (ps *OpsAgentPluginServer) Start(ctx context.Context, msg *pb.StartRequest) } // Ops Agent config validation - if err := validateOpsAgentConfig(pContext, pluginInstallDir, ps.runCommand); err != nil { + if err := validateOpsAgentConfig(pContext, pluginInstallDir, pluginStateDir, ps.runCommand); err != nil { log.Printf("Start() failed: %s", err) ps.cancel() ps.cancel = nil @@ -264,10 +264,11 @@ func runCommand(cmd *exec.Cmd) (string, error) { return string(out), err } -func validateOpsAgentConfig(ctx context.Context, pluginInstallDirectory string, runCommand RunCommandFunc) error { +func validateOpsAgentConfig(ctx context.Context, pluginInstallDirectory string, pluginStateDirectory string, runCommand RunCommandFunc) error { configValidationCmd := exec.CommandContext(ctx, path.Join(pluginInstallDirectory, ConfGeneratorBinary), "-in", OpsAgentConfigLocationLinux, + "-logs", path.Join(pluginStateDirectory, LogsDirectory), ) if output, err := runCommand(configValidationCmd); err != nil { return fmt.Errorf("failed to validate the Ops Agent config:\ncommand output: %s\ncommand error: %s", output, err) diff --git a/cmd/ops_agent_uap_plugin/service_linux_test.go b/cmd/ops_agent_uap_plugin/service_linux_test.go index adc3ec52a8..96b71721ad 100644 --- a/cmd/ops_agent_uap_plugin/service_linux_test.go +++ b/cmd/ops_agent_uap_plugin/service_linux_test.go @@ -115,7 +115,7 @@ func Test_validateOpsAgentConfig(t *testing.T) { } ctx := context.Background() - err := validateOpsAgentConfig(ctx, "", mockRunCommand) + err := validateOpsAgentConfig(ctx, "", "", mockRunCommand) gotSuccess := (err == nil) if gotSuccess != tc.wantSuccess { t.Errorf("%s: validateOpsAgentConfig() failed to valide Ops Agent config: %v, want successful config validation: %v, error:%v", tc.name, gotSuccess, tc.wantSuccess, err)