fix(container): use project_id from provider configuration

Author: Gnoale

internal/services/container/container_data_source.go

@@ -9,6 +9,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/datasource"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
@@ -58,11 +59,16 @@ func DataSourceContainerRead(ctx context.Context, d *schema.ResourceData, m inte
 	if !ok {
 		containerName := d.Get("name").(string)
 
+		projectID, _, err := meta.ExtractProjectID(d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		res, err := api.ListContainers(&container.ListContainersRequest{
 			Region:      region,
 			Name:        types.ExpandStringPtr(containerName),
 			NamespaceID: locality.ExpandID(namespaceID),
-			ProjectID:   types.ExpandStringPtr(d.Get("project_id")),
+			ProjectID:   types.ExpandStringPtr(projectID),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)

internal/services/container/container_test.go

@@ -12,7 +12,6 @@ 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/container"
-	containerchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs"
 )
 
 func TestAccContainer_Basic(t *testing.T) {
@@ -220,51 +219,32 @@ func TestAccContainer_WithIMG(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
-					resource scaleway_container_namespace main {
-						name = "%s"
-						description = "test container"
-					}
-				`, containerNamespace),
-			},
-			{
-				Config: fmt.Sprintf(`
-					resource scaleway_container_namespace main {
-						name = "%s"
-						description = "test container"
-					}
-				`, containerNamespace),
-				Check: resource.ComposeTestCheckFunc(
-					containerchecks.TestConfigContainerNamespace(tt, "scaleway_container_namespace.main"),
-				),
-			},
-			{
-				Config: fmt.Sprintf(`
-					resource scaleway_container_namespace main {
-						name = "%s"
-						description = "test container"
-					}
-
-					resource scaleway_container main {
-						name = "my-container-02"
-						description = "environment variables test"
-						namespace_id = scaleway_container_namespace.main.id
-						registry_image = "${scaleway_container_namespace.main.registry_endpoint}/nginx:test"
-						port = 80
-						cpu_limit = 140
-						memory_limit = 256
-						min_scale = 3
-						max_scale = 5
-						timeout = 600
-						max_concurrency = 80
-						privacy = "private"
-						protocol = "h2c"
-						deploy = true
-
-						environment_variables = {
-							"foo" = "var"
-						}
-					}
-				`, containerNamespace),
+								resource scaleway_container_namespace main {
+									name = "%s"
+									description = "test container"
+								}
+
+								resource scaleway_container main {
+									name = "my-container-02"
+									description = "environment variables test"
+									namespace_id = scaleway_container_namespace.main.id
+									registry_image = "docker.io/library/nginx:latest"
+									port = 80
+									cpu_limit = 140
+									memory_limit = 256
+									min_scale = 3
+									max_scale = 5
+									timeout = 600
+									max_concurrency = 80
+									privacy = "private"
+									protocol = "h2c"
+									deploy = true
+
+									environment_variables = {
+										"foo" = "var"
+									}
+								}
+							`, containerNamespace),
 				Check: resource.ComposeTestCheckFunc(
 					isContainerPresent(tt, "scaleway_container.main"),
 					acctest.CheckResourceAttrUUID("scaleway_container.main", "id"),
@@ -493,7 +473,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
 			{
 				Config: `
 					resource scaleway_container_namespace main {}
-		
+
 					resource scaleway_container main {
 						namespace_id = scaleway_container_namespace.main.id
 						deploy = false
@@ -512,7 +492,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
 			{
 				Config: `
 					resource scaleway_container_namespace main {}
-		
+
 					resource scaleway_container main {
 						namespace_id = scaleway_container_namespace.main.id
 						deploy = false
@@ -534,7 +514,7 @@ func TestAccContainer_ScalingOption(t *testing.T) {
 			{
 				Config: `
 					resource scaleway_container_namespace main {}
-		
+
 					resource scaleway_container main {
 						namespace_id = scaleway_container_namespace.main.id
 						deploy = false

internal/services/container/namespace.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/dsf"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/regional"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/account"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/registry"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -108,12 +109,17 @@ func ResourceContainerNamespaceCreate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
+	projectId, _, err := meta.ExtractProjectID(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	createReq := &container.CreateNamespaceRequest{
 		Description:                types.ExpandStringPtr(d.Get("description").(string)),
 		EnvironmentVariables:       types.ExpandMapPtrStringString(d.Get("environment_variables")),
 		SecretEnvironmentVariables: expandContainerSecrets(d.Get("secret_environment_variables")),
 		Name:                       types.ExpandOrGenerateString(d.Get("name").(string), "ns"),
-		ProjectID:                  d.Get("project_id").(string),
+		ProjectID:                  projectId,
 		Region:                     region,
 	}
 

internal/services/container/namespace_data_source.go

@@ -8,6 +8,7 @@ import (
 	container "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/datasource"
+	"github.com/scaleway/terraform-provider-scaleway/v2/internal/meta"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
 )
@@ -43,10 +44,15 @@ func DataSourceContainerNamespaceRead(ctx context.Context, d *schema.ResourceDat
 	if !ok {
 		namespaceName := d.Get("name").(string)
 
+		projectID, _, err := meta.ExtractProjectID(d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		res, err := api.ListNamespaces(&container.ListNamespacesRequest{
 			Region:    region,
 			Name:      types.ExpandStringPtr(namespaceName),
-			ProjectID: types.ExpandStringPtr(d.Get("project_id")),
+			ProjectID: types.ExpandStringPtr(projectID),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)