chore(container/function): namespace: deprecate activate_vpc_integration attribute

Author: Mia-Cross

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
 

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(),
@@ -129,10 +129,6 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
 		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),
 				),
 			},
 		},

internal/services/container/testdata/namespace-vpc-integration.cassette.yaml

@@ -88,9 +88,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(),
@@ -120,10 +120,6 @@ func ResourceFunctionNamespaceCreate(ctx context.Context, d *schema.ResourceData
 		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/function/namespace.go

@@ -2,7 +2,6 @@ package function_test
 
 import (
 	"fmt"
-	"regexp"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -212,27 +211,10 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) {
 				`,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFunctionNamespaceExists(tt, "scaleway_function_namespace.main"),
-					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "activate_vpc_integration", "false"),
+					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "activate_vpc_integration", "true"),
 					acctest.CheckResourceIDPersisted("scaleway_function_namespace.main", &namespaceID),
 				),
 			},
-			{
-				Config: `
-					resource scaleway_vpc_private_network main {}
-			
-					resource scaleway_function_namespace main {}
-			
-					resource scaleway_function main {
-						namespace_id = scaleway_function_namespace.main.id
-						privacy = "private"
-						sandbox = "v1"
-						runtime = "go123"
-						handler = "Handle"
-						private_network_id = scaleway_vpc_private_network.main.id
-					}
-				`,
-				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 {}
@@ -255,7 +237,7 @@ func TestAccFunctionNamespace_VPCIntegration(t *testing.T) {
 					testAccCheckFunctionExists(tt, "scaleway_function.main"),
 					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "activate_vpc_integration", "true"),
 					resource.TestCheckResourceAttrPair("scaleway_function.main", "private_network_id", "scaleway_vpc_private_network.main", "id"),
-					acctest.CheckResourceIDChanged("scaleway_function_namespace.main", &namespaceID),
+					acctest.CheckResourceIDPersisted("scaleway_function_namespace.main", &namespaceID),
 				),
 			},
 		},