Added evaluation_order json serialization

victormlg · victormlg · commit 2270d9264121 · 2025-11-10T15:04:16.000+01:00
Signed-off-by: Victor Moene &lt;victor.moene@northern.tech&gt;
diff --git a/libpromises/eval_context.c b/libpromises/eval_context.c
@@ -4074,6 +4074,32 @@ void EvalContextSetAgentEvalOrder(EvalContext *ctx, EvalOrder eval_order)
     ctx->agent_eval_order = eval_order;
 }
 
+const char *EvalContextEvaluationOrderToString(EvalOrder evaluation_order)
+{
+    if (evaluation_order == EVAL_ORDER_CLASSIC)
+    {
+        return "classic";
+    }
+    if (evaluation_order == EVAL_ORDER_TOP_DOWN)
+    {
+        return "top_down";
+    }
+    return "undefined";
+}
+
+EvalOrder EvalContextEvaluationOrderFromString(const char *evaluation_order_string)
+{
+    if (StringEqual(evaluation_order_string, "classic"))
+    {
+        return EVAL_ORDER_CLASSIC;
+    }
+    if (StringEqual(evaluation_order_string, "top_down"))
+    {
+        return EVAL_ORDER_TOP_DOWN;
+    }
+    return EVAL_ORDER_UNDEFINED;
+}
+
 bool EvalContextIsClassicOrder(EvalContext *ctx, const Bundle *bp)
 {
     assert(ctx != NULL);
diff --git a/libpromises/eval_context.h b/libpromises/eval_context.h
@@ -454,6 +454,8 @@ void EvalContextProfilingEnd(EvalContext *ctx, const Policy *policy);
 
 void EvalContextSetCommonEvalOrder(EvalContext *ctx, EvalOrder eval_order);
 void EvalContextSetAgentEvalOrder(EvalContext *ctx, EvalOrder eval_order);
+const char *EvalContextEvaluationOrderToString(EvalOrder evaluation_order);
+EvalOrder EvalContextEvaluationOrderFromString(const char *evaluation_order_string);
 bool EvalContextIsClassicOrder(EvalContext *ctx, const Bundle *bp);
 
 #endif
diff --git a/libpromises/expand.c b/libpromises/expand.c
@@ -844,6 +844,7 @@ void BundleResolve(EvalContext *ctx, const Bundle *bundle)
 static void ResolveControlBody(EvalContext *ctx, GenericAgentConfig *config,
                                const Body *control_body)
 {
+    assert(control_body != NULL);
     const char *filename = control_body->source_path;
 
     assert(CFG_CONTROLBODY[COMMON_CONTROL_MAX].lval == NULL);
diff --git a/libpromises/parser.c b/libpromises/parser.c
@@ -106,6 +106,8 @@ static void ParserStateReset(ParserState *p, bool discard)
 
 static void ParserStateClean(ParserState *p)
 {
+    assert(p != NULL);
+
     free(p->current_namespace);
     p->current_namespace = NULL;
 
diff --git a/libpromises/policy.c b/libpromises/policy.c
@@ -1908,6 +1908,7 @@ static JsonElement *BundleContextsToJson(const Seq *promises)
  */
 JsonElement *BundleToJson(const Bundle *bundle)
 {
+    assert(bundle != NULL);
     JsonElement *json_bundle = JsonObjectCreate(10);
 
     if (bundle->source_path)
@@ -1919,6 +1920,7 @@ JsonElement *BundleToJson(const Bundle *bundle)
     JsonObjectAppendString(json_bundle, "namespace", bundle->ns);
     JsonObjectAppendString(json_bundle, "name", bundle->name);
     JsonObjectAppendString(json_bundle, "bundleType", bundle->type);
+    JsonObjectAppendString(json_bundle, "evaluation_order", EvalContextEvaluationOrderToString(bundle->evaluation_order));
 
     {
         JsonElement *json_args = JsonArrayCreate(10);
@@ -2303,6 +2305,7 @@ static Bundle *PolicyAppendBundleJson(Policy *policy, JsonElement *json_bundle)
     const char *name = JsonObjectGetAsString(json_bundle, "name");
     const char *type = JsonObjectGetAsString(json_bundle, "bundleType");
     const char *source_path = JsonObjectGetAsString(json_bundle, "sourcePath");
+    const char *evaluation_order_string = JsonObjectGetAsString(json_bundle, "evaluation_order");
 
     Rlist *args = NULL;
     {
@@ -2314,7 +2317,7 @@ static Bundle *PolicyAppendBundleJson(Policy *policy, JsonElement *json_bundle)
     }
 
     // TODO: add eval order in json
-    Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EVAL_ORDER_UNDEFINED);
+    Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EvalContextEvaluationOrderFromString(evaluation_order_string));
 
     {
         JsonElement *json_promise_types = JsonObjectGetAsArray(json_bundle, "promiseTypes");
diff --git a/tests/unit/expand_test.c b/tests/unit/expand_test.c
@@ -81,7 +81,7 @@ static void test_map_iterators_from_rval_empty(void **state)
     EvalContext *ctx = *state;
 
     Policy *p = PolicyNew();
-    Bundle *bp = PolicyAppendBundle(p, "default", "none", "agent", NULL, NULL);
+    Bundle *bp = PolicyAppendBundle(p, "default", "none", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
 
     Rlist *lists = NULL;
     Rlist *scalars = NULL;
@@ -99,7 +99,7 @@ static void test_map_iterators_from_rval_literal(void **state)
 {
     EvalContext *ctx = *state;
     Policy *p = PolicyNew();
-    Bundle *bp = PolicyAppendBundle(p, "default", "none", "agent", NULL, NULL);
+    Bundle *bp = PolicyAppendBundle(p, "default", "none", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
 
     Rlist *lists = NULL;
     Rlist *scalars = NULL;
@@ -117,7 +117,7 @@ static void test_map_iterators_from_rval_naked_list_var(void **state)
 {
     EvalContext *ctx = *state;
     Policy *p = PolicyNew();
-    Bundle *bp = PolicyAppendBundle(p, "default", "scope", "agent", NULL, NULL);
+    Bundle *bp = PolicyAppendBundle(p, "default", "scope", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
 
     {
         Rlist *list = NULL;
@@ -190,7 +190,7 @@ static void test_map_iterators_from_rval_naked_list_var_namespace(void **state)
 {
     EvalContext *ctx = *state;
     Policy *p = PolicyNew();
-    Bundle *bp = PolicyAppendBundle(p, "ns", "scope", "agent", NULL, NULL);
+    Bundle *bp = PolicyAppendBundle(p, "ns", "scope", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
 
     {
         Rlist *list = NULL;
@@ -421,7 +421,7 @@ static void test_expand_promise_array_with_scalar_arg(void **state)
     }
 
     Policy *policy = PolicyNew();
-    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL);
+    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(foo[$(bar)])", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 
@@ -476,7 +476,7 @@ static void test_expand_promise_slist(void **state)
 
 
     Policy *policy = PolicyNew();
-    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL);
+    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(foo)", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 
@@ -544,7 +544,7 @@ static void test_expand_promise_array_with_slist_arg(void **state)
 
 
     Policy *policy = PolicyNew();
-    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL);
+    Bundle *bundle = PolicyAppendBundle(policy, NamespaceDefault(), "bundle", "agent", NULL, NULL, EVAL_ORDER_UNDEFINED);
     BundleSection *section = BundleAppendSection(bundle, "dummy");
     Promise *promise = BundleSectionAppendPromise(section, "$(arr[$(keys)])", (Rval) { NULL, RVAL_TYPE_NOPROMISEE }, "any", NULL);
 

Original file line number	Diff line number	Diff line change
`@@ -844,6 +844,7 @@ void BundleResolve(EvalContext ctx, const Bundle bundle)`
`844`	`844`	`static void ResolveControlBody(EvalContext ctx, GenericAgentConfig config,`
`845`	`845`	`const Body *control_body)`
`846`	`846`	`{`
	`847`	`+ assert(control_body != NULL);`
`847`	`848`	`const char *filename = control_body->source_path;`
`848`	`849`
`849`	`850`	`assert(CFG_CONTROLBODY[COMMON_CONTROL_MAX].lval == NULL);`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ static void ParserStateReset(ParserState *p, bool discard)`
`106`	`106`
`107`	`107`	`static void ParserStateClean(ParserState *p)`
`108`	`108`	`{`
	`109`	`+ assert(p != NULL);`
	`110`	`+`
`109`	`111`	`free(p->current_namespace);`
`110`	`112`	`p->current_namespace = NULL;`
`111`	`113`
Original file line number	Diff line number	Diff line change
`@@ -1908,6 +1908,7 @@ static JsonElement BundleContextsToJson(const Seq promises)`
`1908`	`1908`	`*/`
`1909`	`1909`	`JsonElement BundleToJson(const Bundle bundle)`
`1910`	`1910`	`{`
	`1911`	`+ assert(bundle != NULL);`
`1911`	`1912`	`JsonElement *json_bundle = JsonObjectCreate(10);`
`1912`	`1913`
`1913`	`1914`	`if (bundle->source_path)`
`@@ -1919,6 +1920,7 @@ JsonElement BundleToJson(const Bundle bundle)`
`1919`	`1920`	`JsonObjectAppendString(json_bundle, "namespace", bundle->ns);`
`1920`	`1921`	`JsonObjectAppendString(json_bundle, "name", bundle->name);`
`1921`	`1922`	`JsonObjectAppendString(json_bundle, "bundleType", bundle->type);`
	`1923`	`+ JsonObjectAppendString(json_bundle, "evaluation_order", EvalContextEvaluationOrderToString(bundle->evaluation_order));`
`1922`	`1924`
`1923`	`1925`	`{`
`1924`	`1926`	`JsonElement *json_args = JsonArrayCreate(10);`
`@@ -2303,6 +2305,7 @@ static Bundle PolicyAppendBundleJson(Policy policy, JsonElement *json_bundle)`
`2303`	`2305`	`const char *name = JsonObjectGetAsString(json_bundle, "name");`
`2304`	`2306`	`const char *type = JsonObjectGetAsString(json_bundle, "bundleType");`
`2305`	`2307`	`const char *source_path = JsonObjectGetAsString(json_bundle, "sourcePath");`
	`2308`	`+ const char *evaluation_order_string = JsonObjectGetAsString(json_bundle, "evaluation_order");`
`2306`	`2309`
`2307`	`2310`	`Rlist *args = NULL;`
`2308`	`2311`	`{`
`@@ -2314,7 +2317,7 @@ static Bundle PolicyAppendBundleJson(Policy policy, JsonElement *json_bundle)`
`2314`	`2317`	`}`
`2315`	`2318`
`2316`	`2319`	`// TODO: add eval order in json`
`2317`		`- Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EVAL_ORDER_UNDEFINED);`
	`2320`	`+ Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EvalContextEvaluationOrderFromString(evaluation_order_string));`
`2318`	`2321`
`2319`	`2322`	`{`
`2320`	`2323`	`JsonElement *json_promise_types = JsonObjectGetAsArray(json_bundle, "promiseTypes");`