Skip to content

Commit

Permalink
SM Installation: Validate that cloud client is configured (#1230)
Browse files Browse the repository at this point in the history
We use `GrafanaCloudAPI` in that resource. If it's not configured, it panics
  • Loading branch information
julienduchesne authored Dec 14, 2023
1 parent cdac2ab commit 3db0477
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions internal/provider/legacy_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ func Provider(version string) *schema.Provider {
"grafana_cloud_stack_api_key": cloud.ResourceStackAPIKey(),
"grafana_cloud_stack_service_account": cloud.ResourceStackServiceAccount(),
"grafana_cloud_stack_service_account_token": cloud.ResourceStackServiceAccountToken(),
"grafana_synthetic_monitoring_installation": cloud.ResourceInstallation(),
})

// Resources that require the OnCall client to exist.
Expand Down Expand Up @@ -260,10 +261,6 @@ func Provider(version string) *schema.Provider {
},

ResourcesMap: mergeResourceMaps(
map[string]*schema.Resource{
// This one installs SM on a cloud instance, everything it needs is in its attributes
"grafana_synthetic_monitoring_installation": cloud.ResourceInstallation(),
},
grafanaClientResources,
smClientResources,
onCallClientResources,
Expand Down

0 comments on commit 3db0477

Please sign in to comment.