wip

Author: Gnoale

internal/services/block/volume.go

@@ -106,6 +106,7 @@ func ResourceBlockVolumeCreate(ctx context.Context, d *schema.ResourceData, m in
 		if err != nil {
 			return diag.FromErr(err)
 		}
+
 		req := &block.CreateVolumeRequest{
 			Zone:      zone,
 			Name:      types.ExpandOrGenerateString(d.Get("name").(string), "volume"),

internal/services/iam/ssh_key_data_source.go

@@ -8,6 +8,7 @@ import (
 	iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
 	"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"
 )
@@ -38,9 +39,14 @@ func DataSourceIamSSHKeyRead(ctx context.Context, d *schema.ResourceData, m inte
 	if !sshKeyIDExists {
 		sshKeyName := d.Get("name").(string)
 
+		projectID, _, err := meta.ExtractProjectID(d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		res, err := iamAPI.ListSSHKeys(&iam.ListSSHKeysRequest{
 			Name:      types.ExpandStringPtr(sshKeyName),
-			ProjectID: types.ExpandStringPtr(d.Get("project_id")),
+			ProjectID: types.ExpandStringPtr(projectID),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)

internal/services/instance/image.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"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/instance/instancehelpers"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/transport"
@@ -183,12 +184,17 @@ func ResourceInstanceImageCreate(ctx context.Context, d *schema.ResourceData, m
 		return diag.FromErr(err)
 	}
 
+	projectID, _, err := meta.ExtractProjectID(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	req := &instanceSDK.CreateImageRequest{
 		Zone:       zone,
 		Name:       types.ExpandOrGenerateString(d.Get("name"), "image"),
 		RootVolume: zonal.ExpandID(d.Get("root_volume_id").(string)).ID,
 		Arch:       instanceSDK.Arch(d.Get("architecture").(string)),
-		Project:    types.ExpandStringPtr(d.Get("project_id")),
+		Project:    types.ExpandStringPtr(projectID),
 		Public:     types.ExpandBoolPtr(d.Get("public")),
 	}
 

internal/services/instance/image_data_source.go

@@ -11,6 +11,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/zonal"
+	"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/types"
 )
@@ -105,11 +106,16 @@ func DataSourceInstanceImageRead(ctx context.Context, d *schema.ResourceData, m
 
 	imageID, ok := d.GetOk("image_id")
 	if !ok { // Get instance by name, zone, and arch.
+		projectID, _, err := meta.ExtractProjectID(d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		res, err := instanceAPI.ListImages(&instance.ListImagesRequest{
 			Zone:    zone,
 			Name:    types.ExpandStringPtr(d.Get("name")),
 			Arch:    types.ExpandStringPtr(d.Get("architecture")),
-			Project: types.ExpandStringPtr(d.Get("project_id")),
+			Project: types.ExpandStringPtr(projectID),
 		}, scw.WithAllPages(), scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)

internal/services/instance/security_group.go

@@ -13,6 +13,7 @@ import (
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/locality/zonal"
+	"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/types"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/verify"
@@ -109,10 +110,15 @@ func ResourceInstanceSecurityGroupCreate(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
+	projectID, _, err := meta.ExtractProjectID(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	req := &instanceSDK.CreateSecurityGroupRequest{
 		Name:                  types.ExpandOrGenerateString(d.Get("name"), "sg"),
 		Zone:                  zone,
-		Project:               types.ExpandStringPtr(d.Get("project_id")),
+		Project:               types.ExpandStringPtr(projectID),
 		Description:           d.Get("description").(string),
 		Stateful:              d.Get("stateful").(bool),
 		InboundDefaultPolicy:  instanceSDK.SecurityGroupPolicy(d.Get("inbound_default_policy").(string)),

internal/services/instance/snapshot.go

@@ -14,6 +14,7 @@ import (
 	"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/locality/zonal"
+	"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/transport"
 	"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
@@ -118,9 +119,14 @@ func ResourceInstanceSnapshotCreate(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
+	projectID, _, err := meta.ExtractProjectID(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	req := &instanceSDK.CreateSnapshotRequest{
 		Zone:    zone,
-		Project: types.ExpandStringPtr(d.Get("project_id")),
+		Project: types.ExpandStringPtr(projectID),
 		Name:    types.ExpandOrGenerateString(d.Get("name"), "snap"),
 	}
 

internal/services/registry/namespace_data_source.go

@@ -8,6 +8,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/api/registry/v1"
 	"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 DataSourceNamespaceRead(ctx context.Context, d *schema.ResourceData, m inte
 	if !ok {
 		namespaceName := d.Get("name").(string)
 
+		projectID, _, err := meta.ExtractProjectID(d, m)
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
 		res, err := api.ListNamespaces(&registry.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)

internal/services/vpc/vpc.go

@@ -10,6 +10,7 @@ import (
 	"github.com/scaleway/scaleway-sdk-go/scw"
 	"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/types"
 )
@@ -82,11 +83,16 @@ func ResourceVPCCreate(ctx context.Context, d *schema.ResourceData, m interface{
 		return diag.FromErr(err)
 	}
 
+	projectID, _, err := meta.ExtractProjectID(d, m)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	res, err := vpcAPI.CreateVPC(&vpc.CreateVPCRequest{
 		Name:          types.ExpandOrGenerateString(d.Get("name"), "vpc"),
 		Tags:          types.ExpandStrings(d.Get("tags")),
 		EnableRouting: d.Get("enable_routing").(bool),
-		ProjectID:     d.Get("project_id").(string),
+		ProjectID:     projectID,
 		Region:        region,
 	}, scw.WithContext(ctx))
 	if err != nil {

internal/services/vpcgw/public_gateway_data_source.go

@@ -53,6 +53,7 @@ func DataSourceVPCPublicGatewayRead(ctx context.Context, d *schema.ResourceData,
 		if err != nil {
 			return diag.FromErr(err)
 		}
+
 		res, err := api.ListGateways(
 			&vpcgw.ListGatewaysRequest{
 				Name:          types.ExpandStringPtr(gwName),