fix: cortexrc race condition (#1707)

Co-authored-by: vansangpfiev <[email protected]>

engine/cli/command_line_parser.cc

@@ -602,8 +602,9 @@ void CommandLineParser::SetupSystemCommands() {
                                             << " to " << cml_data_.port);
       auto config_path = file_manager_utils::GetConfigurationPath();
       cml_data_.config.apiServerPort = std::to_string(cml_data_.port);
-      auto result = config_yaml_utils::DumpYamlConfig(cml_data_.config,
-                                                      config_path.string());
+      auto result =
+          config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(
+              cml_data_.config, config_path.string());
       if (result.has_error()) {
         CLI_LOG("Error update " << config_path.string() << result.error());
       }

engine/cli/commands/cortex_upd_cmd.cc

@@ -192,8 +192,9 @@ std::optional<std::string> CheckNewUpdate(
         CTL_INF("Got the latest release, update to the config file: "
                 << latest_version)
         config.latestRelease = latest_version;
-        auto result = config_yaml_utils::DumpYamlConfig(
-            config, file_manager_utils::GetConfigurationPath().string());
+        auto result =
+            config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(
+                config, file_manager_utils::GetConfigurationPath().string());
         if (result.has_error()) {
           CTL_ERR("Error update "
                   << file_manager_utils::GetConfigurationPath().string()

engine/cli/main.cc

@@ -151,8 +151,9 @@ int main(int argc, char* argv[]) {
               .count();
       config.latestLlamacppRelease = res.value();
 
-      auto upd_config_res = config_yaml_utils::DumpYamlConfig(
-          config, file_manager_utils::GetConfigurationPath().string());
+      auto upd_config_res =
+          config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(
+              config, file_manager_utils::GetConfigurationPath().string());
       if (upd_config_res.has_error()) {
         CTL_ERR("Failed to update config file: " << upd_config_res.error());
       } else {

engine/main.cc

@@ -51,7 +51,8 @@ void RunServer(std::optional<int> port, bool ignore_cout) {
     auto config_path = file_manager_utils::GetConfigurationPath();
     config.apiServerPort = std::to_string(*port);
     auto result =
-        config_yaml_utils::DumpYamlConfig(config, config_path.string());
+        config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(
+            config, config_path.string());
     if (result.has_error()) {
       CTL_ERR("Error update " << config_path.string() << result.error());
     }

engine/test/components/test_cortex_config.cc

@@ -2,6 +2,7 @@
 #include "utils/config_yaml_utils.h"
 
 namespace config_yaml_utils {
+namespace cyu = config_yaml_utils;
 class CortexConfigTest : public ::testing::Test {
  protected:
   const std::string test_file_path = "test_config.yaml";
@@ -43,7 +44,8 @@ TEST_F(CortexConfigTest, DumpYamlConfig_WritesCorrectly) {
                          123456789,
                          "v1.0.0"};
 
-  auto result = DumpYamlConfig(config, test_file_path);
+  auto result = cyu::CortexConfigMgr::GetInstance().DumpYamlConfig(
+      config, test_file_path);
   EXPECT_FALSE(result.has_error());
 
   // Verify that the file was created and contains the expected data
@@ -72,11 +74,13 @@ TEST_F(CortexConfigTest, FromYaml_ReadsCorrectly) {
                          123456789,
                          "v1.0.0"};
 
-  auto result = DumpYamlConfig(config, test_file_path);
+  auto result = cyu::CortexConfigMgr::GetInstance().DumpYamlConfig(
+      config, test_file_path);
   EXPECT_FALSE(result.has_error());
 
   // Now read from the YAML file
-  CortexConfig loaded_config = FromYaml(test_file_path, default_config);
+  CortexConfig loaded_config = cyu::CortexConfigMgr::GetInstance().FromYaml(
+      test_file_path, default_config);
 
   // Verify that the loaded configuration matches what was written
   EXPECT_EQ(loaded_config.logFolderPath, config.logFolderPath);
@@ -92,7 +96,10 @@ TEST_F(CortexConfigTest, FromYaml_FileNotFound) {
   std::filesystem::remove(test_file_path);  // Ensure the file does not exist
 
   EXPECT_THROW(
-      { FromYaml(test_file_path, default_config); },
+      {
+        cyu::CortexConfigMgr::GetInstance().FromYaml(test_file_path,
+                                                     default_config);
+      },
       std::runtime_error);  // Expect a runtime error due to missing file
 }
 
@@ -102,7 +109,8 @@ TEST_F(CortexConfigTest, FromYaml_IncompleteConfigUsesDefaults) {
   out_file << "logFolderPath: log_path\n";  // Missing other fields
   out_file.close();
 
-  CortexConfig loaded_config = FromYaml(test_file_path, default_config);
+  CortexConfig loaded_config = cyu::CortexConfigMgr::GetInstance().FromYaml(
+      test_file_path, default_config);
 
   // Verify that defaults are used where values are missing
   EXPECT_EQ(loaded_config.logFolderPath, "log_path");

engine/test/components/test_file_manager_config_yaml_utils.cc

@@ -63,7 +63,9 @@ TEST_F(FileManagerConfigTest, DumpYamlConfig) {
                                          .apiServerPort = "8080"};
 
   std::string test_file = "test_config.yaml";
-  auto result = config_yaml_utils::DumpYamlConfig(config, test_file);
+  auto result =
+      config_yaml_utils::CortexConfigMgr::GetInstance().DumpYamlConfig(
+          config, test_file);
   EXPECT_FALSE(result.has_error());
   EXPECT_TRUE(std::filesystem::exists(test_file));
 
@@ -83,7 +85,8 @@ TEST_F(FileManagerConfigTest, FromYaml) {
   out_file.close();
 
   config_yaml_utils::CortexConfig default_config{};
-  auto config = config_yaml_utils::FromYaml(test_file, default_config);
+  auto config = config_yaml_utils::CortexConfigMgr::GetInstance().FromYaml(
+      test_file, default_config);
 
   EXPECT_EQ(config.logFolderPath, "/path/to/logs");
   EXPECT_EQ(config.dataFolderPath, "/path/to/data");