add default project_id

Author: jremy42

internal/services/tem/helpers.go

@@ -1,13 +1,17 @@
 package tem
 
 import (
+	"context"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
 	tem "github.com/scaleway/scaleway-sdk-go/api/tem/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"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 (
@@ -39,3 +43,16 @@ func NewAPIWithRegionAndID(m interface{}, id string) (*tem.API, scw.Region, stri
 
 	return api, region, id, 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
+}

internal/services/tem/offer_subscription_data_source.go

@@ -74,7 +74,16 @@ func DataSourceOfferSubscriptionRead(ctx context.Context, d *schema.ResourceData
 		return diag.FromErr(err)
 	}
 
-	projectID := d.Get("project_id").(string)
+	var projectID string
+
+	if _, ok := d.GetOk("project_id"); !ok {
+		projectID, err = getDefaultProjectID(ctx, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+	} else {
+		projectID = d.Get("project_id").(string)
+	}
 
 	offer, err := api.ListOfferSubscriptions(&tem.ListOfferSubscriptionsRequest{
 		Region:    region,

internal/services/tem/offer_subscription_data_source_test.go

@@ -1,6 +1,7 @@
 package tem_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -10,16 +11,28 @@ import (
 func TestAccDataSourceOfferSubscription_Basic(t *testing.T) {
 	tt := acctest.NewTestTools(t)
 	defer tt.Cleanup()
+	orgID, orgIDExists := tt.Meta.ScwClient().GetDefaultOrganizationID()
+
+	if !orgIDExists {
+		orgID = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+	}
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
 		Steps: []resource.TestStep{
 			{
-				Config: `
+				Config: fmt.Sprintf(`
+
+					data scaleway_account_project "project" {
+						name = "default"
+						organization_id = "%s"
+					}
+				
 					data "scaleway_tem_offer_subscription" "test" {
+						project_id = data.scaleway_account_project.project.id
 					}
-				`,
+				`, orgID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.scaleway_tem_offer_subscription.test", "project_id"),
 					resource.TestCheckResourceAttr("data.scaleway_tem_offer_subscription.test", "offer_name", "scale"),