Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Remove "encryption" from transit actions #27346

Merged
merged 4 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ui/app/templates/components/transit-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
<p.levelLeft>
<h1 class="title is-3">
{{#if (eq this.mode "create")}}
Create Encryption Key
Create Key
{{else if (eq this.mode "edit")}}
Edit Encryption Key
Edit Key
{{else}}
Encryption Key
Key
<code>{{this.key.id}}</code>
{{/if}}
</h1>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/transit-form-create.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<div class="field is-grouped box is-fullwidth is-bottomless">
<Hds::ButtonSet>
<Hds::Button
@text="Create encryption key"
@text="Create key"
@icon={{if @requestInFlight "loading"}}
data-test-transit-key="create"
type="submit"
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/transit-form-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</div>
</div>
<p class="help">
The minimum decryption version required to reverse transformations performed with the encryption key. Results from
The minimum decryption version required to reverse transformations performed with the cryptographic key. Results from
lower key versions may be rewrapped with the new key version using the
<code>rewrap</code>
action.
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/components/transit-form-show.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<ToolbarActions>
{{#if (and (eq @tab "versions") @key.canRotate)}}
<ConfirmAction
@buttonText="Rotate encryption key"
@buttonText="Rotate key"
class="toolbar-button"
@buttonColor="secondary"
@confirmTitle="Rotate this key?"
Expand All @@ -65,7 +65,7 @@
{{#if (eq @mode "show")}}
{{#if (or @capabilities.canUpdate @capabilities.canDelete)}}
<ToolbarSecretLink @secret={{@key.id}} @backend={{@key.backend}} @mode="edit" replace={{true}}>
Edit encryption key
Edit key
</ToolbarSecretLink>
{{/if}}
{{/if}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div class="box is-sideless is-fullwidth is-marginless">
<NamespaceReminder @mode="perform" @noun="datakey creation" />
<div class="content has-bottom-margin-l">
<p>Generate a new high-entropy key and value using <code>{{@key.name}}</code> as the encryption key.</p>
<p>Generate a new high-entropy key and value using <code>{{@key.name}}</code> as the cryptographic key.</p>
</div>
<div class="field">
<label for="param" class="is-label">Output format</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<form {{on "submit" (fn @doSubmit (hash ciphertext=@ciphertext context=@context nonce=@nonce))}} ...attributes>
<div class="box is-sideless is-fullwidth is-marginless">
<div class="content has-bottom-margin-l">
<p>You can decrypt ciphertext using <code>{{@key.name}}</code> as the encryption key.</p>
<p>You can decrypt ciphertext using <code>{{@key.name}}</code> as the cryptographic key.</p>
</div>
<div class="field">
<div id="ciphertext-control" class="control">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="box is-sideless is-fullwidth is-marginless">
<NamespaceReminder @mode="perform" @noun="encryption" />
<div class="content has-bottom-margin-l">
<p>You can encrypt plaintext data using <code>{{@key.name}}</code> as the encryption key.</p>
<p>You can encrypt plaintext data using <code>{{@key.name}}</code> as the cryptographic key.</p>
</div>
<KeyVersionSelect @key={{@key}} @onVersionChange={{fn (mut @key_version)}} @key_version={{@key_version}} />
<div class="field">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
>
<div class="box is-sideless is-fullwidth is-marginless">
<div class="content">
<p>Export a key using <code>{{@key.name}}</code> as the encryption key.</p>
<p>Export a key using <code>{{@key.name}}</code> as the cryptographic key.</p>
</div>
<div class="field">
<label for="type" class="is-label">Key type</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<p>
You can rewrap the provided ciphertext using the latest version of
<code>{{@key.name}}</code>
as the encryption key.
as the cryptographic key.
</p>
</div>
<KeyVersionSelect @key={{@key}} @onVersionChange={{fn (mut @key_version)}} @key_version={{@key_version}} />
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/transit-key-action/sign.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<p>
Return the cryptographic signature of the given data using
<code>{{@key.name}}</code>
as the encryption key and the specified hash algorithm.
as the cryptographic key and the specified hash algorithm.
</p>
</div>
<KeyVersionSelect @key={{@key}} @onVersionChange={{fn (mut @key_version)}} @key_version={{@key_version}} />
Expand Down
4 changes: 2 additions & 2 deletions ui/lib/core/addon/helpers/options-for-backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ const SECRET_BACKENDS = {
transit: {
searchPlaceholder: 'Filter keys',
item: 'key',
create: 'Create encryption key',
create: 'Create key',
navigateTree: false,
editComponent: 'transit-edit',
listItemPartial: 'secret-list/item',
firstStep: `To use transit, you'll need to create an encryption key`,
firstStep: `To use transit, you'll need to create a key`,
},
};

Expand Down
Loading