From 2c4fec77bb463014c3ba5e6ed0130c39ee130b2f Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Fri, 10 Sep 2021 23:03:29 -0400
Subject: [PATCH] refactor: force-set the type and inputs for a vector sink

Previously, a user could inadvertently override the type or the inputs value by specifying those in their config. Instead, we force-set these so that users do not have potentially invalid config.
---
 plugins/logs/functions.go | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/plugins/logs/functions.go b/plugins/logs/functions.go
index 85fcac236..f1d146fbd 100644
--- a/plugins/logs/functions.go
+++ b/plugins/logs/functions.go
@@ -128,23 +128,9 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
 
 	u.Scheme = strings.ReplaceAll(u.Scheme, "-", "_")
 
-	t := fmt.Sprintf("type=%s", u.Scheme)
-	i := fmt.Sprintf("inputs[]=docker-source:%s", appName)
-	if appName == "--global" {
-		i = "inputs[]=docker-global-source"
-	}
-	if appName == "--null" {
-		i = "inputs[]=docker-null-source"
-	}
-
-	initialQuery := fmt.Sprintf("%s&%s", t, i)
 	query := u.RawQuery
-	if query == "" {
-		query = initialQuery
-	} else if strings.HasPrefix(query, "&") {
-		query = fmt.Sprintf("%s%s", initialQuery, query)
-	} else {
-		query = fmt.Sprintf("%s&%s", initialQuery, query)
+	if strings.HasPrefix(query, "&") {
+		query = strings.TrimPrefix(query, "&")
 	}
 
 	b, err := qson.ToJSON(query)
@@ -156,6 +142,15 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
 		return data, err
 	}
 
+	data["type"] = u.Scheme
+	data["inputs"] = []string{"docker-source:" + appName}
+	if appName == "--global" {
+		data["inputs"] = []string{"docker-global-source"}
+	}
+	if appName == "--null" {
+		data["inputs"] = []string{"docker-null-source"}
+	}
+
 	return data, nil
 }