From 8e96821c162714d974cb0ab94944c60541abc2ff Mon Sep 17 00:00:00 2001 From: Jon Cole Date: Sat, 4 May 2024 03:17:51 -0700 Subject: [PATCH] Azure: get custom cloud list from grafana-azure-sdk-go package (#86717) * Get custom cloud list from grafana-azure-sdk-go for frontend settings * Remove getAzureClouds() and call CustomClouds() directly * remove unused type --- pkg/api/dtos/frontend_settings.go | 12 +++++++----- pkg/api/frontendsettings.go | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/api/dtos/frontend_settings.go b/pkg/api/dtos/frontend_settings.go index 8d384ab02c7..2475d0b8892 100644 --- a/pkg/api/dtos/frontend_settings.go +++ b/pkg/api/dtos/frontend_settings.go @@ -1,6 +1,7 @@ package dtos import ( + "github.com/grafana/grafana-azure-sdk-go/v2/azsettings" "github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/setting" ) @@ -65,11 +66,12 @@ type FrontendSettingsLicenseInfoDTO struct { } type FrontendSettingsAzureDTO struct { - Cloud string `json:"cloud"` - ManagedIdentityEnabled bool `json:"managedIdentityEnabled"` - WorkloadIdentityEnabled bool `json:"workloadIdentityEnabled"` - UserIdentityEnabled bool `json:"userIdentityEnabled"` - UserIdentityFallbackCredentialsEnabled bool `json:"userIdentityFallbackCredentialsEnabled"` + Cloud string `json:"cloud"` + Clouds []azsettings.AzureCloudInfo `json:"clouds"` + ManagedIdentityEnabled bool `json:"managedIdentityEnabled"` + WorkloadIdentityEnabled bool `json:"workloadIdentityEnabled"` + UserIdentityEnabled bool `json:"userIdentityEnabled"` + UserIdentityFallbackCredentialsEnabled bool `json:"userIdentityFallbackCredentialsEnabled"` } type FrontendSettingsCachingDTO struct { diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 5c2cf58aace..49fdefb13c1 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -270,6 +270,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro Azure: dtos.FrontendSettingsAzureDTO{ Cloud: hs.Cfg.Azure.Cloud, + Clouds: hs.Cfg.Azure.CustomClouds(), ManagedIdentityEnabled: hs.Cfg.Azure.ManagedIdentityEnabled, WorkloadIdentityEnabled: hs.Cfg.Azure.WorkloadIdentityEnabled, UserIdentityEnabled: hs.Cfg.Azure.UserIdentityEnabled,