Fix provider error preventing all operations in v2.12.0 (#1373)

Closes #1372

I will do another PR afterwards with a test that verifies that this does not happen again

Author: julienduchesne

internal/provider/framework_provider.go

@@ -32,6 +32,7 @@ type frameworkProviderConfig struct {
 
 	StoreDashboardSha256 types.Bool `tfsdk:"store_dashboard_sha256"`
 
+	CloudAPIKey            types.String `tfsdk:"cloud_api_key"` // Deprecated
 	CloudAccessPolicyToken types.String `tfsdk:"cloud_access_policy_token"`
 	CloudAPIURL            types.String `tfsdk:"cloud_api_url"`
 
@@ -53,7 +54,10 @@ func (c *frameworkProviderConfig) SetDefaults() error {
 	c.TLSCert = envDefaultFuncString(c.TLSCert, "GRAFANA_TLS_CERT")
 	c.CACert = envDefaultFuncString(c.CACert, "GRAFANA_CA_CERT")
 	c.CloudAccessPolicyToken = envDefaultFuncString(c.CloudAccessPolicyToken, "GRAFANA_CLOUD_ACCESS_POLICY_TOKEN")
-	c.CloudAccessPolicyToken = envDefaultFuncString(c.CloudAccessPolicyToken, "GRAFANA_CLOUD_API_KEY") // Backwards compatibility. TODO: Remove once cloud_api_key is removed
+	c.CloudAPIKey = envDefaultFuncString(c.CloudAPIKey, "GRAFANA_CLOUD_API_KEY") // Backwards compatibility. TODO: Remove once cloud_api_key is removed
+	if c.CloudAccessPolicyToken.IsNull() && !c.CloudAPIKey.IsNull() {
+		c.CloudAccessPolicyToken = c.CloudAPIKey
+	}
 	c.CloudAPIURL = envDefaultFuncString(c.CloudAPIURL, "GRAFANA_CLOUD_API_URL", "https://grafana.com")
 	c.SMAccessToken = envDefaultFuncString(c.SMAccessToken, "GRAFANA_SM_ACCESS_TOKEN")
 	c.SMURL = envDefaultFuncString(c.SMURL, "GRAFANA_SM_URL", "https://synthetic-monitoring-api.grafana.net")