fix: orgID handling

Author: estellesoulard

internal/meta/errors.go

@@ -4,6 +4,3 @@ import "errors"
 
 // ErrProjectIDNotFound is returned when no project ID can be detected
 var ErrProjectIDNotFound = errors.New("could not detect project id")
-
-// ErrOrganizationIDNotFound is returned when no organization ID can be detected
-var ErrOrganizationIDNotFound = errors.New("could not detect organization id")

internal/meta/extractors.go

@@ -116,24 +116,6 @@ func ExtractProjectID(d terraformResourceData, m any) (projectID string, isDefau
 	return "", false, ErrProjectIDNotFound
 }
 
-// ExtractOrganizationID will try to guess the organization id from the following:
-//   - organization_id field of the resource data
-//   - default organization_id from config
-func ExtractOrganizationID(d terraformResourceData, m any) (organizationID string, err error) {
-	rawOrgID, exist := d.GetOk("organization_id")
-
-	if exist {
-		return rawOrgID.(string), nil
-	}
-
-	defaultOrgID, defaultOrgIDExists := m.(*Meta).ScwClient().GetDefaultOrganizationID()
-	if defaultOrgIDExists {
-		return defaultOrgID, nil
-	}
-
-	return "", ErrOrganizationIDNotFound
-}
-
 func ExtractScwClient(m any) *scw.Client {
 	return m.(*Meta).ScwClient()
 }

internal/services/audittrail/event_data_source.go

@@ -13,6 +13,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
@@ -25,6 +26,7 @@ func DataSourceEvent() *schema.Resource {
 				Type:             schema.TypeString,
 				Description:      "ID of the organization containing the Audit Trail events.",
 				Optional:         true,
+				Computed:         true,
 				ValidateDiagFunc: verify.IsUUID(),
 			},
 			"region": regional.Schema(),
@@ -214,13 +216,13 @@ func DataSourceEvent() *schema.Resource {
 }
 
 func DataSourceEventsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	auditTrailAPI, region, orgID, err := newAPIWithRegionAndOrgID(d, m)
+	auditTrailAPI, region, err := newAPIWithRegion(d, m)
 	if err != nil {
 		return diag.FromErr(err)
 	}
 
 	req := audittrailSDK.ListEventsRequest{
-		OrganizationID: orgID,
+		OrganizationID: types.FlattenStringPtr(account.GetOrganizationID(m, d)).(string),
 		Region:         region,
 	}
 
@@ -235,7 +237,6 @@ func DataSourceEventsRead(ctx context.Context, d *schema.ResourceData, m any) di
 	}
 
 	d.SetId(uuid.New().String())
-	_ = d.Set("organization_id", orgID)
 	_ = d.Set("region", region)
 
 	flattenedEvents, err := flattenEvents(res.Events)

internal/services/audittrail/helpers.go

@@ -11,22 +11,17 @@ import (
 )
 
 // newAPIWithRegionAndProjectID returns a new Audit Trail API, with region and projectID
-func newAPIWithRegionAndOrgID(d *schema.ResourceData, m any) (*audittrailSDK.API, scw.Region, string, error) {
+func newAPIWithRegion(d *schema.ResourceData, m any) (*audittrailSDK.API, scw.Region, error) {
 	api := audittrailSDK.NewAPI(meta.ExtractScwClient(m))
 
 	region, err := meta.ExtractRegion(d, m)
 	if err != nil {
-		return nil, "", "", err
+		return nil, "", err
 	}
 	// In audit trail sdk-go so far only fr-par and nl-ams are supported
 	if !slices.Contains(api.Regions(), region) {
-		return nil, "", "", fmt.Errorf("invalid api region, expected one of %s, got: %s", api.Regions(), region)
+		return nil, "", fmt.Errorf("invalid api region, expected one of %s, got: %s", api.Regions(), region)
 	}
 
-	orgID, err := meta.ExtractOrganizationID(d, m)
-	if err != nil {
-		return nil, "", "", err
-	}
-
-	return api, region, orgID, nil
+	return api, region, nil
 }