config_format: yaml: add support for input routes and outputs

Signed-off-by: Eduardo Silva <eduardo@chronosphere.io>

Author: edsiper

src/config_format/flb_cf_yaml.c

@@ -754,7 +754,9 @@ static enum status state_copy_into_properties(struct parser_state *state, struct
     struct cfl_kvpair *kvp;
     struct cfl_variant *var;
     struct cfl_array *arr;
-    int idx;
+    size_t idx;
+    size_t entry_count;
+    int array_all_strings;
 
     cfl_list_foreach(head, &state->keyvals->list) {
         kvp = cfl_list_entry(head, struct cfl_kvpair, _head);
@@ -773,33 +775,57 @@ static enum status state_copy_into_properties(struct parser_state *state, struct
             }
             break;
         case CFL_VARIANT_ARRAY:
-            arr = flb_cf_section_property_add_list(conf, properties,
-                                                    kvp->key, cfl_sds_len(kvp->key));
+            entry_count = kvp->val->data.as_array->entry_count;
+            array_all_strings = 1;
 
-            if (arr == NULL) {
-                flb_error("unable to add property list");
-                return YAML_FAILURE;
-            }
-            for (idx = 0; idx < kvp->val->data.as_array->entry_count; idx++) {
+            for (idx = 0; idx < entry_count; idx++) {
                 var = cfl_array_fetch_by_index(kvp->val->data.as_array, idx);
+                if (var == NULL || var->type != CFL_VARIANT_STRING) {
+                    array_all_strings = 0;
+                    break;
+                }
+            }
+
+            if (array_all_strings == 1) {
+                arr = flb_cf_section_property_add_list(conf, properties,
+                                                        kvp->key, cfl_sds_len(kvp->key));
 
-                if (var == NULL) {
-                    flb_error("unable to retrieve from array by index");
+                if (arr == NULL) {
+                    flb_error("unable to add property list");
                     return YAML_FAILURE;
                 }
-                switch (var->type) {
-                case CFL_VARIANT_STRING:
+
+                for (idx = 0; idx < entry_count; idx++) {
+                    var = cfl_array_fetch_by_index(kvp->val->data.as_array, idx);
 
                     if (cfl_array_append_string(arr, var->data.as_string) < 0) {
                         flb_error("unable to append string to array");
                         return YAML_FAILURE;
                     }
-                    break;
-                default:
-                    flb_error("unable to copy value for property");
+                }
+            }
+            else {
+                if (flb_cf_section_property_add_variant(conf,
+                                                         properties,
+                                                         kvp->key,
+                                                         cfl_sds_len(kvp->key),
+                                                         kvp->val) == NULL) {
+                    flb_error("unable to add variant property");
                     return YAML_FAILURE;
                 }
+                kvp->val = NULL;
+            }
+            break;
+        case CFL_VARIANT_KVLIST:
+            if (flb_cf_section_property_add_variant(conf,
+                                                     properties,
+                                                     kvp->key,
+                                                     cfl_sds_len(kvp->key),
+                                                     kvp->val) == NULL) {
+                flb_error("unable to add variant property");
+                return YAML_FAILURE;
             }
+            kvp->val = NULL;
             break;
         default:
             flb_error("unknown value type for properties: %d", kvp->val->type);
@@ -1990,6 +2016,10 @@ static int consume_event(struct flb_cf *conf, struct local_ctx *ctx,
             if (state->section == SECTION_PROCESSOR) {
                 state = state_push_variant(ctx, state, 0);
             }
+            else if (strcmp(state->key, "routes") == 0 ||
+                     strcmp(state->key, "processors") == 0) {
+                state = state_push_variant(ctx, state, 0);
+            }
             else {
                 state = state_push_witharr(ctx, state, STATE_PLUGIN_VAL_LIST);
             }
@@ -2013,17 +2043,14 @@ static int consume_event(struct flb_cf *conf, struct local_ctx *ctx,
                 break;
             }
 
-            if (strcmp(state->key, "processors") == 0) {
-                state = state_push(ctx, STATE_INPUT_PROCESSORS);
+            if (strcmp(state->key, "routes") == 0 ||
+                strcmp(state->key, "processors") == 0) {
+                state = state_push_variant(ctx, state, 1);
 
                 if (state == NULL) {
                     flb_error("unable to allocate state");
                     return YAML_FAILURE;
                 }
-
-                if (state_create_group(conf, state, "processors") == YAML_FAILURE) {
-                    return YAML_FAILURE;
-                }
                 break;
             }