Updating local policy, metrics, and local update trigger

components/security_apps/orchestration/update_communication/declarative_policy_utils.cc

@@ -27,7 +27,7 @@ DeclarativePolicyUtils::init()
         auto mainloop = Singleton::Consume<I_MainLoop>::by<DeclarativePolicyUtils>();
         mainloop->addRecurringRoutine(
             I_MainLoop::RoutineType::Offline,
-            chrono::minutes(1),
+            chrono::seconds(30),
             [&] () { periodicPolicyLoad(); },
             "Automatic Policy Loading"
         );

components/security_apps/orchestration/update_communication/fog_communication.cc

@@ -32,7 +32,7 @@ void
 FogCommunication::init()
 {
     FogAuthenticator::init();
-    declarative_policy_utils.init();
+    i_declarative_policy = Singleton::Consume<I_DeclarativePolicy>::from<DeclarativePolicyUtils>();
 }
 
 Maybe<void>
@@ -67,15 +67,15 @@ FogCommunication::getUpdate(CheckUpdateRequest &request)
         Maybe<string> maybe_new_data = request.getData();
         string data_checksum = maybe_new_data.ok() ? maybe_new_data.unpack() : "";
 
-        if (declarative_policy_utils.shouldApplyPolicy()) {
-            string policy_response = declarative_policy_utils.getUpdate(request);
+        if (i_declarative_policy->shouldApplyPolicy()) {
+            string policy_response = i_declarative_policy->getUpdate(request);
             if (!policy_response.empty()) {
                 dbgTrace(D_ORCHESTRATOR) << "Apply policy - declarative mode";
                 auto agent_details = Singleton::Consume<I_AgentDetails>::by<DeclarativePolicyUtils>();
                 auto maybe_fog_address = agent_details->getFogDomain();
                 string fog_address = maybe_fog_address.ok() ? maybe_fog_address.unpack() : "";
 
-                declarative_policy_utils.sendUpdatesToFog(
+                i_declarative_policy->sendUpdatesToFog(
                     unpacked_access_token,
                     agent_details->getTenantId(),
                     agent_details->getProfileId(),
@@ -83,7 +83,6 @@ FogCommunication::getUpdate(CheckUpdateRequest &request)
                 );
             }
             request = CheckUpdateRequest(manifest_checksum, policy_response, settings_checksum, data_checksum, "", "");
-            declarative_policy_utils.turnOffApplyPolicyFlag();
         } else {
             request = CheckUpdateRequest(manifest_checksum, "", settings_checksum, data_checksum, "", "");
         }
@@ -103,7 +102,7 @@ FogCommunication::downloadAttributeFile(const GetResourceFile &resourse_file)
     string policy_mgmt_mode = getSettingWithDefault<string>("management", "profileManagedMode");
     if (policy_mgmt_mode == "declarative" && resourse_file.getFileName() =="policy") {
         dbgDebug(D_ORCHESTRATOR) << "Download policy on declarative mode - returnig the local policy";
-        return declarative_policy_utils.getCurrPolicy();
+        return i_declarative_policy->getCurrPolicy();
     }
     static const string file_attribute_str = "/api/v2/agents/resources/";
     Maybe<string> attribute_file = Singleton::Consume<I_Messaging>::by<FogCommunication>()->downloadFile(

components/security_apps/orchestration/update_communication/hybrid_communication.cc

@@ -35,7 +35,7 @@ void
 HybridCommunication::init()
 {
     FogAuthenticator::init();
-    declarative_policy_utils.init();
+    i_declarative_policy = Singleton::Consume<I_DeclarativePolicy>::from<DeclarativePolicyUtils>();
     dbgTrace(D_ORCHESTRATOR) << "Initializing the Hybrid Communication Component";
     if (getConfigurationFlag("otp") != "") {
         otp = getConfigurationFlag("otp");
@@ -69,14 +69,14 @@ HybridCommunication::getUpdate(CheckUpdateRequest &request)
         dbgWarning(D_ORCHESTRATOR) << "Acccess Token not available.";
     }
 
-    if (!declarative_policy_utils.shouldApplyPolicy()) {
+    if (!i_declarative_policy->shouldApplyPolicy()) {
         request = CheckUpdateRequest(manifest_checksum, "", "", "", "", "");
         return Maybe<void>();
     }
 
     dbgTrace(D_ORCHESTRATOR) << "Getting policy update in Hybrid Communication";
 
-    string policy_response = declarative_policy_utils.getUpdate(request);
+    string policy_response = i_declarative_policy->getUpdate(request);
 
     auto env = Singleton::Consume<I_EnvDetails>::by<HybridCommunication>()->getEnvType();
     if (env == EnvType::K8S && !policy_response.empty()) {
@@ -123,7 +123,6 @@ HybridCommunication::getUpdate(CheckUpdateRequest &request)
     }
 
     request = CheckUpdateRequest(manifest_checksum, policy_response, "", "", "", "");
-    declarative_policy_utils.turnOffApplyPolicyFlag();
 
     return Maybe<void>();
 }
@@ -136,7 +135,7 @@ HybridCommunication::downloadAttributeFile(const GetResourceFile &resourse_file)
         << resourse_file.getFileName();
 
     if (resourse_file.getFileName() =="policy") {
-        return declarative_policy_utils.getCurrPolicy();
+        return i_declarative_policy->getCurrPolicy();
     }
     if (resourse_file.getFileName() == "manifest") {
         if (!access_token.ok()) return genError("Acccess Token not available.");

components/security_apps/orchestration/update_communication/update_communication.cc

@@ -57,6 +57,7 @@ public:
     void
     init()
     {
+        declarative_policy_utils.init();
         auto rest = Singleton::Consume<I_RestApi>::by<UpdateCommunication>();
         rest->addRestCall<UpdateCommunication::Impl>(RestAction::SET, "orchestration-mode");
         setMode();
@@ -104,22 +105,17 @@ private:
     {
         if (getConfigurationFlag("orchestration-mode") == "offline_mode") {
             i_update_comm_impl = make_unique<LocalCommunication>();
-            LocalCommunication *local_comm = static_cast<LocalCommunication*>(i_update_comm_impl.get());
-            local_comm->init();
-            return;
         } else if (getConfigurationFlag("orchestration-mode") == "hybrid_mode") {
             i_update_comm_impl = make_unique<HybridCommunication>();
-            HybridCommunication *local_comm = static_cast<HybridCommunication*>(i_update_comm_impl.get());
-            local_comm->init();
-            return;
+        } else {
+            i_update_comm_impl = make_unique<FogCommunication>();
         }
 
-        i_update_comm_impl = make_unique<FogCommunication>();
-        FogCommunication *fog_comm = static_cast<FogCommunication*>(i_update_comm_impl.get());
-        fog_comm->init();
+        i_update_comm_impl->init();
     }
 
     std::unique_ptr<I_UpdateCommunication> i_update_comm_impl = nullptr;
+    DeclarativePolicyUtils declarative_policy_utils;
     S2C_LABEL_PARAM(string, status, "status");
 };
 

components/security_apps/orchestration/update_communication/update_communication_ut/CMakeLists.txt

@@ -2,6 +2,6 @@ link_directories(${BOOST_ROOT}/lib)
 
 add_unit_test(
     update_communication_ut
-    "local_communication_ut.cc"
+    "local_communication_ut.cc;fog_communication_ut.cc"
     "rest;version;orchestration_modules;update_communication;singleton;config;metric;event_is;logging;agent_details;-lboost_regex;local_policy_mgmt_gen;connkey;"
 )