fix(cockpit): add grafana url manual creation

Author: jremy42

docs/resources/cockpit.md

@@ -6,9 +6,11 @@ page_title: "Scaleway: scaleway_cockpit"
 # Resource: scaleway_cockpit
 
 -> **Note:**
-As of April 2024, Cockpit has introduced [regionalization](https://www.scaleway.com/en/docs/observability/cockpit/concepts/#region) to offer more flexibility and resilience.
+As of September 2024, Cockpit has introduced [regionalization](https://www.scaleway.com/en/docs/observability/cockpit/concepts/#region) to offer more flexibility and resilience.
 If you have created customized dashboards with data for your Scaleway resources before April 2024, you will need to update your queries in Grafana, with the new regionalized [data sources](../resources/cockpit_source.md).
 
+Please note that even if you provide the grafana_url, it will only be active if a [Grafana user](../resources/cockpit_grafana_user.md) is created first. Make sure to create a Grafana user in your Cockpit instance to enable full access to Grafana.
+
 The `scaleway_cockpit` resource allows you to create and manage Scaleway Cockpit instances.
 
 Refer to Cockpit's [product documentation](https://www.scaleway.com/en/docs/observability/cockpit/concepts/) and [API documentation](https://www.scaleway.com/en/developers/api/cockpit/regional-api) for more information.
@@ -44,14 +46,15 @@ resource "scaleway_cockpit" "main" {
 
 ```terraform
 // Use the Grafana Terraform provider to create a Grafana user and a Grafana folder in the default Project's Cockpit
-resource "scaleway_cockpit" "main" {}
 
 resource "scaleway_cockpit_grafana_user" "main" {
-  project_id = scaleway_cockpit.main.project_id
-  login      = "example"
-  role       = "editor"
+    project_id = scaleway_cockpit.main.project_id
+    login      = "example"
+    role       = "editor"
 }
 
+resource "scaleway_cockpit" "main" {}
+
 provider "grafana" {
   url  = scaleway_cockpit.main.endpoints.0.grafana_url
   auth = "${scaleway_cockpit_grafana_user.main.login}:${scaleway_cockpit_grafana_user.main.password}"

internal/services/cockpit/cockpit.go

@@ -167,6 +167,9 @@ func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interfac
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	if grafana.GrafanaURL == "" {
+		grafana.GrafanaURL = createGrafanaUrl(d.Get("project_id").(string))
+	}
 
 	alertManager, err := regionalAPI.GetAlertManager(&cockpit.RegionalAPIGetAlertManagerRequest{
 		ProjectID: d.Get("project_id").(string),

internal/services/cockpit/cockpit_data_source.go

@@ -76,6 +76,9 @@ func dataSourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interf
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	if grafana.GrafanaURL == "" {
+		grafana.GrafanaURL = createGrafanaUrl(d.Get("project_id").(string))
+	}
 
 	alertManager, err := regionalAPI.GetAlertManager(&cockpit.RegionalAPIGetAlertManagerRequest{
 		ProjectID: d.Get("project_id").(string),

internal/services/cockpit/cockpit_test.go

@@ -1,6 +1,7 @@
 package cockpit_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -33,6 +34,8 @@ func TestAccCockpit_Basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "plan"),
 					resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "plan_id"),
 					resource.TestCheckResourceAttr("scaleway_cockpit.main", "plan", "free"),
+					resource.TestCheckResourceAttrSet("scaleway_cockpit.main", "endpoints.0.grafana_url"),
+					checkGrafanaURL("scaleway_cockpit.main", "scaleway_account_project.project"),
 				),
 			},
 			{
@@ -56,7 +59,7 @@ func TestAccCockpit_Basic(t *testing.T) {
 }
 
 func TestAccCockpit_WithSourceEndpoints(t *testing.T) {
-	t.Skip("TestAccCockpit_WithSourceEndpoints skipped: encountered repeated HTTP 500 errors from the Scaleway Cockpit API.")
+	//t.Skip("TestAccCockpit_WithSourceEndpoints skipped: encountered repeated HTTP 500 errors from the Scaleway Cockpit API.")
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
 
@@ -128,6 +131,20 @@ func TestAccCockpit_WithSourceEndpoints(t *testing.T) {
 	})
 }
 
+func checkGrafanaURL(resourceName, projectResource string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[projectResource]
+		if !ok {
+			return fmt.Errorf("Not found: %s", projectResource)
+		}
+
+		projectID := rs.Primary.ID
+		expectedURL := fmt.Sprintf("https://%s.dashboards.obs.fr-par.scw.cloud", projectID)
+
+		return resource.TestCheckResourceAttr(resourceName, "endpoints.0.grafana_url", expectedURL)(s)
+	}
+}
+
 func isCockpitDestroyed(_ *acctest.TestTools) resource.TestCheckFunc {
 	return func(_ *terraform.State) error {
 		return nil

internal/services/cockpit/types.go

@@ -18,6 +18,10 @@ var scopeMapping = map[string]cockpit.TokenScope{
 	"write_traces":        cockpit.TokenScopeWriteOnlyTraces,
 }
 
+func createGrafanaUrl(projectID string) string {
+	return fmt.Sprintf("https://%s.dashboards.obs.fr-par.scw.cloud", projectID)
+}
+
 func flattenCockpitEndpoints(dataSources []*cockpit.DataSource, grafanaURL string, alertManagerURL string) []map[string]interface{} {
 	endpointMap := map[string]string{}