fix: orgID handling in tests

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/helpers.go

@@ -8,6 +8,8 @@ import (
 	audittrailSDK "github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"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"
 )
 
 // newAPIWithRegionAndProjectID returns a new Audit Trail API, with region and projectID
@@ -23,10 +25,7 @@ func newAPIWithRegionAndOrgID(d *schema.ResourceData, m any) (*audittrailSDK.API
 		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
-	}
+	orgID := types.FlattenStringPtr(account.GetOrganizationID(m, d)).(string)
 
 	return api, region, orgID, nil
 }