Jun 16th update

components/security_apps/orchestration/update_communication/fog_authenticator.cc

@@ -17,14 +17,11 @@
 #include "log_generator.h"
 #include "agent_details.h"
 #include "version.h"
-#include "sasal.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
-SASAL_START // Orchestration - Communication
-
 using namespace std;
 using namespace cereal;
 using HTTPMethod = I_Messaging::Method;
@@ -319,6 +316,7 @@ FogAuthenticator::saveCredentialsToFile(const UserCredentials &user_credentials)
         return false;
     }
 
+
     return orchestration_tools->writeFile(cred_str.unpack(), data_path + user_cred_file_name);
 }
 
@@ -347,6 +345,7 @@ FogAuthenticator::getCredentialsFromFile() const
     if (!encrypted_cred.ok()) return genError(encrypted_cred.getErr());
 
     dbgTrace(D_ORCHESTRATOR) << "Read the user credentials from the file";
+
     return orchestration_tools->jsonStringToObject<UserCredentials>(encrypted_cred.unpack());
 }
 
@@ -568,5 +567,3 @@ FogAuthenticator::init()
     loadRequiredSecurityApps();
     initRestAPI();
 }
-
-SASAL_END

components/security_apps/orchestration/update_communication/fog_communication.cc

@@ -17,14 +17,11 @@
 #include "log_generator.h"
 #include "agent_details.h"
 #include "version.h"
-#include "sasal.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
-SASAL_START // Orchestration - Communication
-
 using namespace std;
 using namespace cereal;
 using HTTPMethod = I_Messaging::Method;
@@ -133,5 +130,3 @@ FogCommunication::sendPolicyVersion(const string &policy_version) const
     }
     return genError("Failed to patch policy version");
 }
-
-SASAL_END

components/security_apps/orchestration/update_communication/hybrid_communication.cc

@@ -18,14 +18,11 @@
 #include "log_generator.h"
 #include "agent_details.h"
 #include "version.h"
-#include "sasal.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
-SASAL_START // Orchestration - Communication
-
 using namespace std;
 using HTTPMethod = I_Messaging::Method;
 
@@ -138,10 +135,9 @@ HybridCommunication::downloadAttributeFile(const GetResourceFile &resourse_file)
         << "Downloading attribute file on hybrid mode, file name: "
         << resourse_file.getFileName();
 
-    if (resourse_file.getFileName() == "policy") {
+    if (resourse_file.getFileName() =="policy") {
         return declarative_policy_utils.getCurrPolicy();
     }
-
     if (resourse_file.getFileName() == "manifest") {
         if (!access_token.ok()) return genError("Acccess Token not available.");
 
@@ -156,7 +152,6 @@ HybridCommunication::downloadAttributeFile(const GetResourceFile &resourse_file)
         );
         return attribute_file;
     }
-
     dbgTrace(D_ORCHESTRATOR) << "Unnecessary attribute files downloading on hybrid mode";
     return string("");
 }
@@ -168,5 +163,3 @@ HybridCommunication::sendPolicyVersion(const string &policy_version) const
     policy_version.empty();
     return Maybe<void>();
 }
-
-SASAL_END

components/security_apps/orchestration/update_communication/local_communication.cc

@@ -13,9 +13,6 @@
 
 #include "local_communication.h"
 #include "config.h"
-#include "sasal.h"
-
-SASAL_START // Orchestration - Communication
 
 using namespace std;
 
@@ -183,5 +180,3 @@ LocalCommunication::sendPolicyVersion(const string &) const
     dbgTrace(D_ORCHESTRATOR) << "Agent in offline mode, no need to send policy version";
     return Maybe<void>();
 }
-
-SASAL_END

components/security_apps/orchestration/update_communication/update_communication.cc

@@ -22,15 +22,12 @@
 #include "log_generator.h"
 #include "agent_details.h"
 #include "version.h"
-#include "sasal.h"
 #include "i_encryptor.h"
 #include "fog_authenticator.h"
 #include "fog_communication.h"
 #include "local_communication.h"
 #include "hybrid_communication.h"
 
-SASAL_START // Orchestration - Communication
-
 using namespace std;
 
 USE_DEBUG_FLAG(D_ORCHESTRATOR);
@@ -145,5 +142,3 @@ UpdateCommunication::fini()
 {
     pimpl->fini();
 }
-
-SASAL_END