fix(cockpit): add default project id in cockpit resource (#2746)

Author: jremy42

internal/services/cockpit/cockpit.go

@@ -24,6 +24,7 @@ func ResourceCockpit() *schema.Resource {
 			"plan": {
 				Type:        schema.TypeString,
 				Optional:    true,
+				Default:     "free",
 				Description: "Name or ID of the plan",
 			},
 			"plan_id": {
@@ -98,6 +99,7 @@ func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	projectID := d.Get("project_id").(string)
+
 	if targetPlanI, ok := d.GetOk("plan"); ok {
 		targetPlan := targetPlanI.(string)
 
@@ -127,7 +129,6 @@ func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m interf
 		}
 	}
 
-	d.SetId(projectID)
 	return ResourceCockpitRead(ctx, d, m)
 }
 
@@ -142,37 +143,46 @@ func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(err)
 	}
 
+	projectID := d.Get("project_id").(string)
+	if projectID == "" {
+		projectID, err = getDefaultProjectID(ctx, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
+
 	res, err := api.GetCurrentPlan(&cockpit.GlobalAPIGetCurrentPlanRequest{
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
-	_ = d.Set("project_id", d.Get("project_id").(string))
 	_ = d.Set("plan", res.Name.String())
 	_ = d.Set("plan_id", res.Name.String())
 
 	dataSourcesRes, err := regionalAPI.ListDataSources(&cockpit.RegionalAPIListDataSourcesRequest{
 		Region:    region,
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 		Origin:    "external",
 	}, scw.WithContext(ctx), scw.WithAllPages())
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	_ = d.Set("project_id", projectID)
+	d.SetId(projectID)
 
 	grafana, err := api.GetGrafana(&cockpit.GlobalAPIGetGrafanaRequest{
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 	if grafana.GrafanaURL == "" {
-		grafana.GrafanaURL = createGrafanaURL(d.Get("project_id").(string), region)
+		grafana.GrafanaURL = createGrafanaURL(projectID, region)
 	}
 
 	alertManager, err := regionalAPI.GetAlertManager(&cockpit.RegionalAPIGetAlertManagerRequest{
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 	})
 	if err != nil {
 		return diag.FromErr(err)

internal/services/cockpit/cockpit_data_source.go

@@ -46,6 +46,12 @@ func dataSourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	projectID := d.Get("project_id").(string)
+	if projectID == "" {
+		projectID, err = getDefaultProjectID(ctx, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	}
 
 	res, err := api.GetCurrentPlan(&cockpit.GlobalAPIGetCurrentPlanRequest{
 		ProjectID: projectID,
@@ -63,25 +69,25 @@ func dataSourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interf
 
 	dataSourcesRes, err := regionalAPI.ListDataSources(&cockpit.RegionalAPIListDataSourcesRequest{
 		Region:    region,
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 		Origin:    "external",
 	}, scw.WithContext(ctx), scw.WithAllPages())
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	grafana, err := api.GetGrafana(&cockpit.GlobalAPIGetGrafanaRequest{
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
 	}
 	if grafana.GrafanaURL == "" {
-		grafana.GrafanaURL = createGrafanaURL(d.Get("project_id").(string), region)
+		grafana.GrafanaURL = createGrafanaURL(projectID, region)
 	}
 
 	alertManager, err := regionalAPI.GetAlertManager(&cockpit.RegionalAPIGetAlertManagerRequest{
-		ProjectID: d.Get("project_id").(string),
+		ProjectID: projectID,
 	})
 	if err != nil {
 		return diag.FromErr(err)

internal/services/cockpit/cockpit_test.go

@@ -9,6 +9,31 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 )
 
+func TestAccCockpit_Simple(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      isCockpitDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+				resource scaleway_cockpit main {
+				}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					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"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccCockpit_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()

internal/services/cockpit/helpers_cockpit.go

@@ -9,11 +9,14 @@ import (
 
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
 	"github.com/scaleway/scaleway-sdk-go/api/cockpit/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/scaleway-sdk-go/validation"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 )
 
 const (
@@ -108,3 +111,14 @@ func cockpitTokenV1UpgradeFunc(_ context.Context, rawState map[string]interface{
 
 	return rawState, nil
 }
+
+func getDefaultProjectID(ctx context.Context, m interface{}) (string, error) {
+	accountAPI := account.NewProjectAPI(m)
+	res, err := accountAPI.ListProjects(&accountSDK.ProjectAPIListProjectsRequest{
+		Name: types.ExpandStringPtr("default"),
+	}, scw.WithContext(ctx))
+	if err != nil {
+		return "", err
+	}
+	return res.Projects[0].ID, nil
+}