commit e82d73952c3f412d2f2c4a9ed8f40a7f14f38e3a
author Jason Ling <jasonling@google.com> Thu Nov 19 13:27:02 2020 -0800
committer Patrick Venture <venture@google.com> Mon Nov 30 19:48:33 2020 +0000
tree 3d3d306e96bdd38de08a5e6421035264a37d4a4a
parent 85e54f1bf6867cb53723be1196da28225b6525d3

json builder: fix error with buildHandlerConfigs

Problem: mistakenly defined the implementation of buildHandlerConfigs in
a separate cpp file. This breaks calling buildHandlerConfigs from a
derived class.

Solution: move implementation of buildHandlerConfigs into the header.

unit tests added:
firmware_json_unittest.cpp * add a test to parse json from file
                           * add a test to parse an invalid json file

Signed-off-by: Jason Ling <jasonling@google.com>
Change-Id: I5cd93ad01a329850a8ee516fae8a35339c991ae0

bmc/buildjson.hpp

diff --git a/bmc/buildjson.hpp b/bmc/buildjson.hpp
index 4aae00d..53773c2 100644
--- a/bmc/buildjson.hpp
+++ b/bmc/buildjson.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "fs.hpp"
 #include "general_systemd.hpp"
 #include "image_handler.hpp"
 
@@ -11,9 +12,15 @@
 
 namespace ipmi_flash
 {
+/**
+ * build a systemd file triggerable action from json data
+ */
 std::unique_ptr<TriggerableActionInterface>
     buildFileSystemd(const nlohmann::json& data);
 
+/**
+ * build a systemd triggerable action from json data
+ */
 std::unique_ptr<TriggerableActionInterface>
     buildSystemd(const nlohmann::json& data);
 
@@ -73,7 +80,35 @@
      * @return list of HandlerConfig objects.
      */
     std::vector<HandlerConfig<T>>
-        buildHandlerConfigs(const std::string& directory);
+        buildHandlerConfigs(const std::string& directory)
+    {
+
+        std::vector<HandlerConfig<T>> output;
+
+        std::vector<std::string> jsonPaths = GetJsonList(directory);
+        for (const auto& path : jsonPaths)
+        {
+            std::ifstream jsonFile(path);
+            if (!jsonFile.is_open())
+            {
+                std::fprintf(stderr, "Unable to open json file: %s\n",
+                             path.c_str());
+                continue;
+            }
+
+            auto data = nlohmann::json::parse(jsonFile, nullptr, false);
+            if (data.is_discarded())
+            {
+                std::fprintf(stderr, "Parsing json failed: %s\n", path.c_str());
+                continue;
+            }
+
+            std::vector<HandlerConfig<T>> configs = buildHandlerFromJson(data);
+            std::move(configs.begin(), configs.end(),
+                      std::back_inserter(output));
+        }
+        return output;
+    };
     /**
      * Given a list of handlers as json data, construct the appropriate
      * HandlerConfig objects.  This method is meant to be called per json