Merge pull request #173 from grafana/andreas/fix-settings-config

Fix settings config

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## v2.1.2
+
+- Dependency updates
+- Fix bug where `AzureAuthEnabled` setting was not correctly picked up from context
+
 ## v2.1.1
 
 - Dependency updates

azsettings/settings.go

@@ -61,18 +61,22 @@ func ReadFromContext(ctx context.Context) (*AzureSettings, bool) {
 		return settings, false
 	}
 
+	hasSettings := false
 	if v := cfg.Get(AzureAuthEnabled); v == strconv.FormatBool(true) {
 		settings.AzureAuthEnabled = true
+		hasSettings = true
 	}
 
 	if customCloudsJSON := cfg.Get(AzureCustomCloudsConfig); customCloudsJSON != "" {
 		// this method will parse the JSON and set the custom cloud list in one go
 		if err := settings.SetCustomClouds(customCloudsJSON); err != nil {
 			backend.Logger.Error("Error setting custom clouds:  %w", err)
 		}
+		if settings.CustomCloudListJSON != "" {
+			hasSettings = true
+		}
 	}
 
-	hasSettings := false
 	if v := cfg.Get(AzureCloud); v != "" {
 		settings.Cloud = v
 		hasSettings = true