Merge pull request #228 from Sambruk/bugfix/227

Dummy objects placed in cache to force an update are now proper JSON.

Author: joesiltberg

src/main.cpp

@@ -126,7 +126,7 @@ void make_dirty(std::shared_ptr<rendered_object_list> objects, const std::vector
         auto obj = objects->get_object(uuid);
 
         if (obj) {
-            auto new_obj = std::make_shared<rendered_object>(obj->get_id(), obj->get_type(), std::to_string(time(NULL)));
+            auto new_obj = std::make_shared<rendered_object>(obj->get_id(), obj->get_type(), dummy_SCIM_object(obj->get_id(), "force update"));
             objects->remove_object(uuid);
             objects->add_object(new_obj);
         }

src/scim.cpp

@@ -467,8 +467,8 @@ int ScimActions::create_func::operator()(const ScimActions &actions, bool& confl
         actions.scim_new_cache->add_object(std::make_shared<rendered_object>(create));
     else {
         if (conflict) {
-            // Put it in cache, but make sure we update in the next run
-            auto copied_object = std::make_shared<rendered_object>(create.get_id(), create.get_type(), std::to_string(time(NULL)) + " (create conflict)");
+            // Put it in cache, but with a dummy object to make sure we update in the next run
+            auto copied_object = std::make_shared<rendered_object>(create.get_id(), create.get_type(), dummy_SCIM_object(create.get_id(), "create conflict"));
             actions.scim_new_cache->add_object(copied_object);
         }
         return -1;
@@ -497,8 +497,8 @@ int ScimActions::update_func::operator()(const ScimActions &actions, bool& non_e
     /* Insert copied object into new cache */
     if (!response_json) {
         if (!non_existent) {
-            // Keep it in cache, but make sure we retry the update next run
-            auto copied_object = std::make_shared<rendered_object>(object.get_id(), object.get_type(), std::to_string(time(NULL)) + " (failed update)");
+            // Keep it in cache, but with a dummy object to make sure we retry the update next run
+            auto copied_object = std::make_shared<rendered_object>(object.get_id(), object.get_type(), dummy_SCIM_object(object.get_id(), "failed update"));
             actions.scim_new_cache->add_object(copied_object);
         }
         return -1;

src/utility/utils.cpp

@@ -230,4 +230,8 @@ void parse_override(const std::string& override_str,
 
     variable = override_str.substr(0, pos);
     value = override_str.substr(pos+1);
-}
+}
+
+std::string dummy_SCIM_object(const std::string& uuid, const std::string& dbg) {
+    return "{\"externalId\":\"" + uuid + "\",\"dbg\":\"" + dbg + "\"}";
+}

src/utility/utils.hpp

@@ -126,4 +126,20 @@ void parse_override(const std::string& override_str,
                     std::string& variable,
                     std::string& value);
 
+/**
+ * Creates a JSON object for a dummy SCIM object.
+ * 
+ * This is used when we want to place something in the cache file to force an
+ * update. The object should be in JSON format so print-cache will work, and
+ * it will include an "externalId" attribute. It will also include a "dbg"
+ * attribute to give some context to why the odd object is in the cache file
+ * in case anyone is looking at it.
+ * 
+ * The whole returned object should be smaller than any real SCIM object in
+ * order for the cache file size estimate to work. Since all real SCIM objects
+ * should include a "scheme" and attributes other than externalId, this shouldn't
+ * be a problem as long as the dbg string isn't long.
+ */
+std::string dummy_SCIM_object(const std::string& uuid, const std::string& dbg);
+
 #endif //SIMPLESCIM_UTILS_HPP