Merge branch 'scaleway:master' into master

Author: scaleway-bot

cmd/scw/testdata/test-all-usage-keymanager-key-create-usage.golden

@@ -9,6 +9,8 @@ ARGS:
   [project-id]                         Project ID to use. If none is passed the default project ID will be used
   [name]                               (Optional) Name of the key
   [usage.symmetric-encryption]         Algorithm used to encrypt and decrypt arbitrary payloads. (unknown_symmetric_encryption | aes_256_gcm)
+  [usage.asymmetric-encryption]         (unknown_asymmetric_encryption | rsa_oaep_2048_sha256 | rsa_oaep_3072_sha256 | rsa_oaep_4096_sha256)
+  [usage.asymmetric-signing]            (unknown_asymmetric_signing | ec_p256_sha256 | ec_p384_sha384 | rsa_pss_2048_sha256 | rsa_pss_3072_sha256 | rsa_pss_4096_sha256 | rsa_pkcs1_2048_sha256 | rsa_pkcs1_3072_sha256 | rsa_pkcs1_4096_sha256)
   [description]                        (Optional) Description of the key
   [tags.{index}]                       (Optional) List of the key's tags
   [rotation-policy.rotation-period]    Rotation period

cmd/scw/testdata/test-all-usage-keymanager-key-decrypt-usage.golden

@@ -6,7 +6,7 @@ USAGE:
   scw keymanager key decrypt <key-id ...> [arg=value ...]
 
 ARGS:
-  key-id              ID of the key to decrypt
+  key-id              ID of the key to decrypt with
   ciphertext          Base64 Ciphertext data to decrypt (Support file loading with @/path/to/file)
   [associated-data]   (Optional) Additional authenticated data
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)

cmd/scw/testdata/test-all-usage-keymanager-key-encrypt-usage.golden

@@ -6,7 +6,7 @@ USAGE:
   scw keymanager key encrypt <key-id ...> [arg=value ...]
 
 ARGS:
-  key-id              ID of the key to encrypt
+  key-id              ID of the key to use for encryption
   plaintext           Base64 Plaintext data to encrypt (Support file loading with @/path/to/file)
   [associated-data]   (Optional) Additional authenticated data
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)

docs/commands/index.md

@@ -69,7 +69,7 @@ You can use the CLI as you would run any Docker image:
 docker run -i --rm scaleway/cli:latest
 ```
 
-See more in-depth information about running the CLI in Docker [here](/docs/docker.md)
+See more in-depth information about running the CLI in Docker [here](https://github.com/scaleway/scaleway-cli/blob/master/docs/docker.md).
 
 # Getting Started
 
@@ -100,14 +100,14 @@ scw k8s cluster create name=foo version=1.17.4 pools.0.size=3 pools.0.node-type=
 
 You can configure your config or enable functionalities with environment variables.
 
-Variables to override config are describe in [config documentation](/docs/commands/config.md).
+Variables to override config are describe in [config documentation](https://cli.scaleway.com/config/).
 To enable beta features, you can set `SCW_ENABLE_BETA=1` in your environment.
 
 ## Build it yourself
 
 ### Build Locally
 
-If you have a >= Go 1.13 environment, you can install the `HEAD` version to test the latest features or to [contribute](/.github/CONTRIBUTING.md).
+If you have a >= Go 1.13 environment, you can install the `HEAD` version to test the latest features or to [contribute](https://github.com/scaleway/scaleway-cli/blob/master/.github/CONTRIBUTING.md).
 Note that this development version could include bugs, use [tagged releases](https://github.com/scaleway/scaleway-cli/releases/latest) if you need stability.
 
 ```bash
