Replace Non-Inclusive Terms in UI (#17116)

* removes non-inclusive terms from UI

* adds changelog entry
This commit is contained in:
Jordan Reimer 2022-09-13 10:42:34 -06:00 committed by GitHub
parent f9439a9c41
commit da7cd37674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 26 additions and 25 deletions

3
changelog/17116.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
ui: Replaces non-inclusive terms
```

View File

@ -6,8 +6,7 @@ export default ApplicationAdapter.extend({
pathForType(modelType) {
// we want the last part of the path
const type = modelType.split('/').pop();
// TODO: Update endpoints from PR#10997
if (type === 'identity-whitelist' || type === 'roletag-blacklist') {
if (type === 'identity-accesslist' || type === 'roletag-denylist') {
return `tidy/${type}`;
}
return type;

View File

@ -10,11 +10,11 @@ const TABS_FOR_SETTINGS = {
},
{
label: 'Identity Allow List Tidy',
routeParams: ['vault.cluster.settings.auth.configure.section', 'identity-whitelist'], // TODO: Update endpoint from PR#10997
routeParams: ['vault.cluster.settings.auth.configure.section', 'identity-accesslist'],
},
{
label: 'Role Tag Deny List Tidy',
routeParams: ['vault.cluster.settings.auth.configure.section', 'roletag-blacklist'], // TODO: Update endpoints from PR#10997
routeParams: ['vault.cluster.settings.auth.configure.section', 'roletag-denylist'],
},
],
azure: [

View File

@ -28,7 +28,7 @@ export default Fragment.extend({
}),
passthroughRequestHeaders: attr({
label: 'Allowed passthrough request headers',
helpText: 'Headers to whitelist and pass from the request to the backend',
helpText: 'Headers to allow and pass from the request to the backend',
editType: 'stringArray',
}),
tokenType: attr('string', {

View File

@ -10,11 +10,10 @@ export default Route.extend(UnloadModelRoute, {
pathHelp: service('path-help'),
modelType(backendType, section) {
// TODO: Update endpoints from PR#10997
const MODELS = {
'aws-client': 'auth-config/aws/client',
'aws-identity-whitelist': 'auth-config/aws/identity-whitelist',
'aws-roletag-blacklist': 'auth-config/aws/roletag-blacklist',
'aws-identity-accesslist': 'auth-config/aws/identity-accesslist',
'aws-roletag-denylist': 'auth-config/aws/roletag-denylist',
'azure-configuration': 'auth-config/azure',
'github-configuration': 'auth-config/github',
'gcp-configuration': 'auth-config/gcp',

View File

@ -5,7 +5,7 @@
@docPath="/intro/getting-started/deploy.html#initializing-the-vault"
>
<p>
Now that Vault is initialized, you'll want to save your root token and master key portions in a safe place. Distribute
Now that Vault is initialized, you'll want to save your root token and root key portions in a safe place. Distribute
your keys to responsible people on your team. If these keys are lost, you may not be able to access your data again.
Keep them safe!
</p>

View File

@ -1,6 +1,6 @@
<WizardContent @headerText="Initialization" @glyph="tour">
<WizardSection
@headerText="Setting up your master keys"
@headerText="Setting up your root keys"
@docText="Learn: Initialization"
@docPath="/intro/getting-started/deploy.html#initializing-the-vault"
>

View File

@ -35,7 +35,7 @@
Please securely distribute the keys below. When the Vault is re-sealed, restarted, or stopped, you must provide
at least
<strong class="has-text-danger">{{this.secret_threshold}}</strong>
of these keys to unseal it again. Vault does not store the master key. Without at least
of these keys to unseal it again. Vault does not store the root key. Without at least
<strong class="has-text-danger">{{this.secret_threshold}}</strong>
keys, your Vault will remain permanently sealed.
{{/if}}
@ -106,7 +106,7 @@
{{else}}
<Page.header>
<h1 class="title h5">
Let's set up the initial set of master keys that youll need in case of an emergency
Let's set up the initial set of root keys that youll need in case of an emergency
</h1>
</Page.header>
<Page.content>
@ -146,7 +146,7 @@
/>
</div>
<p class="help has-text-grey">
The number of key shares to split the master key into
The number of key shares to split the root key into
</p>
</div>
<div class="field">
@ -168,7 +168,7 @@
/>
</div>
<p class="help has-text-grey">
The number of key shares required to reconstruct the master key
The number of key shares required to reconstruct the root key
</p>
</div>
<ToggleButton

View File

@ -10,7 +10,7 @@
<div class="box is-sideless is-fullwidth is-marginless">
<p>
Sealing a vault tells the Vault server to stop responding to any access operations until it is unsealed again. A sealed
vault throws away its master key to unlock the data, so it physically is blocked from responding to operations again
vault throws away its root key to unlock the data, so it physically is blocked from responding to operations again
until the Vault is unsealed again with the "unseal" command or via the API.
</p>
</div>

View File

@ -29,8 +29,8 @@
@isActive={{this.isModalActive}}
>
<p>
Updating or promoting this cluster requires an operation token, generated by inputting the master key shares. If you'd
like to first encrypt the token with a PGP Key, click "Encrypt with PGP key" below, otherwise we can begin generation of
the operation token.
Updating or promoting this cluster requires an operation token, generated by inputting the root key shares. If you'd like
to first encrypt the token with a PGP Key, click "Encrypt with PGP key" below, otherwise we can begin generation of the
operation token.
</p>
</ShamirModalFlow>

View File

@ -52,7 +52,7 @@
{{#if (eq this.generateStep "chooseMethod")}}
<div class="box is-marginless is-shadowless">
<p>
Updating or promoting this cluster requires an operation token. Let's generate one by inputting the master key
Updating or promoting this cluster requires an operation token. Let's generate one by inputting the root key
shares. If you'd like to encrypt the token with a PGP Key, please click "Provide PGP Key" below, otherwise we can
begin generation of the Operation Token.
</p>
@ -100,7 +100,7 @@
<div class="box is-marginless is-shadowless">
<p>
Below is the base-64 encoded PGP Key that will be used to encrypt the generated Operation Token. Next we'll enter
portions of the master key to generate an Operation Token. Click the "Generate Operation Token" button to proceed.
portions of the root key to generate an Operation Token. Click the "Generate Operation Token" button to proceed.
</p>
<div class="message is-list has-copy-button" tabindex="-1">
<HoverCopyButton @copyValue={{this.pgp_key}} />

View File

@ -124,7 +124,7 @@
<div>
<p class="has-bottom-margin-m">
Below is the base-64 encoded PGP Key that will be used to encrypt the generated operation token. Next we'll
enter portions of the master key to generate an operation token. Click the "Generate operation token" button to
enter portions of the root key to generate an operation token. Click the "Generate operation token" button to
proceed.
</p>
<h4 class="field-title has-bottom-padding-m is-fullwidth">
@ -175,13 +175,13 @@
</div>
{{/if}}
<p>
Generate an operation token by entering a portion of the primary's master key. Once all portions are entered,
the generated token may be used to manage your secondary Disaster Recovery cluster.
Generate an operation token by entering a portion of the primary's root key. Once all portions are entered, the
generated token may be used to manage your secondary Disaster Recovery cluster.
</p>
</div>
<div class="field">
<label for="key" class="is-label">
Master Key Portion
root key Portion
</label>
<div class="control">
<Input class="input" @type="password" name="key" @value={{this.key}} data-test-shamir-input={{true}} />

View File

@ -53,7 +53,7 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
<p>Inner content goes here</p>
</ShamirModalFlow>
`);
assert.dom('[data-test-shamir-input]').exists('Asks for Master Key Portion');
assert.dom('[data-test-shamir-input]').exists('Asks for root key Portion');
assert.dom('[data-test-shamir-modal-cancel-button]').hasText('Cancel', 'Shows cancel button');
});