feat(account): add support for project in SSH key (#603)

Author: remyleone

docs/data-sources/account_ssh_key.md

@@ -26,7 +26,8 @@ data "scaleway_account_ssh_key" "my_key" {
 
 - `name` - The SSH key name. Only one of `name` and `ssh_key_id` should be specified.
 - `ssh_key_id` - The SSH key id. Only one of `name` and `ssh_key_id` should be specified.
-- `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 SSH key is associated with.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the SSH key is associated with.
 
 
 ## Attributes Reference

docs/resources/account_ssh_key.md

@@ -23,7 +23,8 @@ The following arguments are supported:
 
 - `name` - (Required) The name of the SSH key.
 - `public_key` - (Required) The public SSH key to be added.
-- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the IP is associated with.
+- `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the SSH key is associated with.
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the SSH key is associated with.
 
 ## Attributes Reference
 

scaleway/data_source_account_ssh_key.go

@@ -33,6 +33,7 @@ func dataSourceScalewayAccountSSHKey() *schema.Resource {
 				Description: "The public SSH key",
 			},
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -50,7 +51,9 @@ func dataSourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.Resource
 		sshKey = res
 	} else {
 		res, err := accountAPI.ListSSHKeys(&account.ListSSHKeysRequest{
-			Name: expandStringPtr(d.Get("name")),
+			Name:           expandStringPtr(d.Get("name")),
+			OrganizationID: expandStringPtr(d.Get("organization_id")),
+			ProjectID:      expandStringPtr(d.Get("project_id")),
 		}, scw.WithContext(ctx))
 		if err != nil {
 			return diag.FromErr(err)
@@ -69,6 +72,7 @@ func dataSourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.Resource
 	_ = d.Set("ssh_key_id", sshKey.ID)
 	_ = d.Set("public_key", sshKey.PublicKey)
 	_ = d.Set("organization_id", sshKey.OrganizationID)
+	_ = d.Set("project_id", sshKey.ProjectID)
 
 	return nil
 }

scaleway/resource_account_ssh_key.go

@@ -36,6 +36,7 @@ func resourceScalewayAccountSSKKey() *schema.Resource {
 				},
 			},
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -47,6 +48,7 @@ func resourceScalewayAccountSSHKeyCreate(ctx context.Context, d *schema.Resource
 		Name:           d.Get("name").(string),
 		PublicKey:      strings.Trim(d.Get("public_key").(string), "\n"),
 		OrganizationID: expandStringPtr(d.Get("organization_id")),
+		ProjectID:      expandStringPtr(d.Get("project_id")),
 	}, scw.WithContext(ctx))
 	if err != nil {
 		return diag.FromErr(err)
@@ -74,6 +76,7 @@ func resourceScalewayAccountSSHKeyRead(ctx context.Context, d *schema.ResourceDa
 	_ = d.Set("name", res.Name)
 	_ = d.Set("public_key", res.PublicKey)
 	_ = d.Set("organization_id", res.OrganizationID)
+	_ = d.Set("project_id", res.ProjectID)
 
 	return nil
 }