backport of commit 360a406a2f924f0a46491a77bdd9e1fcf03b99fa (#20928)

Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core 2023-06-01 10:34:52 -04:00 committed by GitHub
parent 76929df206
commit 94a7385904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View File

@ -27,7 +27,7 @@ Usage: vault transit <subcommand> [options] [args]
Engine. Here are some simple examples, and more detailed examples are Engine. Here are some simple examples, and more detailed examples are
available in the subcommands or the documentation. available in the subcommands or the documentation.
To import a key into the specified Transit or Transform mount: To import a key into the specified Transit mount:
$ vault transit import transit/keys/newly-imported @path/to/key type=rsa-2048 $ vault transit import transit/keys/newly-imported @path/to/key type=rsa-2048

View File

@ -35,18 +35,18 @@ type TransitImportCommand struct {
} }
func (c *TransitImportCommand) Synopsis() string { func (c *TransitImportCommand) Synopsis() string {
return "Import a key into the Transit or Transform secrets engines." return "Import a key into the Transit secrets engines."
} }
func (c *TransitImportCommand) Help() string { func (c *TransitImportCommand) Help() string {
helpText := ` helpText := `
Usage: vault transit import PATH KEY [options...] Usage: vault transit import PATH KEY [options...]
Using the Transit or Transform key wrapping system, imports key material from Using the Transit key wrapping system, imports key material from
the base64 encoded KEY (either directly on the CLI or via @path notation), the base64 encoded KEY (either directly on the CLI or via @path notation),
into a new key whose API path is PATH. To import a new version into an into a new key whose API path is PATH. To import a new version into an
existing key, use import_version. The remaining options after KEY (key=value existing key, use import_version. The remaining options after KEY (key=value
style) are passed on to the Transit or Transform create key endpoint. If your style) are passed on to the Transit create key endpoint. If your
system or device natively supports the RSA AES key wrap mechanism (such as system or device natively supports the RSA AES key wrap mechanism (such as
the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly
rather than this command. rather than this command.

View File

@ -20,18 +20,18 @@ type TransitImportVersionCommand struct {
} }
func (c *TransitImportVersionCommand) Synopsis() string { func (c *TransitImportVersionCommand) Synopsis() string {
return "Import key material into a new key version in the Transit or Transform secrets engines." return "Import key material into a new key version in the Transit secrets engines."
} }
func (c *TransitImportVersionCommand) Help() string { func (c *TransitImportVersionCommand) Help() string {
helpText := ` helpText := `
Usage: vault transit import-version PATH KEY [...] Usage: vault transit import-version PATH KEY [...]
Using the Transit or Transform key wrapping system, imports key material from Using the Transit key wrapping system, imports key material from
the base64 encoded KEY (either directly on the CLI or via @path notation), the base64 encoded KEY (either directly on the CLI or via @path notation),
into a new key whose API path is PATH. To import a new Transit or Transform into a new key whose API path is PATH. To import a new Transit
key, use the import command instead. The remaining options after KEY key, use the import command instead. The remaining options after KEY
(key=value style) are passed on to the Transit or Transform create key endpoint. (key=value style) are passed on to the Transit create key endpoint.
If your system or device natively supports the RSA AES key wrap mechanism If your system or device natively supports the RSA AES key wrap mechanism
(such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it (such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it
directly rather than this command. directly rather than this command.