From 2f6c5f6911719682268062f1696d343849a756e9 Mon Sep 17 00:00:00 2001
From: Danny Kopping <danny.kopping@grafana.com>
Date: Fri, 8 Oct 2021 10:11:57 +0200
Subject: [PATCH] Do not clear HTTP client config

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
---
 pkg/ruler/registry.go      |  1 -
 pkg/ruler/registry_test.go | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkg/ruler/registry.go b/pkg/ruler/registry.go
index 659dca00d26b..27c527f27ce1 100644
--- a/pkg/ruler/registry.go
+++ b/pkg/ruler/registry.go
@@ -227,7 +227,6 @@ func (r *walRegistry) getTenantRemoteWriteConfig(tenant string, base RemoteWrite
 	overrides.Client.Name = fmt.Sprintf("%s-rw", tenant)
 	overrides.Client.SendExemplars = false
 	// TODO(dannyk): configure HTTP client overrides
-	overrides.Client.HTTPClientConfig = promConfig.HTTPClientConfig{}
 	// metadata is only used by prometheus scrape configs
 	overrides.Client.MetadataConfig = config.MetadataConfig{Send: false}
 	overrides.Client.SigV4Config = nil
diff --git a/pkg/ruler/registry_test.go b/pkg/ruler/registry_test.go
index edd0d423e8b7..e01ddbc5022d 100644
--- a/pkg/ruler/registry_test.go
+++ b/pkg/ruler/registry_test.go
@@ -96,6 +96,12 @@ func setupRegistry(t *testing.T, dir string) *walRegistry {
 				QueueConfig: config.QueueConfig{
 					Capacity: defaultCapacity,
 				},
+				HTTPClientConfig: promConfig.HTTPClientConfig{
+					BasicAuth: &promConfig.BasicAuth{
+						Password: "bar",
+						Username: "foo",
+					},
+				},
 				Headers: map[string]string{
 					"Base": "value",
 				},
@@ -174,6 +180,20 @@ func TestTenantRemoteWriteConfigDisabled(t *testing.T) {
 	assert.Len(t, tenantCfg.RemoteWrite, 0)
 }
 
+func TestTenantRemoteWriteHTTPConfigMaintained(t *testing.T) {
+	walDir, err := createTempWALDir()
+	require.NoError(t, err)
+	reg := setupRegistry(t, walDir)
+	defer os.RemoveAll(walDir)
+
+	tenantCfg, err := reg.getTenantConfig(enabledRWTenant)
+	require.NoError(t, err)
+
+	// HTTP client config is not currently overrideable, all tenants' configs should inherit base
+	assert.Equal(t, tenantCfg.RemoteWrite[0].HTTPClientConfig.BasicAuth.Username, "foo")
+	assert.Equal(t, tenantCfg.RemoteWrite[0].HTTPClientConfig.BasicAuth.Password, promConfig.Secret("<secret>"))
+}
+
 func TestTenantRemoteWriteHeaderOverride(t *testing.T) {
 	walDir, err := createTempWALDir()
 	require.NoError(t, err)