Skip to content

Commit

Permalink
backport of commit 360a406 (hashicorp#20927)
Browse files Browse the repository at this point in the history
Co-authored-by: Steven Clark <steven.clark@hashicorp.com>
  • Loading branch information
1 parent 780f4f4 commit 9f18485
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion command/transit.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Usage: vault transit <subcommand> [options] [args]
Engine. Here are some simple examples, and more detailed examples are
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
Expand Down
6 changes: 3 additions & 3 deletions command/transit_import_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ type TransitImportCommand struct {
}

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 {
helpText := `
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),
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
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
the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it directly
rather than this command.
Expand Down
8 changes: 4 additions & 4 deletions command/transit_import_key_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ type TransitImportVersionCommand struct {
}

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 {
helpText := `
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),
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=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
(such as the PKCS#11 mechanism CKM_RSA_AES_KEY_WRAP), you should use it
directly rather than this command.
Expand Down

0 comments on commit 9f18485

Please sign in to comment.