From 07676ab8a040971bc2f054c52a74f3c4b8680f5d Mon Sep 17 00:00:00 2001 From: Andreas Christou Date: Mon, 11 Mar 2024 08:57:42 +0000 Subject: [PATCH] Prometheus: Add missing Azure setting (#84094) --- pkg/setting/setting_azure.go | 4 ++++ pkg/setting/setting_azure_test.go | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/pkg/setting/setting_azure.go b/pkg/setting/setting_azure.go index 54e8c5e2a52..77f3e55b082 100644 --- a/pkg/setting/setting_azure.go +++ b/pkg/setting/setting_azure.go @@ -9,6 +9,10 @@ func (cfg *Cfg) readAzureSettings() { azureSettings := &azsettings.AzureSettings{} azureSection := cfg.Raw.Section("azure") + authSection := cfg.Raw.Section("auth") + + // This setting is specific to Prometheus + azureSettings.AzureAuthEnabled = authSection.Key("azure_auth_enabled").MustBool(false) // Cloud cloudName := azureSection.Key("cloud").MustString(azsettings.AzurePublic) diff --git a/pkg/setting/setting_azure_test.go b/pkg/setting/setting_azure_test.go index 2f75fd5eb36..a122e821e14 100644 --- a/pkg/setting/setting_azure_test.go +++ b/pkg/setting/setting_azure_test.go @@ -64,6 +64,27 @@ func TestAzureSettings(t *testing.T) { } }) + t.Run("prometheus", func(t *testing.T) { + t.Run("should enable azure auth", func(t *testing.T) { + cfg := NewCfg() + + authSection, err := cfg.Raw.NewSection("auth") + require.NoError(t, err) + _, err = authSection.NewKey("azure_auth_enabled", "true") + require.NoError(t, err) + + cfg.readAzureSettings() + require.NotNil(t, cfg.Azure.AzureAuthEnabled) + assert.True(t, cfg.Azure.AzureAuthEnabled) + }) + t.Run("should default to disabled", func(t *testing.T) { + cfg := NewCfg() + + cfg.readAzureSettings() + require.NotNil(t, cfg.Azure.AzureAuthEnabled) + assert.False(t, cfg.Azure.AzureAuthEnabled) + }) + }) t.Run("User Identity", func(t *testing.T) { t.Run("should be disabled by default", func(t *testing.T) { cfg := NewCfg()