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(),
@@ -88,14 +90,16 @@ func DataSourceEvent() *schema.Resource {
 				Optional:    true,
 			},
 			"recorded_after": {
-				Type:        schema.TypeString,
-				Description: "The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default (Format ISO 8601)",
-				Optional:    true,
+				Type:             schema.TypeString,
+				Description:      "The `recorded_after` parameter defines the earliest timestamp from which Audit Trail events are retrieved. Returns `one hour ago` by default (Format ISO 8601)",
+				Optional:         true,
+				ValidateDiagFunc: verify.IsDate(),
 			},
 			"recorded_before": {
-				Type:        schema.TypeString,
-				Description: "The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Must be later than recorded_after. Returns `now` by default (Format ISO 8601)",
-				Optional:    true,
+				Type:             schema.TypeString,
+				Description:      "The `recorded_before` parameter defines the latest timestamp up to which Audit Trail events are retrieved. Must be later than recorded_after. Returns `now` by default (Format ISO 8601)",
+				Optional:         true,
+				ValidateDiagFunc: verify.IsDate(),
 			},
 			"order_by": {
 				Type:        schema.TypeString,
@@ -214,13 +218,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 +239,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)
@@ -286,11 +289,11 @@ func readOptionalData(d *schema.ResourceData, req *audittrailSDK.ListEventsReque
 	}
 
 	if recordedBefore, ok := d.GetOk("recorded_before"); ok {
-		req.RecordedBefore = types.ExpandTimePtr(recordedBefore)
+		req.RecordedBefore = types.ExpandTimePtr(recordedBefore.(string))
 	}
 
 	if recordedAfter, ok := d.GetOk("recorded_after"); ok {
-		req.RecordedAfter = types.ExpandTimePtr(recordedAfter)
+		req.RecordedAfter = types.ExpandTimePtr(recordedAfter.(string))
 	}
 
 	if orderBy, ok := d.GetOk("order_by"); ok {

internal/services/audittrail/event_data_source_test.go

@@ -3,9 +3,7 @@ package audittrail_test
 import (
 	"fmt"
 	"testing"
-	"time"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	audit_trail "github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
@@ -19,11 +17,6 @@ func TestAccDataSourceEvent_Basic(t *testing.T) {
 
 	ctx := t.Context()
 
-	orgID, orgIDExists := tt.Meta.ScwClient().GetDefaultOrganizationID()
-	if !orgIDExists {
-		orgID = dummyOrgID
-	}
-
 	auditTrailAPI := audit_trail.NewAPI(tt.Meta.ScwClient())
 
 	project, iamAPIKey, _, terminateFakeSideProject, err := acctest.CreateFakeIAMManager(tt)
@@ -105,34 +98,22 @@ func TestAccDataSourceEvent_Basic(t *testing.T) {
 						status = 200
 					}
 
-					data "scaleway_audit_trail_event" "recorded_after" {
-						project_id = scaleway_secret.main.project_id
-						recorded_after = "%s"
-					}
-
-					data "scaleway_audit_trail_event" "recorded_before" {
-						project_id = scaleway_secret.main.project_id
-						recorded_before = "%s"
-					}
-
 					data "scaleway_audit_trail_event" "order_by" {
 						project_id = scaleway_secret.main.project_id
 						order_by = "recorded_at_asc"
 					}
-				`, secretName, project.ID, resourceType, productName, serviceName, methodCreate, time.Now().Add(-time.Minute*10).Format(time.RFC3339), time.Now().Add(-time.Minute*30).Format(time.RFC3339)),
+				`, secretName, project.ID, resourceType, productName, serviceName, methodCreate),
 				Check: resource.ComposeTestCheckFunc(
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_project", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_type", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id_with_locality", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_product", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_service", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_method", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_principal", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_ip", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_status", orgID),
-					createEventDataSourceChecks("data.scaleway_audit_trail_event.recorded_after", orgID),
-					resource.TestCheckResourceAttr("data.scaleway_audit_trail_event.recorded_before", "events.#", "0"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_project"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_type"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_id_with_locality"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_product"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_service"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_method"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_principal"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_ip"),
+					createEventDataSourceChecks("data.scaleway_audit_trail_event.by_status"),
 					resource.TestCheckResourceAttrSet("data.scaleway_audit_trail_event.order_by", "events.#"),
 				),
 			},
@@ -142,7 +123,7 @@ func TestAccDataSourceEvent_Basic(t *testing.T) {
 						project_id    = "%s"
 						resource_id = "%s"
 					}
-				`, project.ID, uuid.New().String()),
+				`, project.ID, dummyID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.scaleway_audit_trail_event.not_found", "events.#", "0"),
 				),

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
 }

internal/services/audittrail/helpers_test.go

@@ -22,7 +22,7 @@ import (
 const (
 	defaultAuditTrailEventsTimeout = 20 * time.Second
 	destroyWaitTimeout             = 3 * time.Minute
-	dummyOrgID                     = "AB7BD9BF-E1BD-41E8-9F1D-F16A2E3F3925"
+	dummyID                        = "AB7BD9BF-E1BD-41E8-9F1D-F16A2E3F3925"
 	serviceName                    = "scaleway.secret_manager.v1beta1.Api"
 	productName                    = "secret-manager"
 	methodCreate                   = "CreateSecret"
@@ -64,16 +64,13 @@ func waitForAuditTrailEvents(t *testing.T, ctx context.Context, api *audit_trail
 }
 
 // Bundle of checks for audit trail event data source testing
-func createEventDataSourceChecks(eventsDataSourceName, orgID string) resource.TestCheckFunc {
+func createEventDataSourceChecks(eventsDataSourceName string) resource.TestCheckFunc {
 	return resource.ComposeTestCheckFunc(
 		resource.TestCheckResourceAttrPair(
 			eventsDataSourceName, "events.0.locality",
 			resourceName, "region",
 		),
 		resource.TestCheckResourceAttrSet(eventsDataSourceName, "events.0.principal_id"),
-		resource.TestCheckResourceAttr(
-			eventsDataSourceName, "events.0.organization_id", orgID,
-		),
 		resource.TestCheckResourceAttrSet(eventsDataSourceName, "events.0.source_ip"),
 		resource.TestCheckResourceAttrSet(eventsDataSourceName, "events.0.user_agent"),
 		resource.TestCheckResourceAttr(