respond to feedback

Author: tkennedy1-godaddy

plugins/out_es/es.c

@@ -824,8 +824,7 @@ static void cb_es_flush(struct flb_event_chunk *event_chunk,
     struct flb_http_client *c;
     flb_sds_t signature = NULL;
     int compressed = FLB_FALSE;
-    flb_sds_t header_buffer;
-    flb_sds_t header_line;
+    flb_sds_t header_line = NULL;
 
     /* Get upstream connection */
     u_conn = flb_upstream_conn_get(ctx->u);
@@ -1123,7 +1122,7 @@ static struct flb_config_map config_map[] = {
     {
     FLB_CONFIG_MAP_STR, "http_api_key", NULL,
     0, FLB_TRUE, offsetof(struct flb_elasticsearch, http_api_key),
-    "API key for Elasticsearch"
+    "Base-64 encoded API key credential for Elasticsearch"
     },
 
     /* HTTP Compression */

plugins/out_es/es_conf.c

@@ -143,7 +143,6 @@ struct flb_elasticsearch *flb_es_conf_create(struct flb_output_instance *ins,
 #endif
     char *cloud_port_char;
     char *cloud_host = NULL;
-    char *http_api_key = NULL;
     int cloud_host_port = 0;
     int cloud_port = FLB_ES_DEFAULT_HTTPS_PORT;
     struct flb_uri *uri = ins->host.uri;

tests/runtime/out_elasticsearch.c

@@ -12,9 +12,6 @@ static void cb_check_http_api_key(void *ctx, int ffd,
                                 size_t res_size, void *data)
 {
     char *api_key = data;
-    char expected_header[256];
-
-    snprintf(expected_header, sizeof(expected_header), "ApiKey %s", api_key);
 
     TEST_CHECK(api_key != NULL);
     TEST_CHECK(strlen(api_key) > 0);