in_forward: Address review comments

Signed-off-by: Hiroshi Hatake <[email protected]>
fluent · Dec 6, 2024 · fcda579 · fcda579
1 parent 48d52cc
commit fcda579
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/plugins/in_forward/fw.c b/plugins/in_forward/fw.c
@@ -415,7 +415,7 @@ static struct flb_config_map config_map[] = {
    },
    {
     FLB_CONFIG_MAP_STR, "shared_key", NULL,
-    0, FLB_FALSE, 0,
+    0, FLB_TRUE, offsetof(struct flb_in_fw_config, shared_key),
     "Shared key for authentication"
    },
    {

diff --git a/plugins/in_forward/fw_config.c b/plugins/in_forward/fw_config.c
@@ -86,24 +86,12 @@ struct flb_in_fw_config *fw_config_init(struct flb_input_instance *i_ins)
     }
 
     /* Shared Key */
-    p = flb_input_get_property("empty_shared_key", i_ins);
-    if (p && flb_utils_bool(p)) {
-        config->empty_shared_key = FLB_TRUE;
-    }
-    else {
-        config->empty_shared_key = FLB_FALSE;
-    }
-
-    p = flb_input_get_property("shared_key", i_ins);
     if (config->empty_shared_key) {
+        if (config->shared_key) {
+            flb_sds_destroy(config->shared_key);
+        }
         config->shared_key = flb_sds_create("");
     }
-    else if (p) {
-        config->shared_key = flb_sds_create(p);
-    }
-    else {
-        config->shared_key = NULL;
-    }
 
     /* Self Hostname */
     p = flb_input_get_property("self_hostname", i_ins);