Update Config Shadow to store config file updates persistently

Author: Ubuntu

source/config/Config.cpp

@@ -2491,6 +2491,7 @@ constexpr char Config::TAG[];
 constexpr char Config::DEFAULT_CONFIG_DIR[];
 constexpr char Config::DEFAULT_KEY_DIR[];
 constexpr char Config::DEFAULT_CONFIG_FILE[];
+constexpr char Config::DEFAULT_ROOT_CONFIG_FILE[];
 constexpr char Config::CLI_HELP[];
 constexpr char Config::CLI_VERSION[];
 constexpr char Config::CLI_EXPORT_DEFAULT_SETTINGS[];
@@ -2884,7 +2885,7 @@ bool Config::ParseConfigFile(const string &file, ConfigFileType configFileType)
     }
 
 #if !defined(DISABLE_MQTT)
-    LOGM_INFO(TAG, "Successfully fetched JSON config file: %s", Sanitize(contents).c_str());
+    LOGM_INFO(TAG, "Successfully fetched JSON config file from %s : %s", expandedPath.c_str(), Sanitize(contents).c_str());
 #endif
     setting.close();
 

source/config/Config.h

@@ -486,6 +486,7 @@ namespace Aws
                 static constexpr char DEFAULT_CONFIG_DIR[] = "~/.aws-iot-device-client/";
                 static constexpr char DEFAULT_KEY_DIR[] = "~/.aws-iot-device-client/keys/";
                 static constexpr char DEFAULT_CONFIG_FILE[] = "~/.aws-iot-device-client/aws-iot-device-client.conf";
+                static constexpr char DEFAULT_ROOT_CONFIG_FILE[] = "/etc/.aws-iot-device-client/aws-iot-device-client.conf";
                 static constexpr char DEFAULT_FLEET_PROVISIONING_RUNTIME_CONFIG_FILE[] =
                     "~/.aws-iot-device-client/aws-iot-device-client-runtime.conf";
                 static constexpr char DEFAULT_HTTP_PROXY_CONFIG_FILE[] = "~/.aws-iot-device-client/http-proxy.conf";

source/shadow/ConfigShadow.cpp

@@ -19,10 +19,31 @@ using namespace Aws::Iotshadow;
 using namespace Aws::Iot::DeviceClient::Shadow;
 using namespace Aws::Iot::DeviceClient::Util;
 using namespace Aws::Iot::DeviceClient::Logging;
+using namespace Aws::Iot::DeviceClient;
 
 constexpr char ConfigShadow::TAG[];
 constexpr char ConfigShadow::DEFAULT_CONFIG_SHADOW_NAME[];
 constexpr int ConfigShadow::DEFAULT_WAIT_TIME_SECONDS;
+
+void ConfigShadow::updateLocalConfigFile(PlainConfig &config, const char* configFilePath)const
+{
+    ofstream configFile(configFilePath);
+    JsonObject jsonObj;
+    // Convert config to JSON
+    config.SerializeToObject(jsonObj);  
+
+    if (configFile.is_open())
+    {
+        configFile << jsonObj.View().WriteReadable();
+        configFile.close();
+        LOGM_INFO(TAG, "Updated configuration saved locally to disk at: %s", configFilePath);
+    }
+    else
+    {
+    LOGM_WARN(TAG, "Failed to open config file: %s, Error: %s", configFilePath, strerror(errno));
+    }
+}
+
 void ConfigShadow::getNamedShadowRejectedHandler(Iotshadow::ErrorResponse *errorResponse, int ioError)
 {
     if (ioError)
@@ -352,6 +373,17 @@ void ConfigShadow::resetClientConfigWithJSON(
                 PlainConfig::JSON_KEY_SAMPLE_SHADOW);
         }
     }
+
+    // Save the updated configuration to a local file for persistence
+    JsonObject jsonObj;
+    config.SerializeToObject(jsonObj);  
+
+    const char* jsonStr = jsonObj.View().WriteReadable().c_str();
+    LOGM_INFO(TAG, "Updating device configuration files with the following: %s", jsonStr);
+
+    string userConfig = FileUtils::ExtractExpandedPath(Config::DEFAULT_CONFIG_FILE);
+    updateLocalConfigFile(config, userConfig.c_str());
+    updateLocalConfigFile(config, Config::DEFAULT_ROOT_CONFIG_FILE);
 }
 
 void ConfigShadow::updateShadowWithLocalConfig(Iotshadow::IotShadowClient iotShadowClient, PlainConfig &config)

source/shadow/ConfigShadow.h

@@ -200,6 +200,14 @@ namespace Aws
                      * @param jsonObj contains all device client features' configuration
                      */
                     void loadFeatureConfigIntoJsonObject(PlainConfig &config, Aws::Crt::JsonObject &jsonObj) const;
+                    /**
+                     * \brief Updates the local configuration file of device client with the config shadow update 
+                     * received from the AWS IOT core for persistence of the new device configuration 
+                     * @param config device client local configuration
+                     * @param configFilePath file path of the local aws-iot-device-client.conf
+                     */
+                    void updateLocalConfigFile(PlainConfig &config,  const char* configFilePath) const;
+
                 };
             } // namespace Shadow
         }     // namespace DeviceClient