Merge branch 'master' into fix_warning_golang

Author: remyleone

docs/resources/cockpit.md

@@ -5,6 +5,14 @@ page_title: "Scaleway: scaleway_cockpit"
 
 # Resource: scaleway_cockpit
 
+~> **Important:** The resource `scaleway_cockpit` has been deprecated and will no longer be supported after January 1st, 2025. Instead, use the new specialized resources:
+
+- `scaleway_cockpit_source` for managing data sources (metrics, logs, traces)
+- `scaleway_cockpit_alert_manager` for managing alert manager
+- `scaleway_cockpit_grafana_user` for managing Grafana users
+
+For detailed migration instructions, see the [Cockpit Migration Guide](../guides/migration_guide_cockpit_plan.md).
+
 -> **Note:**
 As of September 2024, Cockpit has introduced [regionalization](https://www.scaleway.com/en/docs/observability/cockpit/concepts/#region) to offer more flexibility and resilience.
 If you have created customized dashboards with data for your Scaleway resources before April 2024, you will need to update your queries in Grafana, with the new regionalized [data sources](../resources/cockpit_source.md).
@@ -74,8 +82,12 @@ resource "grafana_folder" "test_folder" {
 - `plan` - (Deprecated) Name of the plan to use. Available plans are: free, premium, and custom.
 ~> **Important:** The plan field is deprecated. Any modification or selection will have no effect.
 
+~> **Warning:** This entire resource is deprecated and will be removed after January 1st, 2025. Please migrate to the new specialized resources as described in the [Cockpit Migration Guide](../guides/migration_guide_cockpit_plan.md).
+
 ## Attributes Reference
 
+~> **Warning:** This entire resource is deprecated and will be removed after January 1st, 2025. All attributes below are deprecated and will no longer be available.
+
 In addition to all arguments above, the following attributes are exported:
 
 - `plan_id` - (Deprecated) The ID of the current pricing plan.
@@ -86,10 +98,20 @@ In addition to all arguments above, the following attributes are exported:
     - `grafana_url` - (Deprecated) URL for Grafana.
     - `traces_url` - (Deprecated) URL for [traces](https://www.scaleway.com/en/docs/observability/cockpit/concepts/#traces) to retrieve in the [Data sources tab](https://console.scaleway.com/cockpit/dataSource) of the Scaleway console.
 
+## Migration
+
+This resource is deprecated and will be removed after January 1st, 2025. To migrate to the new infrastructure, please refer to the [Cockpit Migration Guide](../guides/migration_guide_cockpit_plan.md) which provides step-by-step instructions for transitioning to:
+
+- `scaleway_cockpit_source` for managing data sources (metrics, logs, traces)
+- `scaleway_cockpit_alert_manager` for managing alert manager  
+- `scaleway_cockpit_grafana_user` for managing Grafana users
+
 ## Import
 
 This section explains how to import a Cockpit using its `{project_id}`.
 
 ```bash
 terraform import scaleway_cockpit.main 11111111-1111-1111-1111-111111111111
 ```
+
+~> **Note:** Import functionality will be removed when this resource is deprecated.

docs/resources/container_namespace.md

@@ -40,9 +40,9 @@ The following arguments are supported:
 
 - `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
-- `activate_vpc_integration` - (Optional) Activates VPC integration for the namespace. Containers of a namespace with VPC integration activated will be able to connect to a Private Network.
+- `activate_vpc_integration` - (Deprecated) Activates VPC integration for the namespace. Containers of a namespace with VPC integration activated will be able to connect to a Private Network.
 
-~> **Important** Updates to `activate_vpc_integration` will recreate the namespace.
+~> **Important:** VPC integration is now available on all namespaces, so this field is not configurable anymore and its value will always be "true".
 
 ## Attributes Reference
 

docs/resources/function_namespace.md

@@ -40,9 +40,9 @@ The following arguments are supported:
 
 - `secret_environment_variables` - (Optional) The secret environment variables of the namespace.
 
-- `activate_vpc_integration` - (Optional) Activates VPC integration for the namespace. Functions of a namespace with VPC integration activated will be able to connect to a Private Network.
+- `activate_vpc_integration` - (Deprecated) Activates VPC integration for the namespace. Functions of a namespace with VPC integration activated will be able to connect to a Private Network.
 
-~> **Important** Updates to `activate_vpc_integration` will recreate the namespace.
+~> **Important:** VPC integration is now available on all namespaces, so this field is not configurable anymore and its value will always be "true".
 
 ## Attributes Reference
 

docs/resources/rdb_user.md

@@ -24,8 +24,17 @@ resource "scaleway_rdb_instance" "main" {
 }
 
 resource "random_password" "db_password" {
-  length  = 16
-  special = true
+  length           = 20
+  special          = true
+  upper            = true
+  lower            = true
+  numeric          = true
+  min_upper        = 1
+  min_lower        = 1
+  min_numeric      = 1
+  min_special      = 1
+  # Exclude characters that might cause issues in some contexts
+  override_special = "!@#$%^&*()_+-=[]{}|;:,.<>?"
 }
 
 resource "scaleway_rdb_user" "db_admin" {
@@ -48,7 +57,15 @@ The following arguments are supported:
 
 ~> **Important:** Updates to `name` will recreate the database user.
 
-- `password` - (Required) database user password.
+- `password` - (Required) database user password. The password must meet the following requirements based on ISO27001 standards:
+    - **Length**: 8-128 characters
+    - **Character types required**:
+        - At least 1 lowercase letter (a-z)
+        - At least 1 uppercase letter (A-Z)
+        - At least 1 digit (0-9)
+        - At least 1 special character (!@#$%^&*()_+-=[]{}|;:,.<>?)
+
+    For secure password generation, consider using the `random_password` resource with appropriate parameters.
 
 - `is_admin` - (Optional) Grant admin permissions to the database user.
 

internal/services/cockpit/cockpit.go

@@ -90,6 +90,7 @@ func ResourceCockpit() *schema.Resource {
 				},
 			},
 		},
+		DeprecationMessage: "The scaleway_cockpit resource is deprecated and will be removed after January 1st, 2025. Use the new specialized resources instead: scaleway_cockpit_source, scaleway_cockpit_alert_manager, and scaleway_cockpit_grafana_user.",
 	}
 }
 

internal/services/container/namespace.go

@@ -97,9 +97,9 @@ func ResourceNamespace() *schema.Resource {
 			},
 			"activate_vpc_integration": {
 				Type:        schema.TypeBool,
-				ForceNew:    true,
+				Deprecated:  "VPC integration is now available on all namespaces, so this field is not configurable anymore and its value will always be \"true\".",
 				Optional:    true,
-				Default:     false,
+				Default:     true,
 				Description: "Activate VPC integration for the namespace",
 			},
 			"region":          regional.Schema(),
@@ -122,17 +122,14 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
 		Name:                       types.ExpandOrGenerateString(d.Get("name").(string), "ns"),
 		ProjectID:                  d.Get("project_id").(string),
 		Region:                     region,
+		ActivateVpcIntegration:     true,
 	}
 
 	rawTag, tagExist := d.GetOk("tags")
 	if tagExist {
 		createReq.Tags = types.ExpandStrings(rawTag)
 	}
 
-	if activateVPC, ok := d.GetOk("activate_vpc_integration"); ok {
-		createReq.ActivateVpcIntegration = activateVPC.(bool)
-	}
-
 	ns, err := api.CreateNamespace(createReq, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)

internal/services/container/namespace_test.go

@@ -2,7 +2,6 @@ package container_test
 
 import (
 	"fmt"
-	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -295,24 +294,10 @@ func TestAccNamespace_VPCIntegration(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					isNamespacePresent(tt, "scaleway_container_namespace.main"),
-					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "activate_vpc_integration", "false"),
+					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "activate_vpc_integration", "true"),
 					acctest.CheckResourceIDPersisted("scaleway_container_namespace.main", &namespaceID),
 				),
 			},
-			{
-				Config: `
-					resource scaleway_vpc_private_network main {}
-			
-					resource scaleway_container_namespace main {}
-			
-					resource scaleway_container main {
-						namespace_id = scaleway_container_namespace.main.id
-						private_network_id = scaleway_vpc_private_network.main.id
-						sandbox = "v1"
-					}
-				`,
-				ExpectError: regexp.MustCompile("Application can't be attached to private network, vpc integration must be activated on its parent namespace"),
-			},
 			{
 				Config: `
 					resource scaleway_vpc_private_network main {}
@@ -332,7 +317,7 @@ func TestAccNamespace_VPCIntegration(t *testing.T) {
 					isContainerPresent(tt, "scaleway_container.main"),
 					resource.TestCheckResourceAttr("scaleway_container_namespace.main", "activate_vpc_integration", "true"),
 					resource.TestCheckResourceAttrPair("scaleway_container.main", "private_network_id", "scaleway_vpc_private_network.main", "id"),
-					acctest.CheckResourceIDChanged("scaleway_container_namespace.main", &namespaceID),
+					acctest.CheckResourceIDPersisted("scaleway_container_namespace.main", &namespaceID),
 				),
 			},
 		},