feat(iam): replace account on init command

README.md

@@ -116,7 +116,7 @@ To enable beta features, you can set `SCW_ENABLE_BETA=1` in your environment.
 
 | Namespace      | Description                             | Documentation                                                                                                   |
 |----------------|-----------------------------------------|-----------------------------------------------------------------------------------------------------------------|
-| `account`      | Account API                             | [CLI](./docs/commands/account.md)                                                                               |
+| `account`      | User related data                       | [CLI](./docs/commands/account.md) / [API](https://developers.scaleway.com/en/products/account/api/v2/)          |
 | `applesilicon` | Apple silicon API                       | [CLI](./docs/commands/apple-silicon.md) / [API](https://developers.scaleway.com/en/products/apple-silicon/api/) |
 | `autocomplete` | Autocomplete related commands           | [CLI](./docs/commands/autocomplete.md)                                                                          |
 | `baremetal`    | Baremetal API                           | [CLI](./docs/commands/baremetal.md) / [API](https://developers.scaleway.com/en/products/baremetal/api/)         |

cmd/scw/testdata/test-all-usage-account-usage.golden

@@ -1,13 +1,12 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Account API
+This API allows you to manage projects.
 
 USAGE:
   scw account <command>
 
 AVAILABLE COMMANDS:
   project     Project management commands
-  ssh-key     SSH keys management commands
 
 FLAGS:
   -h, --help   help for account

cmd/scw/testdata/test-all-usage-iam-ssh-key-init-usage.golden

@@ -0,0 +1,15 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Initialize SSH key.
+
+USAGE:
+  scw iam ssh-key init
+
+FLAGS:
+  -h, --help   help for init
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use

cmd/scw/testdata/test-all-usage-iam-ssh-key-usage.golden

@@ -9,6 +9,7 @@ AVAILABLE COMMANDS:
   create      Create an SSH key
   delete      Delete an SSH key
   get         Get an SSH key
+  init        Initialize SSH key
   list        List SSH keys
   update      Update an SSH key
 

cmd/scw/testdata/test-main-usage-usage.golden

@@ -4,7 +4,7 @@ USAGE:
   scw <command>
 
 AVAILABLE COMMANDS:
-  account       Account API
+  account       User related data
   apple-silicon Apple silicon API
   autocomplete  Autocomplete related commands
   baremetal     Elastic metal API

docs/commands/account.md

@@ -8,13 +8,6 @@ This API allows you to manage projects.
   - [Get project](#get-project)
   - [List projects](#list-projects)
   - [Update project](#update-project)
-- [SSH keys management commands](#ssh-keys-management-commands)
-  - [Add an SSH key to your project](#add-an-ssh-key-to-your-project)
-  - [Get an SSH key from your project](#get-an-ssh-key-from-your-project)
-  - [Initialize SSH key](#initialize-ssh-key)
-  - [List all SSH keys of your project](#list-all-ssh-keys-of-your-project)
-  - [Remove an SSH key from your project](#remove-an-ssh-key-from-your-project)
-  - [Update an SSH key on your project](#update-an-ssh-key-on-your-project)
 
 
 ## Project management commands
@@ -124,142 +117,3 @@ scw account project update [arg=value ...]
 
 
 
-## SSH keys management commands
-
-SSH keys management commands.
-
-
-### Add an SSH key to your project
-
-Add an SSH key to your project.
-
-**Usage:**
-
-```
-scw account ssh-key add [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| name |  | The name of the SSH key |
-| public-key | Required | SSH public key. Currently ssh-rsa, ssh-dss (DSA), ssh-ed25519 and ecdsa keys with NIST curves are supported |
-| project-id |  | Project ID to use. If none is passed the default project ID will be used |
-| organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
-
-
-**Examples:**
-
-
-Add a given ssh key
-```
-scw account ssh-key add name=foobar public-key="$(cat <path/to/your/public/key>)"
-```
-
-
-
-
-### Get an SSH key from your project
-
-Get an SSH key from your project.
-
-**Usage:**
-
-```
-scw account ssh-key get <ssh-key-id ...> [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| ssh-key-id | Required | The ID of the SSH key |
-
-
-
-### Initialize SSH key
-
-Initialize SSH key.
-
-**Usage:**
-
-```
-scw account ssh-key init
-```
-
-
-
-### List all SSH keys of your project
-
-List all SSH keys of your project.
-
-**Usage:**
-
-```
-scw account ssh-key list [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| order-by | One of: `created_at_asc`, `created_at_desc`, `updated_at_asc`, `updated_at_desc`, `name_asc`, `name_desc` |  |
-| name |  |  |
-| project-id |  |  |
-| organization-id |  |  |
-
-
-
-### Remove an SSH key from your project
-
-Remove an SSH key from your project.
-
-**Usage:**
-
-```
-scw account ssh-key remove <ssh-key-id ...> [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| ssh-key-id | Required |  |
-
-
-**Examples:**
-
-
-Remove a given SSH key
-```
-scw account ssh-key remove 11111111-1111-1111-1111-111111111111
-```
-
-
-
-
-### Update an SSH key on your project
-
-Update an SSH key on your project.
-
-**Usage:**
-
-```
-scw account ssh-key update <ssh-key-id ...> [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| ssh-key-id | Required |  |
-| name |  | Name of the SSH key |
-
-
-

docs/commands/iam.md

@@ -37,6 +37,7 @@ IAM API
   - [Create an SSH key](#create-an-ssh-key)
   - [Delete an SSH key](#delete-an-ssh-key)
   - [Get an SSH key](#get-an-ssh-key)
+  - [Initialize SSH key](#initialize-ssh-key)
   - [List SSH keys](#list-ssh-keys)
   - [Update an SSH key](#update-an-ssh-key)
 - [Users management commands](#users-management-commands)
@@ -736,6 +737,18 @@ scw iam ssh-key get <ssh-key-id ...> [arg=value ...]
 
 
 
+### Initialize SSH key
+
+Initialize SSH key.
+
+**Usage:**
+
+```
+scw iam ssh-key init
+```
+
+
+
 ### List SSH keys
 
 List SSH keys.

internal/account/account.go

@@ -1,13 +1,5 @@
 package account
 
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-)
-
 // Token represents a Token
 type Token struct {
 	ID             string `json:"id"`
@@ -31,32 +23,3 @@ type LoginRequest struct {
 	Description    string `json:"description,omitempty"`
 	Expires        bool   `json:"expires"`
 }
-
-var (
-	accountURL = "https://api.scaleway.com/account/v1"
-)
-
-func GetAPIKey(ctx context.Context, secretKey string) (*Token, error) {
-	resp, err := extractHTTPClient(ctx).Get(accountURL + "/tokens/" + secretKey)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("could not get token")
-	}
-
-	token := &LoginResponse{}
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(b, token)
-	if err != nil {
-		return nil, err
-	}
-
-	return token.Token, err
-}

internal/account/test.go

@@ -16,11 +16,3 @@ var contextKey = contextKeyType{}
 func InjectHTTPClient(ctx context.Context, httpClient *http.Client) context.Context {
 	return context.WithValue(ctx, contextKey, httpClient)
 }
-
-func extractHTTPClient(ctx context.Context) *http.Client {
-	httpClient, isHTTPClient := ctx.Value(contextKey).(*http.Client)
-	if httpClient != nil && isHTTPClient {
-		return httpClient
-	}
-	return http.DefaultClient
-}

internal/core/context.go

@@ -177,7 +177,7 @@ func ExtractProfileFlag(ctx context.Context) string {
 	return extractMeta(ctx).ProfileFlag
 }
 
-// GetDocGenContext reuturn a minimal context that can be used by scw-doc-gen
+// GetDocGenContext returns a minimal context that can be used by scw-doc-gen
 func GetDocGenContext() context.Context {
 	ctx := context.Background()
 	client, _ := scw.NewClient(

internal/core/validate.go

@@ -172,6 +172,7 @@ func stringExists(strs []string, s string) bool {
 	return false
 }
 
+// ValidateSecretKey validates a secret key ID.
 func ValidateSecretKey() ArgSpecValidateFunc {
 	return func(argSpec *ArgSpec, valueI interface{}) error {
 		value := valueI.(string)
@@ -186,6 +187,21 @@ func ValidateSecretKey() ArgSpecValidateFunc {
 	}
 }
 
+// ValidateAccessKey validates an access key ID.
+func ValidateAccessKey() ArgSpecValidateFunc {
+	return func(argSpec *ArgSpec, valueI interface{}) error {
+		value := valueI.(string)
+		err := DefaultArgSpecValidateFunc()(argSpec, value)
+		if err != nil {
+			return err
+		}
+		if !validation.IsAccessKey(value) {
+			return InvalidAccessKeyError(value)
+		}
+		return nil
+	}
+}
+
 // ValidateOrganizationID validates a non-required organization ID.
 // By default, for most command, the organization ID is not required.
 // In that case, we allow the empty-string value "".

internal/namespaces/get_commands.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	accountv2 "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2"
-	account "github.com/scaleway/scaleway-cli/v2/internal/namespaces/account/v2alpha1"
 	applesilicon "github.com/scaleway/scaleway-cli/v2/internal/namespaces/applesilicon/v1alpha1"
 	autocompleteNamespace "github.com/scaleway/scaleway-cli/v2/internal/namespaces/autocomplete"
 	"github.com/scaleway/scaleway-cli/v2/internal/namespaces/baremetal/v1"
@@ -54,7 +53,6 @@ func GetCommands(beta ...bool) *core.Commands {
 		marketplace.GetCommands(),
 		initNamespace.GetCommands(),
 		configNamespace.GetCommands(),
-		account.GetCommands(),
 		accountv2.GetCommands(),
 		autocompleteNamespace.GetCommands(),
 		object.GetCommands(),