feat(serverless): add sandbox field (#2657)

* feat(container): add sandbox field * feat(function): add sandbox field * add cassettes * update doc
scaleway · Jul 11, 2024 · 4138acf · 4138acf
1 parent 45cddcd
commit 4138acf
Show file tree

Hide file tree

Showing 10 changed files with 5,116 additions and 0 deletions.
diff --git a/docs/data-sources/container.md b/docs/data-sources/container.md
@@ -86,6 +86,8 @@ In addition to all arguments above, the following attributes are exported:
 
 - `deploy` - Boolean indicating whether the container is on a production environment.
 
+- `sandbox` - (Optional) Execution environment of the container.
+
 - `status` - The container status.
 
 - `cron_status` - The cron status of the container.

diff --git a/docs/resources/container.md b/docs/resources/container.md
@@ -86,6 +86,8 @@ The following arguments are optional:
 
 - `http_option` - (Optional) Allow both HTTP and HTTPS (enabled) or redirect HTTP to HTTPS (redirected). Defaults to enabled.
 
+- `sandbox` - (Optional) Execution environment of the container.
+
 - `port` - (Optional) The port to expose the container. Defaults to 8080.
 
 - `deploy` - (Optional) Boolean controlling whether the container is on a production environment.

diff --git a/docs/resources/function.md b/docs/resources/function.md
@@ -84,6 +84,8 @@ The following arguments are supported:
 
 - `deploy` - Define if the function should be deployed, terraform will wait for function to be deployed. Function will get deployed if you change source zip
 
+- `sandbox` - (Optional) Execution environment of the function.
+
 - `region` - (Defaults to [provider](../index.md#region) `region`). The [region](../guides/regions_and_zones.md#regions) in which the namespace should be created.
 
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the namespace is associated with.

diff --git a/internal/services/container/container.go b/internal/services/container/container.go
@@ -163,6 +163,13 @@ func ResourceContainer() *schema.Resource {
 				Default:          container.ContainerHTTPOptionEnabled.String(),
 				ValidateDiagFunc: verify.ValidateEnum[container.ContainerHTTPOption](),
 			},
+			"sandbox": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				Computed:         true,
+				Description:      "Execution environment of the container.",
+				ValidateDiagFunc: verify.ValidateEnum[container.ContainerSandbox](),
+			},
 			// computed
 			"status": {
 				Type:        schema.TypeString,
@@ -272,6 +279,7 @@ func ResourceContainerRead(ctx context.Context, d *schema.ResourceData, m interf
 	_ = d.Set("port", int(co.Port))
 	_ = d.Set("deploy", scw.BoolPtr(*types.ExpandBoolPtr(d.Get("deploy"))))
 	_ = d.Set("http_option", co.HTTPOption)
+	_ = d.Set("sandbox", co.Sandbox)
 	_ = d.Set("region", co.Region.String())
 
 	return nil
@@ -363,6 +371,10 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		req.Redeploy = types.ExpandBoolPtr(d.Get("deploy"))
 	}
 
+	if d.HasChanges("sandbox") {
+		req.Sandbox = container.ContainerSandbox(d.Get("sandbox").(string))
+	}
+
 	imageHasChanged := d.HasChanges("registry_sha256")
 	if imageHasChanged {
 		req.Redeploy = &imageHasChanged

diff --git a/internal/services/container/container_test.go b/internal/services/container/container_test.go
@@ -330,6 +330,76 @@ func TestAccContainer_HTTPOption(t *testing.T) {
 	})
 }
 
+func TestAccContainer_Sandbox(t *testing.T) {
+	tt := acctest.NewTestTools(t)
+	defer tt.Cleanup()
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      isContainerDestroyed(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_container_namespace main {}
+
+					resource scaleway_container main {
+						namespace_id = scaleway_container_namespace.main.id
+						deploy = false
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isContainerPresent(tt, "scaleway_container.main"),
+					resource.TestCheckResourceAttrSet("scaleway_container.main", "sandbox"),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_container_namespace main {}
+
+					resource scaleway_container main {
+						namespace_id = scaleway_container_namespace.main.id
+						deploy = false
+						sandbox = "v2"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isContainerPresent(tt, "scaleway_container.main"),
+					resource.TestCheckResourceAttr("scaleway_container.main", "sandbox", containerSDK.ContainerSandboxV2.String()),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_container_namespace main {}
+
+					resource scaleway_container main {
+						namespace_id = scaleway_container_namespace.main.id
+						deploy = false
+						sandbox = "v1"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isContainerPresent(tt, "scaleway_container.main"),
+					resource.TestCheckResourceAttr("scaleway_container.main", "sandbox", containerSDK.ContainerSandboxV1.String()),
+				),
+			},
+			{
+				Config: `
+					resource scaleway_container_namespace main {}
+
+					resource scaleway_container main {
+						namespace_id = scaleway_container_namespace.main.id
+						sandbox = "v2"
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					isContainerPresent(tt, "scaleway_container.main"),
+					resource.TestCheckResourceAttr("scaleway_container.main", "sandbox", containerSDK.ContainerSandboxV2.String()),
+				),
+			},
+		},
+	})
+}
+
 func isContainerPresent(tt *acctest.TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]

diff --git a/internal/services/container/helpers_container.go b/internal/services/container/helpers_container.go
@@ -111,6 +111,10 @@ func setCreateContainerRequest(d *schema.ResourceData, region scw.Region) (*cont
 		req.MaxConcurrency = scw.Uint32Ptr(uint32(maxConcurrency.(int)))
 	}
 
+	if sandbox, ok := d.GetOk("sandbox"); ok {
+		req.Sandbox = container.ContainerSandbox(sandbox.(string))
+	}
+
 	return req, nil
 }