feat(container): add destroy_registry field to container namespace (#1321)

Co-authored-by: Rémy Léone <[email protected]>

Author: Codelax

docs/resources/container_namespace.md

@@ -36,6 +36,8 @@ The following arguments are supported:
 
 - `environment_variables` - The environment variables of the namespace.
 
+- `destroy_registry` - (Defaults to false). Destroy linked container registry on deletion.
+
 ## Attributes Reference
 
 In addition to all arguments above, the following attributes are exported:

scaleway/resource_container_namespace.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -60,6 +61,12 @@ func resourceScalewayContainerNamespace() *schema.Resource {
 				Computed:    true,
 				Description: "The ID of the registry namespace",
 			},
+			"destroy_registry": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "Destroy registry on deletion",
+			},
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
 			"project_id":      projectIDSchema(),
@@ -177,13 +184,32 @@ func resourceScalewayContainerNamespaceDelete(ctx context.Context, d *schema.Res
 	}
 
 	_, err = waitForContainerNamespace(ctx, api, region, id, d.Timeout(schema.TimeoutDelete))
-	if err != nil {
-		if is404Error(err) {
-			d.SetId("")
-			return nil
-		}
+	if err != nil && !is404Error(err) {
 		return diag.FromErr(err)
 	}
 
+	d.SetId("")
+
+	if destroy := d.Get("destroy_registry"); destroy != nil && destroy == true {
+		registryAPI, region, err := registryAPIWithRegion(d, meta)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		registryID := d.Get("registry_namespace_id").(string)
+
+		_, err = registryAPI.DeleteNamespace(&registry.DeleteNamespaceRequest{
+			Region:      region,
+			NamespaceID: registryID,
+		})
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		_, err = waitForRegistryNamespace(ctx, registryAPI, region, registryID, d.Timeout(schema.TimeoutDelete))
+		if err != nil && !is404Error(err) {
+			return diag.FromErr(err)
+		}
+	}
+
 	return nil
 }

scaleway/resource_container_namespace_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
+	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -147,6 +148,34 @@ func TestAccScalewayContainerNamespace_Basic(t *testing.T) {
 	})
 }
 
+func TestAccScalewayContainerNamespace_DestroyRegistry(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			testAccCheckScalewayContainerNamespaceDestroy(tt),
+			testAccCheckScalewayContainerRegistryDestroy(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					resource scaleway_container_namespace main {
+						name = "test-cr-ns-01"
+						destroy_registry = true
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayContainerNamespaceExists(tt, "scaleway_container_namespace.main"),
+					testCheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayContainerNamespaceExists(tt *TestTools, n string) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		rs, ok := state.RootModule().Resources[n]
@@ -175,7 +204,7 @@ func testAccCheckScalewayContainerNamespaceExists(tt *TestTools, n string) resou
 func testAccCheckScalewayContainerNamespaceDestroy(tt *TestTools) resource.TestCheckFunc {
 	return func(state *terraform.State) error {
 		for _, rs := range state.RootModule().Resources {
-			if rs.Type != "scaleway_container_namespace" {
+			if rs.Type != "scaleway_container_namespace" { //nolint:goconst
 				continue
 			}
 
@@ -201,3 +230,33 @@ func testAccCheckScalewayContainerNamespaceDestroy(tt *TestTools) resource.TestC
 		return nil
 	}
 }
+
+func testAccCheckScalewayContainerRegistryDestroy(tt *TestTools) resource.TestCheckFunc {
+	return func(state *terraform.State) error {
+		for _, rs := range state.RootModule().Resources {
+			if rs.Type != "scaleway_container_namespace" {
+				continue
+			}
+
+			api, region, _, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+			if err != nil {
+				return err
+			}
+
+			_, err = api.DeleteNamespace(&registry.DeleteNamespaceRequest{
+				NamespaceID: rs.Primary.Attributes["registry_namespace_id"],
+				Region:      region,
+			})
+
+			if err == nil {
+				return fmt.Errorf("registry namespace (%s) still exists", rs.Primary.Attributes["registry_namespace_id"])
+			}
+
+			if !is404Error(err) {
+				return err
+			}
+		}
+
+		return nil
+	}
+}