refactor: update ZeroBus plugin to require URL scheme for endpoint

Changed the configuration property from 'zerobus_endpoint' to 'endpoint' to enforce the inclusion of a URL scheme (http:// or https://). Updated related error messages and context handling to reflect this change. The workspace_url will now automatically prepend https:// if no scheme is provided.

Signed-off-by: [Your Name] <your.email@example.com>

Author: mats16

plugins/out_zerobus/zerobus.c

@@ -268,16 +268,22 @@ static int cb_zerobus_init(struct flb_output_instance *ins,
     }
 
     /*
-     * URL fields need https:// prepending when no scheme is present
-     * (the ZeroBus SDK requires a scheme), so they are read manually.
+     * endpoint must include a URL scheme (https:// or http://).
+     * workspace_url gets https:// prepended when no scheme is present.
      */
-    tmp = flb_output_get_property("zerobus_endpoint", ins);
+    tmp = flb_output_get_property("endpoint", ins);
     if (!tmp || strlen(tmp) == 0) {
-        flb_plg_error(ins, "'zerobus_endpoint' is required");
+        flb_plg_error(ins, "'endpoint' is required");
         goto init_error;
     }
-    ctx->zerobus_endpoint = ensure_url_scheme(tmp);
-    if (!ctx->zerobus_endpoint) {
+    if (strncmp(tmp, "https://", 8) != 0 && strncmp(tmp, "http://", 7) != 0) {
+        flb_plg_error(ins,
+                      "'endpoint' must include a URL scheme "
+                      "(e.g. https://...), got: %s", tmp);
+        goto init_error;
+    }
+    ctx->endpoint = flb_sds_create(tmp);
+    if (!ctx->endpoint) {
         goto init_error;
     }
 
@@ -305,15 +311,15 @@ static int cb_zerobus_init(struct flb_output_instance *ins,
     }
 
     memset(&result, 0, sizeof(result));
-    ctx->sdk = zerobus_sdk_new(ctx->zerobus_endpoint,
+    ctx->sdk = zerobus_sdk_new(ctx->endpoint,
                                ctx->workspace_url,
                                &result);
     if (!ctx->sdk || !result.success) {
         log_cresult_error(ins, &result, "failed to create ZeroBus SDK");
         goto init_error;
     }
 
-    if (strncmp(ctx->zerobus_endpoint, "http://", 7) == 0) {
+    if (strncmp(ctx->endpoint, "http://", 7) == 0) {
         zerobus_sdk_set_use_tls(ctx->sdk, false);
     }
 
@@ -336,14 +342,14 @@ static int cb_zerobus_init(struct flb_output_instance *ins,
     }
 
     flb_plg_info(ins, "connected to %s, table: %s",
-                 ctx->zerobus_endpoint, ctx->table_name);
+                 ctx->endpoint, ctx->table_name);
 
     flb_output_set_context(ins, ctx);
     return 0;
 
 init_error:
-    if (ctx->zerobus_endpoint) {
-        flb_sds_destroy(ctx->zerobus_endpoint);
+    if (ctx->endpoint) {
+        flb_sds_destroy(ctx->endpoint);
     }
     if (ctx->workspace_url) {
         flb_sds_destroy(ctx->workspace_url);
@@ -500,8 +506,8 @@ static int cb_zerobus_exit(void *data, struct flb_config *config)
         zerobus_sdk_free(ctx->sdk);
     }
 
-    if (ctx->zerobus_endpoint) {
-        flb_sds_destroy(ctx->zerobus_endpoint);
+    if (ctx->endpoint) {
+        flb_sds_destroy(ctx->endpoint);
     }
     if (ctx->workspace_url) {
         flb_sds_destroy(ctx->workspace_url);
@@ -513,9 +519,9 @@ static int cb_zerobus_exit(void *data, struct flb_config *config)
 
 static struct flb_config_map config_map[] = {
     {
-     FLB_CONFIG_MAP_STR, "zerobus_endpoint", NULL,
+     FLB_CONFIG_MAP_STR, "endpoint", NULL,
      0, FLB_FALSE, 0,
-     "ZeroBus gRPC endpoint URL"
+     "ZeroBus gRPC endpoint URL (must include https:// scheme)"
     },
     {
      FLB_CONFIG_MAP_STR, "workspace_url", NULL,

plugins/out_zerobus/zerobus.h

@@ -110,9 +110,9 @@ struct flb_out_zerobus {
     CZerobusSdk    *sdk;
     CZerobusStream *stream;
 
-    /* Required config -- URL fields are built manually (need scheme fix) */
-    flb_sds_t zerobus_endpoint;
-    flb_sds_t workspace_url;
+    /* Required config -- URL fields are read manually */
+    flb_sds_t endpoint;  /* must include https:// scheme */
+    flb_sds_t workspace_url;     /* https:// auto-prepended if missing */
 
     /* Required config -- auto-populated by config_map */
     flb_sds_t table_name;