@@ -130,12 +130,12 @@ Once built, you can then use the CLI as you would run any image:
 docker run -i --rm scaleway/cli
 ```
 
-See more in-depth information about running the CLI in Docker [here](/docs/docker.md)
+See more in-depth information about running the CLI in Docker [here](https://github.com/scaleway/scaleway-cli/blob/master/docs/docker.md)
 
 # Development
 
 This repository is at its early stage and is still in active development.
-If you are looking for a way to contribute please read [CONTRIBUTING.md](/.github/CONTRIBUTING.md).
+If you are looking for a way to contribute please read [CONTRIBUTING.md](https://github.com/scaleway/scaleway-cli/blob/master/.github/CONTRIBUTING.md).
 
 # Reach Us
 

docs/commands/keymanager.md

@@ -43,6 +43,8 @@ scw keymanager key create [arg=value ...]
 | project-id |  | Project ID to use. If none is passed the default project ID will be used |
 | name |  | (Optional) Name of the key |
 | usage.symmetric-encryption | One of: `unknown_symmetric_encryption`, `aes_256_gcm` | Algorithm used to encrypt and decrypt arbitrary payloads. |
+| usage.asymmetric-encryption | One of: `unknown_asymmetric_encryption`, `rsa_oaep_2048_sha256`, `rsa_oaep_3072_sha256`, `rsa_oaep_4096_sha256` |  |
+| usage.asymmetric-signing | One of: `unknown_asymmetric_signing`, `ec_p256_sha256`, `ec_p384_sha384`, `rsa_pss_2048_sha256`, `rsa_pss_3072_sha256`, `rsa_pss_4096_sha256`, `rsa_pkcs1_2048_sha256`, `rsa_pkcs1_3072_sha256`, `rsa_pkcs1_4096_sha256` |  |
 | description |  | (Optional) Description of the key |
 | tags.{index} |  | (Optional) List of the key's tags |
 | rotation-policy.rotation-period |  | Rotation period |
@@ -68,7 +70,7 @@ scw keymanager key decrypt <key-id ...> [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| key-id | Required | ID of the key to decrypt |
+| key-id | Required | ID of the key to decrypt with |
 | ciphertext | Required | Base64 Ciphertext data to decrypt |
 | associated-data |  | (Optional) Additional authenticated data |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
@@ -170,7 +172,7 @@ scw keymanager key encrypt <key-id ...> [arg=value ...]
 
 | Name |   | Description |
 |------|---|-------------|
-| key-id | Required | ID of the key to encrypt |
+| key-id | Required | ID of the key to use for encryption |
 | plaintext | Required | Base64 Plaintext data to encrypt |
 | associated-data |  | (Optional) Additional authenticated data |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |

internal/namespaces/key_manager/v1alpha1/key_manager_cli.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	key_manager "github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
+	"github.com/scaleway/scaleway-sdk-go/api/key_manager/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -85,6 +85,35 @@ func keymanagerKeyCreate() *core.Command {
 					"aes_256_gcm",
 				},
 			},
+			{
+				Name:       "usage.asymmetric-encryption",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"unknown_asymmetric_encryption",
+					"rsa_oaep_2048_sha256",
+					"rsa_oaep_3072_sha256",
+					"rsa_oaep_4096_sha256",
+				},
+			},
+			{
+				Name:       "usage.asymmetric-signing",
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{
+					"unknown_asymmetric_signing",
+					"ec_p256_sha256",
+					"ec_p384_sha384",
+					"rsa_pss_2048_sha256",
+					"rsa_pss_3072_sha256",
+					"rsa_pss_4096_sha256",
+					"rsa_pkcs1_2048_sha256",
+					"rsa_pkcs1_3072_sha256",
+					"rsa_pkcs1_4096_sha256",
+				},
+			},
 			{
 				Name:       "description",
 				Short:      `(Optional) Description of the key`,
@@ -609,7 +638,7 @@ func keymanagerKeyEncrypt() *core.Command {
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "key-id",
-				Short:      `ID of the key to encrypt`,
+				Short:      `ID of the key to use for encryption`,
 				Required:   true,
 				Deprecated: false,
 				Positional: true,
@@ -657,7 +686,7 @@ func keymanagerKeyDecrypt() *core.Command {
 		ArgSpecs: core.ArgSpecs{
 			{
 				Name:       "key-id",
-				Short:      `ID of the key to decrypt`,
+				Short:      `ID of the key to decrypt with`,
 				Required:   true,
 				Deprecated: false,
 				Positional: true,