Fix the Bearer token parsing

Author: codebien

pkg/remotewrite/config.go

@@ -145,6 +145,10 @@ func (conf Config) Apply(applied Config) Config {
 		conf.Password = applied.Password
 	}
 
+	if applied.BearerToken.Valid {
+		conf.BearerToken = applied.BearerToken
+	}
+
 	if applied.PushInterval.Valid {
 		conf.PushInterval = applied.PushInterval
 	}
@@ -276,6 +280,10 @@ func parseEnvs(env map[string]string) (Config, error) {
 		c.ClientCertificateKey = null.StringFrom(clientCertificateKey)
 	}
 
+	if token, tokenDefined := env["K6_PROMETHEUS_RW_BEARER_TOKEN"]; tokenDefined {
+		c.BearerToken = null.StringFrom(token)
+	}
+
 	envHeaders := envMap(env, "K6_PROMETHEUS_RW_HEADERS_")
 	for k, v := range envHeaders {
 		c.Headers[k] = v

pkg/remotewrite/config_test.go

@@ -382,6 +382,40 @@ func TestOptionBasicAuth(t *testing.T) {
 	}
 }
 
+func TestOptionBearerToken(t *testing.T) {
+	t.Parallel()
+
+	cases := map[string]struct {
+		arg     string
+		env     map[string]string
+		jsonRaw json.RawMessage
+	}{
+		"JSON": {jsonRaw: json.RawMessage(`{"bearerToken":"my-bearer-token"}`)},
+		"Env":  {env: map[string]string{"K6_PROMETHEUS_RW_BEARER_TOKEN": "my-bearer-token"}},
+	}
+
+	expconfig := Config{
+		ServerURL:             null.StringFrom("http://localhost:9090/api/v1/write"),
+		InsecureSkipTLSVerify: null.BoolFrom(false),
+		BearerToken:           null.StringFrom("my-bearer-token"),
+		PushInterval:          types.NullDurationFrom(5 * time.Second),
+		Headers:               make(map[string]string),
+		TrendStats:            []string{"p(99)"},
+		StaleMarkers:          null.BoolFrom(false),
+	}
+
+	for name, tc := range cases {
+		tc := tc
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			c, err := GetConsolidatedConfig(
+				tc.jsonRaw, tc.env, tc.arg)
+			require.NoError(t, err)
+			assert.Equal(t, expconfig, c)
+		})
+	}
+}
+
 func TestOptionClientCertificate(t *testing.T) {
 	t.Parallel()