fix(iam_user): use default organization id when available (#1385)

Author: Codelax

scaleway/data_source_iam_user.go

@@ -28,12 +28,10 @@ func dataSourceScalewayIamUser() *schema.Resource {
 				ValidateFunc:  validationEmail(),
 				ConflictsWith: []string{"user_id"},
 			},
-
-			// Default organization_id will be available on a major release. Please check #1337
 			"organization_id": {
 				Type:        schema.TypeString,
 				Description: "The organization_id you want to attach the resource to",
-				Required:    true,
+				Optional:    true,
 			},
 		},
 	}
@@ -56,7 +54,7 @@ func dataSourceScalewayIamUserRead(ctx context.Context, d *schema.ResourceData,
 		organizationID = res.OrganizationID
 	} else {
 		res, err := iamAPI.ListUsers(&iam.ListUsersRequest{
-			OrganizationID: expandStringPtr(d.Get("organization_id")),
+			OrganizationID: getOrganizationID(meta, d),
 		}, scw.WithAllPages(), scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)

scaleway/helpers_iam.go

@@ -15,6 +15,23 @@ func iamAPI(m interface{}) *iam.API {
 	return iam.NewAPI(meta.scwClient)
 }
 
+func getOrganizationID(m interface{}, d *schema.ResourceData) *string {
+	meta := m.(*Meta)
+
+	orgID, orgIDExist := d.GetOk("organization_id")
+
+	if orgIDExist {
+		return expandStringPtr(orgID)
+	}
+
+	defaultOrgID, defaultOrgIDExists := meta.scwClient.GetDefaultOrganizationID()
+	if defaultOrgIDExists {
+		return expandStringPtr(defaultOrgID)
+	}
+
+	return nil
+}
+
 func expandPermissionSetNames(rawPermissions interface{}) *[]string {
 	permissions := []string{}
 	permissionSet := rawPermissions.(*schema.Set)