Merge branch 'master' into feat/rdb-actions

Author: jremy42

docs/actions/cockpit_trigger_test_alert_action.md

@@ -0,0 +1,20 @@
+---
+subcategory: "Cockpit"
+page_title: "Scaleway: scaleway_cockpit_trigger_test_alert_action"
+---
+
+# scaleway_cockpit_trigger_test_alert_action (Action)
+
+<!-- action schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `project_id` (String) ID of the Project
+
+### Optional
+
+- `region` (String) The region you want to attach the resource to
+
+
+

docs/data-sources/account_project.md

@@ -5,7 +5,7 @@ page_title: "Scaleway: scaleway_account_project"
 
 # scaleway_account_project
 
-The `scaleway_account_project` data source is used to retrieve information about a Scaleway project.
+The [`scaleway_account_project`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/data-sources/account_project) data source is used to retrieve information about a Scaleway project.
 
 Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.
 

docs/data-sources/account_projects.md

@@ -5,7 +5,7 @@ page_title: "Scaleway: scaleway_account_projects"
 
 # scaleway_account_projects
 
-The `scaleway_account_projects` data source is used to list all Scaleway projects in an Organization.
+The [`scaleway_account_projects`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/data-sources/account_projects) data source is used to list all Scaleway projects in an Organization.
 
 Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.
 

docs/resources/account_project.md

@@ -5,7 +5,7 @@ page_title: "Scaleway: scaleway_account_project"
 
 # Resource: scaleway_account_project
 
-The `scaleway_account_project` resource allows you to create and manage the Projects of a Scaleway Organization.
+The [`scaleway_account_project`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/account_project) resource allows you to create and manage the Projects of a Scaleway Organization.
 
 Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.
 

internal/services/account/descriptions/project.md

@@ -0,0 +1,3 @@
+The [`scaleway_account_project`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/resources/account_project) resource allows you to create and manage the Projects of a Scaleway Organization.
+
+Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.

internal/services/account/descriptions/project_datasource.md

@@ -0,0 +1,3 @@
+The [`scaleway_account_project`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/data-sources/account_project) data source is used to retrieve information about a Scaleway project.
+
+Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.

internal/services/account/descriptions/projects_datasource.md

