Fixed expected names for Username option

The previous renaming from User to Username hasn't
changed all the available matches.

Author: codebien

pkg/remotewrite/config.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/grafana/xk6-output-prometheus-remote/pkg/remote"
 	"github.com/kubernetes/helm/pkg/strvals"
-
 	"go.k6.io/k6/lib/types"
 	"gopkg.in/guregu/null.v3"
 )
@@ -43,6 +42,7 @@ type Config struct {
 	PushInterval types.NullDuration `json:"pushInterval" envconfig:"K6_PROMETHEUS_PUSH_INTERVAL"`
 }
 
+// NewConfig creates an Output's configuration.
 func NewConfig() Config {
 	return Config{
 		URL:                   null.StringFrom(defaultURL),
@@ -54,6 +54,7 @@ func NewConfig() Config {
 	}
 }
 
+// RemoteConfig creates a configuration for the HTTP Remote-write client.
 func (conf Config) RemoteConfig() (*remote.HTTPConfig, error) {
 	hc := remote.HTTPConfig{
 		Timeout: defaultTimeout,
@@ -83,8 +84,7 @@ func (conf Config) RemoteConfig() (*remote.HTTPConfig, error) {
 	return &hc, nil
 }
 
-// From here till the end of the file partial duplicates waiting for config refactor (k6 #883)
-
+// Apply merges applied Config into base.
 func (base Config) Apply(applied Config) Config {
 	if applied.URL.Valid {
 		base.URL = applied.URL
@@ -115,7 +115,7 @@ func (base Config) Apply(applied Config) Config {
 	return base
 }
 
-// ParseArg takes an arg string and converts it to a config
+// ParseArg creates a Config parsing an arg string.
 func ParseArg(arg string) (Config, error) {
 	var c Config
 	params, err := strvals.Parse(arg)
@@ -131,7 +131,7 @@ func ParseArg(arg string) (Config, error) {
 		c.InsecureSkipTLSVerify = null.BoolFrom(v)
 	}
 
-	if v, ok := params["user"].(string); ok {
+	if v, ok := params["username"].(string); ok {
 		c.Username = null.StringFrom(v)
 	}
 
@@ -158,7 +158,7 @@ func ParseArg(arg string) (Config, error) {
 }
 
 // GetConsolidatedConfig combines {default config values + JSON config +
-// environment vars + arg config values}, and returns the final result.
+// environment vars + arg config values}, and returns the final merged configuration.
 func GetConsolidatedConfig(jsonRawConf json.RawMessage, env map[string]string, arg string) (Config, error) {
 	result := NewConfig()
 	if jsonRawConf != nil {
@@ -211,7 +211,7 @@ func GetConsolidatedConfig(jsonRawConf json.RawMessage, env map[string]string, a
 		}
 	}
 
-	if user, userDefined := env["K6_PROMETHEUS_USER"]; userDefined {
+	if user, userDefined := env["K6_PROMETHEUS_USERNAME"]; userDefined {
 		result.Username = null.StringFrom(user)
 	}
 

pkg/remotewrite/config_test.go

@@ -63,12 +63,10 @@ func TestConfigParseArg(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, null.StringFrom("https://prometheus.remote:3412/write"), c.URL)
 
-	c, err = ParseArg("url=https://prometheus.remote:3412/write,insecureSkipTLSVerify=false,user=user,password=pass")
+	c, err = ParseArg("url=https://prometheus.remote:3412/write,insecureSkipTLSVerify=false")
 	assert.Nil(t, err)
 	assert.Equal(t, null.StringFrom("https://prometheus.remote:3412/write"), c.URL)
 	assert.Equal(t, null.BoolFrom(false), c.InsecureSkipTLSVerify)
-	assert.Equal(t, null.StringFrom("user"), c.Username)
-	assert.Equal(t, null.StringFrom("pass"), c.Password)
 
 	c, err = ParseArg("url=http://prometheus.remote:3412/write,pushInterval=2s")
 	assert.Nil(t, err)
@@ -153,9 +151,9 @@ func TestConfigConsolidation(t *testing.T) {
 			},
 		},
 		"mixed_success": {
-			jsonRaw: json.RawMessage(fmt.Sprintf(`{"url":"%s","mapping":"raw"}`, u.String())),
+			jsonRaw: json.RawMessage(fmt.Sprintf(`{"url":"%s"}`, u.String())),
 			env:     map[string]string{"K6_PROMETHEUS_INSECURE_SKIP_TLS_VERIFY": "false", "K6_PROMETHEUS_USER": "u"},
-			arg:     "user=user",
+			arg:     "username=user",
 			config: Config{
 				URL:                   null.StringFrom(u.String()),
 				InsecureSkipTLSVerify: null.BoolFrom(false),
@@ -247,3 +245,36 @@ func TestConfigConsolidation(t *testing.T) {
 		})
 	}
 }
+
+func TestConfigBasicAuth(t *testing.T) {
+	t.Parallel()
+
+	cases := map[string]struct {
+		arg     string
+		env     map[string]string
+		jsonRaw json.RawMessage
+	}{
+		"JSON": {jsonRaw: json.RawMessage(`{"username":"user1","password":"pass1"}`)},
+		"Env":  {env: map[string]string{"K6_PROMETHEUS_USERNAME": "user1", "K6_PROMETHEUS_PASSWORD": "pass1"}},
+		"Arg":  {arg: "username=user1,password=pass1"},
+	}
+
+	expconfig := Config{
+		URL:                   null.StringFrom("http://localhost:9090/api/v1/write"),
+		InsecureSkipTLSVerify: null.BoolFrom(true),
+		Username:              null.StringFrom("user1"),
+		Password:              null.StringFrom("pass1"),
+		PushInterval:          types.NullDurationFrom(5 * time.Second),
+		Headers:               make(map[string]string),
+	}
+
+	for name, tc := range cases {
+		tc := tc
+		t.Run(name, func(t *testing.T) {
+			c, err := GetConsolidatedConfig(
+				tc.jsonRaw, tc.env, tc.arg)
+			require.NoError(t, err)
+			assert.Equal(t, expconfig, c)
+		})
+	}
+}