container test ok

Author: Mia-Cross

docs/resources/function.md

@@ -99,6 +99,9 @@ The following arguments are supported:
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the functions namespace is associated with.
 
+- `private_network_id` (Optional) The ID of the Private Network the function is connected to.
+
+~> **Important** This feature is currently in beta and requires a namespace with VPC integration activated by setting the `activate_vpc_integration` attribute to `true`.
 
 ## Attributes Reference
 

internal/services/function/function.go

@@ -336,6 +336,8 @@ func ResourceFunctionRead(ctx context.Context, d *schema.ResourceData, m interfa
 
 	if f.PrivateNetworkID != nil {
 		_ = d.Set("private_network_id", regional.NewID(region, types.FlattenStringPtr(f.PrivateNetworkID).(string)).String())
+	} else {
+		_ = d.Set("private_network_id", nil)
 	}
 
 	return diags
@@ -430,12 +432,7 @@ func ResourceFunctionUpdate(ctx context.Context, d *schema.ResourceData, m inter
 	}
 
 	if d.HasChanges("private_network_id") {
-		if _, newPNID := d.GetChange("private_network_id"); newPNID != nil && newPNID.(string) != "" {
-			req.PrivateNetworkID = types.ExpandUpdatedStringPtr(locality.ExpandID(newPNID.(string)))
-		} else {
-			req.PrivateNetworkID = nil
-		}
-
+		req.PrivateNetworkID = types.ExpandUpdatedStringPtr(locality.ExpandID(d.Get("private_network_id")))
 		updated = true
 	}
 

internal/services/function/function_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/acctest"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/function"
+	vpcchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpc/testfuncs"
 )
 
 func TestAccFunction_Basic(t *testing.T) {
@@ -410,6 +411,146 @@ func TestAccFunction_Sandbox(t *testing.T) {
 	})
 }
 
+func TestAccFunction_PrivateNetwork(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			testAccCheckFunctionNamespaceDestroy(tt),
+			testAccCheckFunctionDestroy(tt),
+			vpcchecks.CheckPrivateNetworkDestroy(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_vpc_private_network pn00 {}
+					resource scaleway_vpc_private_network pn01 {}
+
+					resource scaleway_function_namespace main {
+						activate_vpc_integration = true
+					}
+
+					resource scaleway_function c00 {
+						name = "test-acc-function-pn-00"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn00.id
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckFunctionExists(tt, "scaleway_function.c00"),
+					resource.TestCheckResourceAttr("scaleway_function_namespace.main", "activate_vpc_integration", "true"),
+					resource.TestCheckResourceAttr("scaleway_function.c00", "sandbox", "v1"),
+					resource.TestCheckResourceAttrPair("scaleway_function.c00", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_vpc_private_network pn00 {}
+					resource scaleway_vpc_private_network pn01 {}
+
+					resource scaleway_function_namespace main {
+						activate_vpc_integration = true
+					}
+
+					resource scaleway_function c00 {
+						name = "test-acc-function-pn-00"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn00.id
+					}
+
+					resource scaleway_function c01 {
+						name = "test-acc-function-pn-01"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn00.id
+					}
+
+					resource scaleway_function c02 {
+						name = "test-acc-function-pn-02"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn00.id
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckFunctionExists(tt, "scaleway_function.c00"),
+					testAccCheckFunctionExists(tt, "scaleway_function.c01"),
+					testAccCheckFunctionExists(tt, "scaleway_function.c02"),
+					resource.TestCheckResourceAttr("scaleway_function.c00", "sandbox", "v1"),
+					resource.TestCheckResourceAttr("scaleway_function.c01", "sandbox", "v1"),
+					resource.TestCheckResourceAttr("scaleway_function.c02", "sandbox", "v1"),
+					resource.TestCheckResourceAttrPair("scaleway_function.c00", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_function.c01", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_function.c02", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_vpc_private_network pn00 {}
+					resource scaleway_vpc_private_network pn01 {}
+
+					resource scaleway_function_namespace main {
+						activate_vpc_integration = true
+					}
+
+					resource scaleway_function c00 {
+						name = "test-acc-function-pn-00"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+					}
+
+					resource scaleway_function c01 {
+						name = "test-acc-function-pn-01"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn01.id
+					}
+
+					resource scaleway_function c02 {
+						name = "test-acc-function-pn-02"
+						namespace_id = scaleway_function_namespace.main.id
+						privacy = "private"
+						runtime = "go123"
+						handler = "Handle"
+						sandbox = "v1"
+						private_network_id = scaleway_vpc_private_network.pn00.id
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckFunctionExists(tt, "scaleway_function.c00"),
+					testAccCheckFunctionExists(tt, "scaleway_function.c01"),
+					testAccCheckFunctionExists(tt, "scaleway_function.c02"),
+					resource.TestCheckResourceAttr("scaleway_function.c00", "private_network_id", ""),
+					resource.TestCheckResourceAttrPair("scaleway_function.c01", "private_network_id", "scaleway_vpc_private_network.pn01", "id"),
+					resource.TestCheckResourceAttrPair("scaleway_function.c02", "private_network_id", "scaleway_vpc_private_network.pn00", "id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckFunctionExists(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]
@@ -468,7 +609,7 @@ func passwordMatchHash(parent string, key string, password string) resource.Test
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[parent]
 		if !ok {
-			return fmt.Errorf("resource container not found: %s", parent)
+			return fmt.Errorf("resource not found: %s", parent)
 		}
 
 		match, err := argon2id.ComparePasswordAndHash(password, rs.Primary.Attributes[key])