@@ -0,0 +1,3 @@
+The [`scaleway_account_projects`](https://registry.terraform.io/providers/scaleway/scaleway/latest/docs/data-sources/account_projects) data source is used to list all Scaleway projects in an Organization.
+
+Refer to the Organizations and Projects [documentation](https://www.scaleway.com/en/docs/organizations-and-projects/) and [API documentation](https://www.scaleway.com/en/developers/api/account/project-api/) for more information.

internal/services/account/project.go

@@ -2,6 +2,7 @@ package account
 
 import (
 	"context"
+	_ "embed"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
@@ -13,8 +14,12 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
+//go:embed descriptions/project.md
+var projectDescription string
+
 func ResourceProject() *schema.Resource {
 	return &schema.Resource{
+		Description:   projectDescription,
 		CreateContext: resourceAccountProjectCreate,
 		ReadContext:   resourceAccountProjectRead,
 		UpdateContext: resourceAccountProjectUpdate,

internal/services/account/project_data_source.go

@@ -2,8 +2,8 @@ package account
 
 import (
 	"context"
+	_ "embed"
 
-	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
@@ -14,6 +14,9 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
 
+//go:embed descriptions/project_datasource.md
+var projectDataSourceDescription string
+
 func DataSourceProject() *schema.Resource {
 	dsSchema := datasource.SchemaFromResourceSchema(ResourceProject().SchemaFunc())
 	datasource.AddOptionalFieldsToSchema(dsSchema, "name", "organization_id")
@@ -30,6 +33,7 @@ func DataSourceProject() *schema.Resource {
 	return &schema.Resource{
 		ReadContext: DataSourceAccountProjectRead,
 		Schema:      dsSchema,
+		Description: projectDataSourceDescription,
 	}
 }
 
@@ -86,105 +90,3 @@ func DataSourceAccountProjectRead(ctx context.Context, d *schema.ResourceData, m
 
 	return nil
 }
-
-func DataSourceProjects() *schema.Resource {
-	dsSchema := datasource.SchemaFromResourceSchema(ResourceProject().SchemaFunc())
-	datasource.AddOptionalFieldsToSchema(dsSchema, "organization_id")
-
-	dsSchema["organization_id"] = &schema.Schema{
-		Type:             schema.TypeString,
-		Computed:         true,
-		Optional:         true,
-		Description:      "The ID of the organization",
-		ValidateDiagFunc: verify.IsUUID(),
-	}
-	dsSchema["projects"] = &schema.Schema{
-		Type:        schema.TypeList,
-		Computed:    true,
-		Description: "The list of projects",
-		Elem: &schema.Resource{
-			Schema: map[string]*schema.Schema{
-				"id": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "ID of the Project",
-				},
-				"name": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Name of the Project",
-				},
-				"organization_id": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Organization ID of the Project",
-				},
-				"created_at": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Creation date of the Project",
-				},
-				"updated_at": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Update date of the Project",
-				},
-				"description": {
-					Type:        schema.TypeString,
-					Computed:    true,
-					Description: "Description of the Project",
-				},
-			},
-		},
-	}
-
-	return &schema.Resource{
-		ReadContext: DataSourceAccountProjectsRead,
-		Schema:      dsSchema,
-	}
-}
-
-func DataSourceAccountProjectsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	accountAPI := NewProjectAPI(m)
-
-	var orgID *string
-
-	if v, orgIDExists := d.GetOk("organization_id"); orgIDExists {
-		orgID = types.ExpandStringPtr(v)
-	} else {
-		orgID = GetOrganizationID(m, d)
-	}
-
-	if orgID == nil {
-		return diag.Errorf("organization_id was not specified nor found in the provider configuration")
-	}
-
-	res, err := accountAPI.ListProjects(&accountSDK.ProjectAPIListProjectsRequest{
-		OrganizationID: *orgID,
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	d.SetId(uuid.New().String())
-	_ = d.Set("projects", flattenProjects(res.Projects))
-	_ = d.Set("organization_id", orgID)
-
-	return nil
-}
-
-func flattenProjects(projects []*accountSDK.Project) []map[string]any {
-	flattenedProjects := make([]map[string]any, len(projects))
-	for i, project := range projects {
-		flattenedProjects[i] = map[string]any{
-			"id":              project.ID,
-			"name":            project.Name,
-			"organization_id": project.OrganizationID,
-			"created_at":      types.FlattenTime(project.CreatedAt),
-			"updated_at":      types.FlattenTime(project.UpdatedAt),
-			"description":     project.Description,
-		}
-	}
-
-	return flattenedProjects
-}

internal/services/account/projects_data_source.go

@@ -0,0 +1,105 @@
+package account
+
+import (
+	"context"
+	_ "embed"
+
+	"github.com/google/uuid"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	accountSDK "github.com/scaleway/scaleway-sdk-go/api/account/v3"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/datasource"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
+)
+
+//go:embed descriptions/projects_datasource.md
+var projectsDataSourceDescription string
+
+func DataSourceProjects() *schema.Resource {
+	dsSchema := datasource.SchemaFromResourceSchema(ResourceProject().SchemaFunc())
+	datasource.AddOptionalFieldsToSchema(dsSchema, "organization_id")
+
+	dsSchema["organization_id"] = &schema.Schema{
+		Type:             schema.TypeString,
+		Computed:         true,
+		Optional:         true,
+		Description:      "The ID of the organization",
+		ValidateDiagFunc: verify.IsUUID(),
+	}
+	dsSchema["projects"] = &schema.Schema{
+		Type:        schema.TypeList,
+		Computed:    true,
+		Description: "The list of projects",
+		Elem: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"id": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "ID of the Project",
+				},
+				"name": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Name of the Project",
+				},
+				"organization_id": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Organization ID of the Project",
+				},
+				"created_at": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Creation date of the Project",
+				},
+				"updated_at": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Update date of the Project",
+				},
+				"description": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Description of the Project",
+				},
+			},
+		},
+	}
+
+	return &schema.Resource{
+		ReadContext: DataSourceAccountProjectsRead,
+		Schema:      dsSchema,
+		Description: projectsDataSourceDescription,
+	}
+}
+
+func DataSourceAccountProjectsRead(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
+	accountAPI := NewProjectAPI(m)
+
+	var orgID *string
+
+	if v, orgIDExists := d.GetOk("organization_id"); orgIDExists {
+		orgID = types.ExpandStringPtr(v)
+	} else {
+		orgID = GetOrganizationID(m, d)
+	}
+
+	if orgID == nil {
+		return diag.Errorf("organization_id was not specified nor found in the provider configuration")
+	}
+
+	res, err := accountAPI.ListProjects(&accountSDK.ProjectAPIListProjectsRequest{
+		OrganizationID: *orgID,
+	}, scw.WithContext(ctx))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(uuid.New().String())
+	_ = d.Set("projects", flattenProjects(res.Projects))
+	_ = d.Set("organization_id", orgID)
+
+	return nil
+}