Merge branch 'master' into feat/add_support_for_registar_domain

Author: jremy42

docs/resources/container.md

@@ -99,6 +99,8 @@ The following arguments are supported:
 
 - `deploy` - (Optional) Boolean indicating whether the container is in a production environment.
 
+- `local_storage_limit` - Local storage limit of the container (in MB)
+
 Note that if you want to use your own configuration, you must consult our configuration [restrictions](https://www.scaleway.com/en/docs/serverless-containers/reference-content/containers-limitations/#configuration-restrictions) section.
 
 ## Attributes Reference

docs/resources/mongodb_instance.md

@@ -25,6 +25,30 @@ resource "scaleway_mongodb_instance" "main" {
 }
 ```
 
+### Private Network
+
+```terraform
+resource scaleway_vpc_private_network pn01 {
+  name = "my_private_network"
+  region = "fr-par"
+}
+
+resource "scaleway_mongodb_instance" "main" {
+  name        = "test-mongodb-basic1"
+  version     = "7.0.12"
+  node_type   = "MGDB-PLAY2-NANO"
+  node_number = 1
+  user_name   = "my_initial_user"
+  password    = "thiZ_is_v&ry_s3cret"
+  volume_size_in_gb = 5
+  
+  private_network {
+    pn_id = "${scaleway_vpc_private_network.pn02.id}"
+  }
+
+}
+```
+
 
 ### Restore From Snapshot
 
@@ -51,6 +75,8 @@ The following arguments are supported:
 - `volume_type` - (Optional) Volume type of the instance.
 - `volume_size_in_gb` - (Optional) Volume size in GB.
 - `snapshot_id` - (Optional) Snapshot ID to restore the MongoDB® instance from.
+- `private_network` - (Optional) Private Network endpoints of the Database Instance.
+    - `pn_id` - (Required) The ID of the Private Network.
 - `public_network` - (Optional) Public network specs details.
 
 ## Attributes Reference
@@ -60,6 +86,11 @@ In addition to all arguments above, the following attributes are exported:
 - `id` - The ID of the MongoDB® instance.
 - `created_at` - The date and time of the creation of the MongoDB® instance.
 - `updated_at` - The date and time of the last update of the MongoDB® instance.
+- `private_network` - Private Network endpoints of the Database Instance.
+    - `id` - The ID of the endpoint.
+    - `ips` - List of IP addresses for your endpoint.
+    - `port` - TCP port of the endpoint.
+    - `dns_records` - List of DNS records for your endpoint.
 
 ## Import
 

internal/services/applesilicon/server.go

@@ -135,6 +135,17 @@ func ResourceServer() *schema.Resource {
 				Computed:    true,
 				Description: "The VPC status of the server",
 			},
+			"password": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Sensitive:   true,
+				Description: "The password of the server",
+			},
+			"username": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The username of the server",
+			},
 
 			// Common
 			"zone":            zonal.Schema(),
@@ -225,6 +236,8 @@ func ResourceAppleSiliconServerRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("zone", res.Zone.String())
 	_ = d.Set("organization_id", res.OrganizationID)
 	_ = d.Set("project_id", res.ProjectID)
+	_ = d.Set("password", res.SudoPassword)
+	_ = d.Set("username", res.SSHUsername)
 
 	listPrivateNetworks, err := privateNetworkAPI.ListServerPrivateNetworks(&applesilicon.PrivateNetworkAPIListServerPrivateNetworksRequest{
 		Zone:     res.Zone,

internal/services/cockpit/cockpit.go

@@ -25,53 +25,54 @@ func ResourceCockpit() *schema.Resource {
 				Type:        schema.TypeString,
 				Optional:    true,
 				Default:     "free",
-				Description: "Name or ID of the plan",
+				Description: "[DEPRECATED] The plan field is deprecated. Any modification or selection will have no effect.",
+				Deprecated:  "The 'plan' attribute is deprecated and no longer has any effect. Future updates will remove this attribute entirely.",
 			},
 			"plan_id": {
 				Type:        schema.TypeString,
 				Computed:    true,
-				Description: "The plan ID of the cockpit",
-				Deprecated:  "Please use Name only",
+				Description: "[DEPRECATED] The plan ID of the cockpit. This field is no longer relevant.",
+				Deprecated:  "The 'plan_id' attribute is deprecated and will be removed in a future release.",
 			},
 			"endpoints": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "Endpoints",
-				Deprecated:  "Please use `scaleway_cockpit_source` instead",
+				Description: "[DEPRECATED] Endpoints list. Please use 'scaleway_cockpit_source' instead.",
+				Deprecated:  "Use 'scaleway_cockpit_source' instead of 'endpoints'. This field will be removed in future releases.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"metrics_url": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The metrics URL",
+							Description: "The metrics URL.",
 						},
 						"logs_url": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The logs URL",
+							Description: "The logs URL.",
 						},
 						"alertmanager_url": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The alertmanager URL",
+							Description: "The alertmanager URL.",
 						},
 						"grafana_url": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The grafana URL",
+							Description: "The grafana URL.",
 						},
 						"traces_url": {
 							Type:        schema.TypeString,
 							Computed:    true,
-							Description: "The traces URL",
+							Description: "The traces URL.",
 						},
 					},
 				},
 			},
 			"push_url": {
 				Type:        schema.TypeList,
 				Computed:    true,
-				Description: "Push_url",
+				Description: "[DEPRECATED] Push_url",
 				Deprecated:  "Please use `scaleway_cockpit_source` instead",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -93,48 +94,22 @@ func ResourceCockpit() *schema.Resource {
 }
 
 func ResourceCockpitCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, err := NewGlobalAPI(m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
 	projectID := d.Get("project_id").(string)
-
-	if targetPlanI, ok := d.GetOk("plan"); ok {
-		targetPlan := targetPlanI.(string)
-
-		plans, err := api.ListPlans(&cockpit.GlobalAPIListPlansRequest{}, scw.WithContext(ctx), scw.WithAllPages()) //nolint:staticcheck
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		var planName string
-
-		for _, plan := range plans.Plans {
-			if plan.Name.String() == targetPlan {
-				planName = plan.Name.String()
-
-				break
-			}
-		}
-
-		if planName == "" {
-			return diag.Errorf("plan %s not found", targetPlan)
-		}
-
-		_, err = api.SelectPlan(&cockpit.GlobalAPISelectPlanRequest{ //nolint:staticcheck
-			ProjectID: projectID,
-			PlanName:  cockpit.PlanName(planName),
-		}, scw.WithContext(ctx))
+	if projectID == "" {
+		_, err := getDefaultProjectID(ctx, m)
 		if err != nil {
 			return diag.FromErr(err)
 		}
 	}
 
+	d.SetId(projectID)
+
 	return ResourceCockpitRead(ctx, d, m)
 }
 
 func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+
 	api, err := NewGlobalAPI(m)
 	if err != nil {
 		return diag.FromErr(err)
@@ -153,15 +128,14 @@ func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interfac
 		}
 	}
 
-	res, err := api.GetCurrentPlan(&cockpit.GlobalAPIGetCurrentPlanRequest{ //nolint:staticcheck
-		ProjectID: projectID,
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
-	}
+	diags = append(diags, diag.Diagnostic{
+		Severity: diag.Warning,
+		Summary:  "Deprecated attribute: 'plan'",
+		Detail:   "The 'plan' attribute is deprecated and will be removed in a future version. Any changes to this attribute will have no effect.",
+	})
 
-	_ = d.Set("plan", res.Name.String())
-	_ = d.Set("plan_id", res.Name.String())
+	_ = d.Set("plan", d.Get("plan"))
+	_ = d.Set("plan_id", "")
 
 	dataSourcesRes, err := regionalAPI.ListDataSources(&cockpit.RegionalAPIListDataSourcesRequest{
 		Region:    region,
@@ -203,54 +177,26 @@ func ResourceCockpitRead(ctx context.Context, d *schema.ResourceData, m interfac
 	_ = d.Set("endpoints", endpoints)
 	_ = d.Set("push_url", createCockpitPushURLList(endpoints))
 
-	return nil
+	return diags
 }
 
 func ResourceCockpitUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	api, err := NewGlobalAPI(m)
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
-	projectID := d.Id()
-
+	diags := diag.Diagnostics{}
 	if d.HasChange("plan") {
-		targetPlan := cockpit.PlanNameFree.String()
-		if targetPlanI, ok := d.GetOk("plan"); ok {
-			targetPlan = targetPlanI.(string)
-		}
-
-		plans, err := api.ListPlans(&cockpit.GlobalAPIListPlansRequest{}, scw.WithContext(ctx), scw.WithAllPages()) //nolint:staticcheck
-		if err != nil {
-			return diag.FromErr(err)
-		}
-
-		var planName string
-
-		for _, plan := range plans.Plans {
-			if plan.Name.String() == targetPlan {
-				planName = plan.Name.String()
-
-				break
-			}
-		}
-
-		if planName == "" {
-			return diag.Errorf("plan %s not found", targetPlan)
-		}
-
-		_, err = api.SelectPlan(&cockpit.GlobalAPISelectPlanRequest{ //nolint:staticcheck
-			ProjectID: projectID,
-			PlanName:  cockpit.PlanName(planName),
-		}, scw.WithContext(ctx))
-		if err != nil {
-			return diag.FromErr(err)
-		}
+		diags = append(diags, diag.Diagnostic{
+			Severity: diag.Warning,
+			Summary:  "Deprecated attribute update: 'plan'",
+			Detail:   "Updating 'plan' has no effect as it is deprecated and will be removed in a future version.",
+		})
 	}
 
-	return ResourceCockpitRead(ctx, d, m)
+	diags = append(diags, ResourceCockpitRead(ctx, d, m)...)
+
+	return diags
 }
 
-func ResourceCockpitDelete(_ context.Context, _ *schema.ResourceData, _ interface{}) diag.Diagnostics {
+func ResourceCockpitDelete(_ context.Context, d *schema.ResourceData, _ interface{}) diag.Diagnostics {
+	d.SetId("")
+
 	return nil
 }