feat(instance): add support for project_id (#609)

Author: remyleone

docs/data-sources/instance_image.md

@@ -42,6 +42,8 @@ In addition to all above arguments, the following attributes are exported:
 
 - `organization_id` - The ID of the organization the image is associated with.
 
+- `project_id` - The ID of the project the image is associated with.
+
 - `creation_date` - Date of the image creation.
 
 - `modification_date` - Date of image latest update.

docs/data-sources/instance_security_group.md

@@ -38,6 +38,8 @@ In addition to all above arguments, the following attributes are exported:
 
 - `organization_id` - The ID of the organization the security group is associated with.
 
+- `project_id` - The ID of the project the security group is associated with.
+
 - `inbound_default_policy` - The default policy on incoming traffic. Possible values are: `accept` or `drop`.
 
 - `outbound_default_policy` - The default policy on outgoing traffic. Possible values are: `accept` or `drop`.

docs/data-sources/instance_server.md

@@ -43,6 +43,8 @@ You find all the available types on the [pricing page](https://www.scaleway.com/
 
 - `organization_id` - The ID of the organization the server is associated with.
 
+- `project_id` - The ID of the project the server is associated with.
+
 - `tags` - The tags associated with the server.
 
 - `security_group_id` - The [security group](https://developers.scaleway.com/en/products/instance/api/#security-groups-8d7f89) the server is attached to.

docs/data-sources/instance_volume.md

@@ -32,7 +32,9 @@ data "scaleway_instance_volume" "my_volume" {
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the volume exists.
 
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the server is associated with.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the volume is associated with.
+
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the volume is associated with.
 
 ## Attributes Reference
 

docs/resources/instance_ip.md

@@ -20,6 +20,7 @@ The following arguments are supported:
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the IP should be reserved.
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the IP is associated with.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the IP is associated with.
 
 ## Attributes Reference
 

docs/resources/instance_placement_group.md

@@ -22,7 +22,8 @@ The following arguments are supported:
 - `policy_type` - (Defaults to `max_availability`) The [policy type](https://developers.scaleway.com/en/products/instance/api/#placement-groups-d8f653) of the placement group. Possible values are: `low_latency` or `max_availability`.
 - `policy_mode` - (Defaults to `optional`) The [policy mode](https://developers.scaleway.com/en/products/instance/api/#placement-groups-d8f653) of the placement group. Possible values are: `optional` or `enforced`.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the placement group should be created.
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the project the placement group is associated with.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the placement group is associated with.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the placement group is associated with.
 
 ## Attributes Reference
 

docs/resources/instance_security_group.md

@@ -116,7 +116,9 @@ The following arguments are supported:
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the security group should be created.
 
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the project the security group is associated with.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the security group is associated with.
+
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the security group is associated with.
 
 
 The `inbound_rule` and `outbound_rule` block supports:

docs/resources/instance_server.md

@@ -177,7 +177,10 @@ attached to the server. Updates to this field will trigger a stop/start of the s
 
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the server should be created.
 
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the server is associated with. If you intend to deploy your instance in another project than the default one use your `project_id` instead of the organization id.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the server is associated with.
+  If you intend to deploy your instance in another project than the default one use your `project_id` instead of the organization id.
+
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the server is associated with.
 
 
 ## Attributes Reference

docs/resources/instance_volume.md

@@ -29,6 +29,7 @@ The following arguments are supported:
 - `name` - (Optional) The name of the volume. If not provided it will be randomly generated.
 - `zone` - (Defaults to [provider](../index.md#zone) `zone`) The [zone](../guides/regions_and_zones.md#zones) in which the volume should be created.
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the volume is associated with.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the volume is associated with.
 
 ## Attributes Reference
 

scaleway/data_source_instance_image.go

@@ -42,6 +42,7 @@ func dataSourceScalewayInstanceImage() *schema.Resource {
 			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 
 			"public": {
 				Type:        schema.TypeBool,
@@ -100,9 +101,11 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
 	imageID, ok := d.GetOk("image_id")
 	if !ok { // Get instance by name, zone, and arch.
 		res, err := instanceAPI.ListImages(&instance.ListImagesRequest{
-			Zone: zone,
-			Name: expandStringPtr(d.Get("name")),
-			Arch: expandStringPtr(d.Get("architecture")),
+			Zone:         zone,
+			Name:         expandStringPtr(d.Get("name")),
+			Arch:         expandStringPtr(d.Get("architecture")),
+			Organization: expandStringPtr(d.Get("organization_id")),
+			Project:      expandStringPtr(d.Get("project_id")),
 		}, scw.WithAllPages())
 		if err != nil {
 			return err
@@ -149,6 +152,7 @@ func dataSourceScalewayInstanceImageRead(d *schema.ResourceData, m interface{})
 	}
 
 	_ = d.Set("organization_id", resp.Image.Organization)
+	_ = d.Set("project_id", resp.Image.Project)
 	_ = d.Set("architecture", resp.Image.Arch)
 	_ = d.Set("name", resp.Image.Name)
 

scaleway/data_source_instance_security_group.go

@@ -41,8 +41,10 @@ func dataSourceScalewayInstanceSecurityGroupRead(d *schema.ResourceData, m inter
 	securityGroupID, ok := d.GetOk("security_group_id")
 	if !ok {
 		res, err := instanceAPI.ListSecurityGroups(&instance.ListSecurityGroupsRequest{
-			Zone: zone,
-			Name: expandStringPtr(d.Get("name")),
+			Zone:         zone,
+			Name:         expandStringPtr(d.Get("name")),
+			Organization: expandStringPtr(d.Get("organization_id")),
+			Project:      expandStringPtr(d.Get("project_id")),
 		}, scw.WithAllPages())
 		if err != nil {
 			return err

scaleway/data_source_instance_server.go

@@ -40,8 +40,10 @@ func dataSourceScalewayInstanceServerRead(d *schema.ResourceData, m interface{})
 	serverID, ok := d.GetOk("server_id")
 	if !ok {
 		res, err := instanceAPI.ListServers(&instance.ListServersRequest{
-			Zone: zone,
-			Name: expandStringPtr(d.Get("name")),
+			Zone:         zone,
+			Name:         expandStringPtr(d.Get("name")),
+			Organization: expandStringPtr(d.Get("organization_id")),
+			Project:      expandStringPtr(d.Get("project_id")),
 		})
 		if err != nil {
 			return err

scaleway/data_source_instance_volume.go

@@ -39,8 +39,10 @@ func dataSourceScalewayInstanceVolumeRead(d *schema.ResourceData, m interface{})
 	volumeID, ok := d.GetOk("volume_id")
 	if !ok { // Get volumes by zone and name.
 		res, err := instanceAPI.ListVolumes(&instance.ListVolumesRequest{
-			Zone: zone,
-			Name: expandStringPtr(d.Get("name")),
+			Zone:         zone,
+			Name:         expandStringPtr(d.Get("name")),
+			Organization: expandStringPtr(d.Get("organization_id")),
+			Project:      expandStringPtr(d.Get("project_id")),
 		})
 		if err != nil {
 			return err

scaleway/resource_instance_ip.go

@@ -37,6 +37,7 @@ func resourceScalewayInstanceIP() *schema.Resource {
 			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -50,6 +51,7 @@ func resourceScalewayInstanceIPCreate(d *schema.ResourceData, m interface{}) err
 	res, err := instanceAPI.CreateIP(&instance.CreateIPRequest{
 		Zone:         zone,
 		Organization: expandStringPtr(d.Get("organization_id")),
+		Project:      expandStringPtr(d.Get("project_id")),
 	})
 	if err != nil {
 		return err
@@ -82,6 +84,7 @@ func resourceScalewayInstanceIPRead(d *schema.ResourceData, m interface{}) error
 	_ = d.Set("address", res.IP.Address.String())
 	_ = d.Set("zone", string(zone))
 	_ = d.Set("organization_id", res.IP.Organization)
+	_ = d.Set("project_id", res.IP.Project)
 	_ = d.Set("reverse", res.IP.Reverse)
 
 	return nil

scaleway/resource_instance_placement_group.go

@@ -50,6 +50,7 @@ func resourceScalewayInstancePlacementGroup() *schema.Resource {
 			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -64,6 +65,7 @@ func resourceScalewayInstancePlacementGroupCreate(d *schema.ResourceData, m inte
 		Zone:         zone,
 		Name:         expandOrGenerateString(d.Get("name"), "pg"),
 		Organization: expandStringPtr(d.Get("organization_id")),
+		Project:      expandStringPtr(d.Get("project_id")),
 		PolicyMode:   instance.PlacementGroupPolicyMode(d.Get("policy_mode").(string)),
 		PolicyType:   instance.PlacementGroupPolicyType(d.Get("policy_type").(string)),
 	})
@@ -97,6 +99,7 @@ func resourceScalewayInstancePlacementGroupRead(d *schema.ResourceData, m interf
 	_ = d.Set("name", res.PlacementGroup.Name)
 	_ = d.Set("zone", string(zone))
 	_ = d.Set("organization_id", res.PlacementGroup.Organization)
+	_ = d.Set("project_id", res.PlacementGroup.Project)
 	_ = d.Set("policy_mode", res.PlacementGroup.PolicyMode.String())
 	_ = d.Set("policy_type", res.PlacementGroup.PolicyType.String())
 	_ = d.Set("policy_respected", res.PlacementGroup.PolicyRespected)

scaleway/resource_instance_security_group.go

@@ -80,6 +80,7 @@ func resourceScalewayInstanceSecurityGroup() *schema.Resource {
 			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -95,6 +96,7 @@ func resourceScalewayInstanceSecurityGroupCreate(d *schema.ResourceData, m inter
 		Name:                  expandOrGenerateString(d.Get("name"), "sg"),
 		Zone:                  zone,
 		Organization:          expandStringPtr(d.Get("organization_id")),
+		Project:               expandStringPtr(d.Get("project_id")),
 		Description:           d.Get("description").(string),
 		Stateful:              d.Get("stateful").(bool),
 		InboundDefaultPolicy:  instance.SecurityGroupPolicy(d.Get("inbound_default_policy").(string)),
@@ -133,6 +135,7 @@ func resourceScalewayInstanceSecurityGroupRead(d *schema.ResourceData, m interfa
 
 	_ = d.Set("zone", zone)
 	_ = d.Set("organization_id", res.SecurityGroup.Organization)
+	_ = d.Set("project_id", res.SecurityGroup.Project)
 	_ = d.Set("name", res.SecurityGroup.Name)
 	_ = d.Set("stateful", res.SecurityGroup.Stateful)
 	_ = d.Set("description", res.SecurityGroup.Description)

scaleway/resource_instance_server.go

@@ -206,6 +206,7 @@ func resourceScalewayInstanceServer() *schema.Resource {
 			},
 			"zone":            zoneSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 
 			// Deprecated and removed.
 			"disable_public_ip": {
@@ -247,6 +248,7 @@ func resourceScalewayInstanceServerCreate(d *schema.ResourceData, m interface{})
 		Zone:              zone,
 		Name:              expandOrGenerateString(d.Get("name"), "srv"),
 		Organization:      expandStringPtr(d.Get("organization_id")),
+		Project:           expandStringPtr(d.Get("project_id")),
 		Image:             image.ID,
 		CommercialType:    commercialType,
 		EnableIPv6:        d.Get("enable_ipv6").(bool),
@@ -361,6 +363,8 @@ func resourceScalewayInstanceServerRead(d *schema.ResourceData, m interface{}) e
 	_ = d.Set("security_group_id", newZonedID(zone, response.Server.SecurityGroup.ID).String())
 	_ = d.Set("enable_ipv6", response.Server.EnableIPv6)
 	_ = d.Set("enable_dynamic_ip", response.Server.DynamicIPRequired)
+	_ = d.Set("organization_id", response.Server.Organization)
+	_ = d.Set("project_id", response.Server.Project)
 
 	// Image could be empty in an import context.
 	image := expandRegionalID(d.Get("image").(string))

scaleway/resource_instance_volume.go

@@ -66,6 +66,7 @@ func resourceScalewayInstanceVolume() *schema.Resource {
 				Description: "The server associated with this volume",
 			},
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 			"zone":            zoneSchema(),
 		},
 	}
@@ -82,6 +83,7 @@ func resourceScalewayInstanceVolumeCreate(d *schema.ResourceData, m interface{})
 		Name:         expandOrGenerateString(d.Get("name"), "vol"),
 		VolumeType:   instance.VolumeVolumeType(d.Get("type").(string)),
 		Organization: expandStringPtr(d.Get("organization_id")),
+		Project:      expandStringPtr(d.Get("project_id")),
 	}
 
 	if size, ok := d.GetOk("size_in_gb"); ok {
@@ -127,6 +129,7 @@ func resourceScalewayInstanceVolumeRead(d *schema.ResourceData, m interface{}) e
 
 	_ = d.Set("name", res.Volume.Name)
 	_ = d.Set("organization_id", res.Volume.Organization)
+	_ = d.Set("project_id", res.Volume.Project)
 	_ = d.Set("zone", string(zone))
 	_ = d.Set("type", res.Volume.VolumeType.String())
 	_ = d.Set("size_in_gb", uint64(res.Volume.Size/scw.GB))