feat(registry): add support for project in namespace (#607)

Author: remyleone

docs/data-sources/registry_image.md

@@ -37,6 +37,8 @@ data "scaleway_registry_image" "my_image" {
 
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the image is associated with.
 
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the image is associated with.
+
 ## Attributes Reference
 
 In addition to all above arguments, the following attributes are exported:

docs/data-sources/registry_namespace.md

@@ -34,6 +34,8 @@ data "scaleway_registry_namespace" "my_namespace" {
 
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the namespace is associated with.
 
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the namespace is associated with.
+
 ## Attributes Reference
 
 In addition to all above arguments, the following attributes are exported:

docs/resources/registry_namespace.md

@@ -6,7 +6,8 @@ description: |-
 
 # scaleway_registry_namespace
 
-Creates and manages Scaleway Container Registry. For more information see [the documentation](https://developers.scaleway.com/en/products/registry/api/).
+Creates and manages Scaleway Container Registry.
+For more information see [the documentation](https://developers.scaleway.com/en/products/registry/api/).
 
 ## Examples
 
@@ -24,28 +25,30 @@ resource "scaleway_registry_namespace" "main" {
 
 The following arguments are supported:
 
-- `name` - (Required) The unique name of the container registry namespace.
+- `name` - (Required) The unique name of the namespace.
 
 ~> **Important** Updates to `name` will recreate the namespace.
 
-- `description` (Optional) The description of the container registry namespace.
+- `description` (Optional) The description of the namespace.
 
-- `is_public` (Defaults to `false`) Whether or not the registry images stored in the namespace should be downloadable publicly (docker pull).
+- `is_public` (Defaults to `false`) Whether the images stored in the namespace should be downloadable publicly (docker pull).
 
-- `region` - (Defaults to [provider](../index.md#region) `region`). The [region](../guides/regions_and_zones.md#regions) in which the container registry namespace should be created.
+- `region` - (Defaults to [provider](../index.md#region) `region`). The [region](../guides/regions_and_zones.md#regions) in which the namespace should be created.
 
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the registry is associated with.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the namespace is associated with.
+
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the namespace is associated with.
 
 ## Attributes Reference
 
-In addition to all arguments above, the following attibutes are exported:
+In addition to all arguments above, the following attributes are exported:
 
 - `id` - The ID of the namespace
-- `endpoint` - Endpoint reachable by docker.
+- `endpoint` - Endpoint reachable by Docker.
 
 ## Import
 
-Container Registry Namespace can be imported using the `{region}/{id}`, eg.
+Namespaces can be imported using the `{region}/{id}`, e.g.
 
 ```bash
 $ terraform import scaleway_registry_namespace.main fr-par/11111111-1111-1111-1111-111111111111

scaleway/data_source_registry_image.go

@@ -53,6 +53,7 @@ func dataSourceScalewayRegistryImage() *schema.Resource {
 			},
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }

scaleway/data_source_registry_image_test.go

@@ -10,13 +10,15 @@ import (
 )
 
 func TestAccScalewayDataSourceRegistryImage_Basic(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
 	ubuntuImageID := "4b5a47c0-6fbf-4388-8783-c07c28d3c2eb"
 
 	t.Skip("It is difficult to test this datasource as we cannot create registry images with Terraform.")
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -55,8 +57,8 @@ func TestAccScalewayDataSourceRegistryImage_Basic(t *testing.T) {
 }
 
 func testAccCheckScalewayRegistryImageExists(n string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[n]
+	return func(state *terraform.State) error {
+		rs, ok := state.RootModule().Resources[n]
 		if !ok {
 			return fmt.Errorf("resource not found: %s", n)
 		}

scaleway/data_source_registry_namespace_test.go

@@ -7,10 +7,13 @@ import (
 )
 
 func TestAccScalewayDataSourceRegistryNamespace_Basic(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -27,7 +30,7 @@ func TestAccScalewayDataSourceRegistryNamespace_Basic(t *testing.T) {
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayRegistryNamespaceExists("scaleway_registry_namespace.test"),
+					testAccCheckScalewayRegistryNamespaceExists(tt, "scaleway_registry_namespace.test"),
 
 					resource.TestCheckResourceAttr("scaleway_registry_namespace.test", "name", "test-cr"),
 					resource.TestCheckResourceAttrSet("data.scaleway_registry_namespace.test", "id"),
@@ -58,7 +61,7 @@ func TestAccScalewayDataSourceRegistryNamespace_Basic(t *testing.T) {
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayRegistryNamespaceExists("scaleway_registry_namespace.test"),
+					testAccCheckScalewayRegistryNamespaceExists(tt, "scaleway_registry_namespace.test"),
 
 					resource.TestCheckResourceAttr("scaleway_registry_namespace.test", "name", "test-cr"),
 					resource.TestCheckResourceAttrSet("data.scaleway_registry_namespace.test", "id"),

scaleway/resource_registry_namespace.go

@@ -58,13 +58,11 @@ func resourceScalewayRegistryNamespaceCreate(ctx context.Context, d *schema.Reso
 	}
 
 	ns, err := api.CreateNamespace(&registry.CreateNamespaceRequest{
-		Region: region,
-		// Registry does not support yet project id.
-		// Once it does, use ProjectID instead or OrganizationID
-		OrganizationID: expandStringPtr(d.Get("project_id")),
-		Name:           d.Get("name").(string),
-		Description:    d.Get("description").(string),
-		IsPublic:       d.Get("is_public").(bool),
+		Region:      region,
+		ProjectID:   expandStringPtr(d.Get("project_id")),
+		Name:        d.Get("name").(string),
+		Description: d.Get("description").(string),
+		IsPublic:    d.Get("is_public").(bool),
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -96,9 +94,8 @@ func resourceScalewayRegistryNamespaceRead(ctx context.Context, d *schema.Resour
 
 	_ = d.Set("name", ns.Name)
 	_ = d.Set("description", ns.Description)
-	// Registry does not support yet project id.
-	// Once it does, use ProjectID instead or OrganizationID
-	_ = d.Set("project_id", ns.OrganizationID)
+	_ = d.Set("organization_id", ns.OrganizationID)
+	_ = d.Set("project_id", ns.ProjectID)
 	_ = d.Set("is_public", ns.IsPublic)
 	_ = d.Set("endpoint", ns.Endpoint)
 	_ = d.Set("region", ns.Region)

scaleway/resource_registry_namespace_test.go

@@ -40,10 +40,13 @@ func testSweepRegistryNamespace(_ string) error {
 }
 
 func TestAccScalewayRegistryNamespace_Basic(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckScalewayRegistryNamespaceBetaDestroy,
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayRegistryNamespaceBetaDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: `
@@ -52,7 +55,7 @@ func TestAccScalewayRegistryNamespace_Basic(t *testing.T) {
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayRegistryNamespaceExists("scaleway_registry_namespace.cr01"),
+					testAccCheckScalewayRegistryNamespaceExists(tt, "scaleway_registry_namespace.cr01"),
 					resource.TestCheckResourceAttr("scaleway_registry_namespace.cr01", "name", "test-cr"),
 					testCheckResourceAttrUUID("scaleway_registry_namespace.cr01", "id"),
 				),
@@ -66,7 +69,7 @@ func TestAccScalewayRegistryNamespace_Basic(t *testing.T) {
 					}
 				`,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayRegistryNamespaceExists("scaleway_registry_namespace.cr01"),
+					testAccCheckScalewayRegistryNamespaceExists(tt, "scaleway_registry_namespace.cr01"),
 					resource.TestCheckResourceAttr("scaleway_registry_namespace.cr01", "description", "test registry namespace"),
 					resource.TestCheckResourceAttr("scaleway_registry_namespace.cr01", "is_public", "true"),
 					testCheckResourceAttrUUID("scaleway_registry_namespace.cr01", "id"),
@@ -76,14 +79,14 @@ func TestAccScalewayRegistryNamespace_Basic(t *testing.T) {
 	})
 }
 
-func testAccCheckScalewayRegistryNamespaceExists(n string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		rs, ok := s.RootModule().Resources[n]
+func testAccCheckScalewayRegistryNamespaceExists(tt *TestTools, n string) resource.TestCheckFunc {
+	return func(state *terraform.State) error {
+		rs, ok := state.RootModule().Resources[n]
 		if !ok {
 			return fmt.Errorf("resource not found: %s", n)
 		}
 
-		api, region, id, err := registryAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
+		api, region, id, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
 		if err != nil {
 			return nil
 		}
@@ -101,30 +104,32 @@ func testAccCheckScalewayRegistryNamespaceExists(n string) resource.TestCheckFun
 	}
 }
 
-func testAccCheckScalewayRegistryNamespaceBetaDestroy(s *terraform.State) error {
-	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "scaleway_registry_namespace" {
-			continue
-		}
+func testAccCheckScalewayRegistryNamespaceBetaDestroy(tt *TestTools) resource.TestCheckFunc {
+	return func(state *terraform.State) error {
+		for _, rs := range state.RootModule().Resources {
+			if rs.Type != "scaleway_registry_namespace" {
+				continue
+			}
 
-		api, region, id, err := registryAPIWithRegionAndID(testAccProvider.Meta(), rs.Primary.ID)
-		if err != nil {
-			return err
-		}
+			api, region, id, err := registryAPIWithRegionAndID(tt.Meta, rs.Primary.ID)
+			if err != nil {
+				return err
+			}
 
-		_, err = api.DeleteNamespace(&registry.DeleteNamespaceRequest{
-			NamespaceID: id,
-			Region:      region,
-		})
+			_, err = api.DeleteNamespace(&registry.DeleteNamespaceRequest{
+				NamespaceID: id,
+				Region:      region,
+			})
 
-		if err == nil {
-			return fmt.Errorf("namespace (%s) still exists", rs.Primary.ID)
-		}
+			if err == nil {
+				return fmt.Errorf("namespace (%s) still exists", rs.Primary.ID)
+			}
 
-		if !is404Error(err) {
-			return err
+			if !is404Error(err) {
+				return err
+			}
 		}
-	}
 
-	return nil
+		return nil
+	}
 }