From 527f4fe2baef81685688feffe2993b23ad20f555 Mon Sep 17 00:00:00 2001 From: claire bontempo <68122737+hellobontempo@users.noreply.github.com> Date: Tue, 23 May 2023 15:24:53 -0700 Subject: [PATCH] UI: add pki cluster config parameters (#20724) * add config directory, rename crl and urls models * fix imports * add cluster config fields to edit form * reorder url save * update tests * add to details page * add details test; * fix adapter name * fix cluster adapter test name * combine adapter tests * update imports * fix git diff * move crl and urls adapters to config folder * add config file * woops add config adapter * final renaming!! * fix imports after naming to base * add cluster to beforeModel hook * hide help text * maybe you should write tests that actually pass, claire * seriously claire its embarrassing --- .../adapters/pki/{crl.js => config/base.js} | 9 +-- ui/app/adapters/pki/config/cluster.js | 15 ++++ ui/app/adapters/pki/config/crl.js | 15 ++++ ui/app/adapters/pki/config/urls.js | 15 ++++ ui/app/adapters/pki/urls.js | 24 ------- ui/app/models/pki/config/cluster.js | 40 +++++++++++ ui/app/models/pki/{ => config}/crl.js | 2 +- ui/app/models/pki/{ => config}/urls.js | 2 +- .../page/pki-configuration-details.hbs | 14 +++- .../page/pki-configuration-details.ts | 4 +- .../page/pki-configuration-edit.hbs | 19 ++++++ .../components/page/pki-configuration-edit.ts | 16 ++--- .../pki/addon/components/pki-generate-root.ts | 8 ++- ui/lib/pki/addon/routes/application.js | 3 +- ui/lib/pki/addon/routes/configuration.js | 5 +- ui/lib/pki/addon/routes/configuration/edit.js | 3 +- .../pki/addon/routes/configuration/index.js | 3 +- .../addon/templates/configuration/edit.hbs | 7 +- .../addon/templates/configuration/index.hbs | 3 +- .../pki/pki-engine-route-cleanup-test.js | 8 +-- .../pki/page/pki-configuration-edit.js | 2 + .../page/pki-configuration-details-test.js | 22 +++++- .../pki/page/pki-configuration-edit-test.js | 34 ++++++++-- .../pki/page/pki-configure-create-test.js | 2 +- .../components/pki/pki-generate-root-test.js | 2 +- ui/tests/unit/adapters/pki/config-test.js | 68 +++++++++++++++++++ ui/tests/unit/adapters/pki/crl-test.js | 45 ------------ ui/tests/unit/adapters/pki/urls-test.js | 45 ------------ .../vault/models/pki/{ => config}/crl.d.ts | 2 +- .../vault/models/pki/{ => config}/urls.d.ts | 2 +- 30 files changed, 278 insertions(+), 161 deletions(-) rename ui/app/adapters/pki/{crl.js => config/base.js} (59%) create mode 100644 ui/app/adapters/pki/config/cluster.js create mode 100644 ui/app/adapters/pki/config/crl.js create mode 100644 ui/app/adapters/pki/config/urls.js delete mode 100644 ui/app/adapters/pki/urls.js create mode 100644 ui/app/models/pki/config/cluster.js rename ui/app/models/pki/{ => config}/crl.js (98%) rename ui/app/models/pki/{ => config}/urls.js (95%) create mode 100644 ui/tests/unit/adapters/pki/config-test.js delete mode 100644 ui/tests/unit/adapters/pki/crl-test.js delete mode 100644 ui/tests/unit/adapters/pki/urls-test.js rename ui/types/vault/models/pki/{ => config}/crl.d.ts (86%) rename ui/types/vault/models/pki/{ => config}/urls.d.ts (81%) diff --git a/ui/app/adapters/pki/crl.js b/ui/app/adapters/pki/config/base.js similarity index 59% rename from ui/app/adapters/pki/crl.js rename to ui/app/adapters/pki/config/base.js index 037601a82..a655d09cf 100644 --- a/ui/app/adapters/pki/crl.js +++ b/ui/app/adapters/pki/config/base.js @@ -3,16 +3,11 @@ * SPDX-License-Identifier: MPL-2.0 */ -import { encodePath } from 'vault/utils/path-encoding-helpers'; -import ApplicationAdapter from '../application'; +import ApplicationAdapter from '../../application'; -export default class PkiCrlAdapter extends ApplicationAdapter { +export default class PkiConfigBaseAdapter extends ApplicationAdapter { namespace = 'v1'; - _url(backend) { - return `${this.buildURL()}/${encodePath(backend)}/config/crl`; - } - findRecord(store, type, backend) { return this.ajax(this._url(backend), 'GET').then((resp) => { return resp.data; diff --git a/ui/app/adapters/pki/config/cluster.js b/ui/app/adapters/pki/config/cluster.js new file mode 100644 index 000000000..aa164261c --- /dev/null +++ b/ui/app/adapters/pki/config/cluster.js @@ -0,0 +1,15 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import { encodePath } from 'vault/utils/path-encoding-helpers'; +import PkiConfigBaseAdapter from './base'; + +export default class PkiConfigClusterAdapter extends PkiConfigBaseAdapter { + namespace = 'v1'; + + _url(backend) { + return `${this.buildURL()}/${encodePath(backend)}/config/cluster`; + } +} diff --git a/ui/app/adapters/pki/config/crl.js b/ui/app/adapters/pki/config/crl.js new file mode 100644 index 000000000..d7e5dc839 --- /dev/null +++ b/ui/app/adapters/pki/config/crl.js @@ -0,0 +1,15 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import { encodePath } from 'vault/utils/path-encoding-helpers'; +import PkiConfigBaseAdapter from './base'; + +export default class PkiConfigCrlAdapter extends PkiConfigBaseAdapter { + namespace = 'v1'; + + _url(backend) { + return `${this.buildURL()}/${encodePath(backend)}/config/crl`; + } +} diff --git a/ui/app/adapters/pki/config/urls.js b/ui/app/adapters/pki/config/urls.js new file mode 100644 index 000000000..ae15f5959 --- /dev/null +++ b/ui/app/adapters/pki/config/urls.js @@ -0,0 +1,15 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import { encodePath } from 'vault/utils/path-encoding-helpers'; +import PkiConfigBaseAdapter from './base'; + +export default class PkiConfigUrlsAdapter extends PkiConfigBaseAdapter { + namespace = 'v1'; + + _url(backend) { + return `${this.buildURL()}/${encodePath(backend)}/config/urls`; + } +} diff --git a/ui/app/adapters/pki/urls.js b/ui/app/adapters/pki/urls.js deleted file mode 100644 index 18f768b1c..000000000 --- a/ui/app/adapters/pki/urls.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -import { encodePath } from 'vault/utils/path-encoding-helpers'; -import ApplicationAdapter from '../application'; - -export default class PkiUrlsAdapter extends ApplicationAdapter { - namespace = 'v1'; - - _url(backend) { - return `${this.buildURL()}/${encodePath(backend)}/config/urls`; - } - - updateRecord(store, type, snapshot) { - const data = snapshot.serialize(); - return this.ajax(this._url(snapshot.record.id), 'POST', { data }); - } - - urlForFindRecord(id) { - return this._url(id); - } -} diff --git a/ui/app/models/pki/config/cluster.js b/ui/app/models/pki/config/cluster.js new file mode 100644 index 000000000..74c614f49 --- /dev/null +++ b/ui/app/models/pki/config/cluster.js @@ -0,0 +1,40 @@ +/** + * Copyright (c) HashiCorp, Inc. + * SPDX-License-Identifier: MPL-2.0 + */ + +import Model, { attr } from '@ember-data/model'; +import { withFormFields } from 'vault/decorators/model-form-fields'; +import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities'; + +@withFormFields() +export default class PkiConfigClusterModel extends Model { + // This model uses the backend value as the model ID + get useOpenAPI() { + return true; + } + + getHelpUrl(backendPath) { + return `/v1/${backendPath}/config/cluster?help=1`; + } + + @attr('string', { + label: "Mount's API path", + subText: + "Specifies the path to this performance replication cluster's API mount path, including any namespaces as path components. This address is used for the ACME directories, which must be served over a TLS-enabled listener.", + }) + path; + @attr('string', { + label: 'AIA path', + subText: + "Specifies the path to this performance replication cluster's AIA distribution point; may refer to an external, non-Vault responder.", + }) + aiaPath; + + // this is for pki-only cluster config, not the universal vault cluster + @lazyCapabilities(apiPath`${'id'}/config/cluster`, 'id') clusterPath; + + get canSet() { + return this.clusterPath.get('canCreate') !== false; + } +} diff --git a/ui/app/models/pki/crl.js b/ui/app/models/pki/config/crl.js similarity index 98% rename from ui/app/models/pki/crl.js rename to ui/app/models/pki/config/crl.js index 55030c3d5..6d7490e3b 100644 --- a/ui/app/models/pki/crl.js +++ b/ui/app/models/pki/config/crl.js @@ -17,7 +17,7 @@ const formFieldGroups = [ { 'Unified Revocation': ['crossClusterRevocation', 'unifiedCrl', 'unifiedCrlOnExistingPaths'] }, ]; @withFormFields(null, formFieldGroups) -export default class PkiCrlModel extends Model { +export default class PkiConfigCrlModel extends Model { // This model uses the backend value as the model ID @attr('boolean') autoRebuild; diff --git a/ui/app/models/pki/urls.js b/ui/app/models/pki/config/urls.js similarity index 95% rename from ui/app/models/pki/urls.js rename to ui/app/models/pki/config/urls.js index 76bfa7e22..ade9b8450 100644 --- a/ui/app/models/pki/urls.js +++ b/ui/app/models/pki/config/urls.js @@ -8,7 +8,7 @@ import { withFormFields } from 'vault/decorators/model-form-fields'; import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities'; @withFormFields() -export default class PkiUrlsModel extends Model { +export default class PkiConfigUrlsModel extends Model { // This model uses the backend value as the model ID get useOpenAPI() { return true; diff --git a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs b/ui/lib/pki/addon/components/page/pki-configuration-details.hbs index aa047999e..d6920bdfd 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-details.hbs +++ b/ui/lib/pki/addon/components/page/pki-configuration-details.hbs @@ -23,8 +23,20 @@ + {{#if (not (eq @cluster 403))}} +

+ Cluster Config +

+ {{#each @cluster.allFields as |attr|}} + + {{/each}} + {{/if}} + {{#if (not (eq @urls 403))}} -

+

Global URLs

diff --git a/ui/lib/pki/addon/components/page/pki-configuration-details.ts b/ui/lib/pki/addon/components/page/pki-configuration-details.ts index fa849d139..5f88e98e1 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-details.ts +++ b/ui/lib/pki/addon/components/page/pki-configuration-details.ts @@ -14,7 +14,7 @@ import type Store from '@ember-data/store'; import type VersionService from 'vault/services/version'; interface Args { - currentPath: string; + backend: string; } export default class PkiConfigurationDetails extends Component { @@ -32,7 +32,7 @@ export default class PkiConfigurationDetails extends Component { async deleteAllIssuers() { try { const issuerAdapter = this.store.adapterFor('pki/issuer'); - await issuerAdapter.deleteAllIssuers(this.args.currentPath); + await issuerAdapter.deleteAllIssuers(this.args.backend); this.flashMessages.success('Successfully deleted all issuers and keys'); this.showDeleteAllIssuers = false; this.router.transitionTo('vault.cluster.secrets.backend.pki.configuration.index'); diff --git a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs b/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs index 2e211d6c5..315c4455f 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs +++ b/ui/lib/pki/addon/components/page/pki-configuration-edit.hbs @@ -3,6 +3,25 @@ {{/if}}
+
+

+ Cluster Config +

+ {{#if @cluster.canSet}} + {{#each @cluster.allFields as |attr|}} + + {{/each}} + {{else}} + + POST /{{@backend}}/config/cluster + + {{/if}} +
+

Global URLs diff --git a/ui/lib/pki/addon/components/page/pki-configuration-edit.ts b/ui/lib/pki/addon/components/page/pki-configuration-edit.ts index e52fd4840..3a49a32bd 100644 --- a/ui/lib/pki/addon/components/page/pki-configuration-edit.ts +++ b/ui/lib/pki/addon/components/page/pki-configuration-edit.ts @@ -13,21 +13,21 @@ import errorMessage from 'vault/utils/error-message'; import type RouterService from '@ember/routing/router-service'; import type FlashMessageService from 'vault/services/flash-messages'; import type VersionService from 'vault/services/version'; -import type PkiCrlModel from 'vault/models/pki/crl'; -import type PkiUrlsModel from 'vault/models/pki/urls'; +import type PkiConfigCrlModel from 'vault/models/pki/config/crl'; +import type PkiConfigUrlsModel from 'vault/models/pki/config/urls'; import type { FormField, TtlEvent } from 'vault/app-types'; interface Args { - crl: PkiCrlModel; - urls: PkiUrlsModel; + crl: PkiConfigCrlModel; + urls: PkiConfigUrlsModel; } -interface PkiCrlTtls { +interface PkiConfigCrlTtls { autoRebuildGracePeriod: string; expiry: string; deltaRebuildInterval: string; ocspExpiry: string; } -interface PkiCrlBooleans { +interface PkiConfigCrlBooleans { autoRebuild: boolean; enableDelta: boolean; disable: boolean; @@ -69,10 +69,10 @@ export default class PkiConfigurationEditComponent extends Component { handleTtl(attr: FormField, e: TtlEvent) { const { enabled, goSafeTimeString } = e; const ttlAttr = attr.name; - this.args.crl[ttlAttr as keyof PkiCrlTtls] = goSafeTimeString; + this.args.crl[ttlAttr as keyof PkiConfigCrlTtls] = goSafeTimeString; // expiry and ocspExpiry both correspond to 'disable' booleans // so when ttl is enabled, the booleans are set to false - this.args.crl[attr.options.mapToBoolean as keyof PkiCrlBooleans] = attr.options.isOppositeValue + this.args.crl[attr.options.mapToBoolean as keyof PkiConfigCrlBooleans] = attr.options.isOppositeValue ? !enabled : enabled; } diff --git a/ui/lib/pki/addon/components/pki-generate-root.ts b/ui/lib/pki/addon/components/pki-generate-root.ts index 7389e47ad..79c5d9cf0 100644 --- a/ui/lib/pki/addon/components/pki-generate-root.ts +++ b/ui/lib/pki/addon/components/pki-generate-root.ts @@ -11,7 +11,7 @@ import { tracked } from '@glimmer/tracking'; import { task } from 'ember-concurrency'; import errorMessage from 'vault/utils/error-message'; import type PkiActionModel from 'vault/models/pki/action'; -import type PkiUrlsModel from 'vault/models/pki/urls'; +import type PkiConfigUrlsModel from 'vault/models/pki/config/urls'; import type FlashMessageService from 'vault/services/flash-messages'; import type RouterService from '@ember/routing/router-service'; import type { ValidationMap } from 'vault/vault/app-types'; @@ -22,7 +22,7 @@ interface AdapterOptions { } interface Args { model: PkiActionModel; - urls: PkiUrlsModel; + urls: PkiConfigUrlsModel; onCancel: CallableFunction; onComplete: CallableFunction; onSave?: CallableFunction; @@ -107,8 +107,10 @@ export default class PkiGenerateRootComponent extends Component { const continueSave = this.checkFormValidity(); if (!continueSave) return; try { - yield this.setUrls(); yield this.args.model.save({ adapterOptions: this.args.adapterOptions }); + // root generation must occur first in case templates are used for URL fields + // this way an issuer_id exists for backend to interpolate into the template + yield this.setUrls(); this.flashMessages.success('Successfully generated root.'); if (this.args.onSave) { this.args.onSave(); diff --git a/ui/lib/pki/addon/routes/application.js b/ui/lib/pki/addon/routes/application.js index d0d7d5e76..ac5472eb0 100644 --- a/ui/lib/pki/addon/routes/application.js +++ b/ui/lib/pki/addon/routes/application.js @@ -18,7 +18,8 @@ export default class PkiRoute extends Route { const mountPath = this.secretMountPath.currentPath; return hash({ role: this.pathHelp.getNewModel('pki/role', mountPath), - urls: this.pathHelp.getNewModel('pki/urls', mountPath), + urls: this.pathHelp.getNewModel('pki/config/urls', mountPath), + cluster: this.pathHelp.getNewModel('pki/config/cluster', mountPath), key: this.pathHelp.getNewModel('pki/key', mountPath), signCsr: this.pathHelp.getNewModel('pki/sign-intermediate', mountPath), certGenerate: this.pathHelp.getNewModel('pki/certificate/generate', mountPath), diff --git a/ui/lib/pki/addon/routes/configuration.js b/ui/lib/pki/addon/routes/configuration.js index 3072a697f..4cf9422f7 100644 --- a/ui/lib/pki/addon/routes/configuration.js +++ b/ui/lib/pki/addon/routes/configuration.js @@ -14,8 +14,9 @@ export default class PkiConfigurationRoute extends Route { const engine = this.modelFor('application'); return hash({ engine, - urls: this.store.findRecord('pki/urls', engine.id).catch((e) => e.httpStatus), - crl: this.store.findRecord('pki/crl', engine.id).catch((e) => e.httpStatus), + cluster: this.store.findRecord('pki/config/cluster', engine.id).catch((e) => e.httpStatus), + urls: this.store.findRecord('pki/config/urls', engine.id).catch((e) => e.httpStatus), + crl: this.store.findRecord('pki/config/crl', engine.id).catch((e) => e.httpStatus), }); } } diff --git a/ui/lib/pki/addon/routes/configuration/edit.js b/ui/lib/pki/addon/routes/configuration/edit.js index 307bae098..f5f723a86 100644 --- a/ui/lib/pki/addon/routes/configuration/edit.js +++ b/ui/lib/pki/addon/routes/configuration/edit.js @@ -12,9 +12,10 @@ export default class PkiConfigurationEditRoute extends Route { @service secretMountPath; model() { - const { urls, crl, engine } = this.modelFor('configuration'); + const { cluster, urls, crl, engine } = this.modelFor('configuration'); return { engineId: engine.id, + cluster, urls, crl, }; diff --git a/ui/lib/pki/addon/routes/configuration/index.js b/ui/lib/pki/addon/routes/configuration/index.js index fe0224d25..87841e7a0 100644 --- a/ui/lib/pki/addon/routes/configuration/index.js +++ b/ui/lib/pki/addon/routes/configuration/index.js @@ -20,10 +20,11 @@ export default class ConfigurationIndexRoute extends Route { } model() { - const { urls, crl, engine } = this.modelFor('configuration'); + const { cluster, urls, crl, engine } = this.modelFor('configuration'); return hash({ hasConfig: this.shouldPromptConfig, engine, + cluster, urls, crl, mountConfig: this.fetchMountConfig(engine.id), diff --git a/ui/lib/pki/addon/templates/configuration/edit.hbs b/ui/lib/pki/addon/templates/configuration/edit.hbs index e99dbf023..e89506355 100644 --- a/ui/lib/pki/addon/templates/configuration/edit.hbs +++ b/ui/lib/pki/addon/templates/configuration/edit.hbs @@ -10,4 +10,9 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ui/lib/pki/addon/templates/configuration/index.hbs b/ui/lib/pki/addon/templates/configuration/index.hbs index caf4689e4..6951fb0c6 100644 --- a/ui/lib/pki/addon/templates/configuration/index.hbs +++ b/ui/lib/pki/addon/templates/configuration/index.hbs @@ -10,10 +10,11 @@ /> \ No newline at end of file diff --git a/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js b/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js index dd964b1e1..9dde991c7 100644 --- a/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js +++ b/ui/tests/acceptance/pki/pki-engine-route-cleanup-test.js @@ -45,7 +45,7 @@ module('Acceptance | pki engine route cleanup test', function (hooks) { await visit(`/vault/secrets/${this.mountPath}/pki/overview`); await click(SELECTORS.emptyStateLink); configs = this.store.peekAll('pki/action'); - urls = this.store.peekRecord('pki/urls', this.mountPath); + urls = this.store.peekRecord('pki/config/urls', this.mountPath); config = configs.objectAt(0); assert.strictEqual(configs.length, 1, 'One config model present'); assert.false(urls.hasDirtyAttributes, 'URLs is loaded from endpoint'); @@ -54,13 +54,13 @@ module('Acceptance | pki engine route cleanup test', function (hooks) { // Cancel button rolls it back await click(SELECTORS.configuration.cancelButton); configs = this.store.peekAll('pki/action'); - urls = this.store.peekRecord('pki/urls', this.mountPath); + urls = this.store.peekRecord('pki/config/urls', this.mountPath); assert.strictEqual(configs.length, 0, 'config model is rolled back on cancel'); assert.strictEqual(urls.id, this.mountPath, 'Urls still exists on exit'); await click(SELECTORS.emptyStateLink); configs = this.store.peekAll('pki/action'); - urls = this.store.peekRecord('pki/urls', this.mountPath); + urls = this.store.peekRecord('pki/config/urls', this.mountPath); config = configs.objectAt(0); assert.strictEqual(configs.length, 1, 'One config model present'); assert.false(urls.hasDirtyAttributes, 'URLs is loaded from endpoint'); @@ -69,7 +69,7 @@ module('Acceptance | pki engine route cleanup test', function (hooks) { // Exit page via link rolls it back await click(SELECTORS.overviewBreadcrumb); configs = this.store.peekAll('pki/action'); - urls = this.store.peekRecord('pki/urls', this.mountPath); + urls = this.store.peekRecord('pki/config/urls', this.mountPath); assert.strictEqual(configs.length, 0, 'config model is rolled back on cancel'); assert.strictEqual(urls.id, this.mountPath, 'Urls still exists on exit'); }); diff --git a/ui/tests/helpers/pki/page/pki-configuration-edit.js b/ui/tests/helpers/pki/page/pki-configuration-edit.js index 1085ce6dd..3a3609275 100644 --- a/ui/tests/helpers/pki/page/pki-configuration-edit.js +++ b/ui/tests/helpers/pki/page/pki-configuration-edit.js @@ -5,6 +5,8 @@ export const SELECTORS = { errorBanner: '[data-test-error-banner]', + configEditSection: '[data-test-cluster-config-edit-section]', + configInput: (attr) => `[data-test-input="${attr}"]`, urlsEditSection: '[data-test-urls-edit-section]', urlFieldInput: (attr) => `[data-test-input="${attr}"] textarea`, urlFieldLabel: (attr) => `[data-test-input="${attr}"] label`, diff --git a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js b/ui/tests/integration/components/pki/page/pki-configuration-details-test.js index c9419e85f..0e0b1b490 100644 --- a/ui/tests/integration/components/pki/page/pki-configuration-details-test.js +++ b/ui/tests/integration/components/pki/page/pki-configuration-details-test.js @@ -24,8 +24,15 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook this.secretMountPath.currentPath = 'pki-test'; this.store = this.owner.lookup('service:store'); - this.urls = this.store.createRecord('pki/urls', { id: 'pki-test', issuingCertificates: 'example.com' }); - this.crl = this.store.createRecord('pki/crl', { + this.cluster = this.store.createRecord('pki/config/cluster', { + id: 'pki-test', + path: 'https://pr-a.vault.example.com/v1/ns1/pki-root', + }); + this.urls = this.store.createRecord('pki/config/urls', { + id: 'pki-test', + issuingCertificates: 'example.com', + }); + this.crl = this.store.createRecord('pki/config/crl', { id: 'pki-test', expiry: '20h', disable: false, @@ -54,6 +61,17 @@ module('Integration | Component | Page::PkiConfigurationDetails', function (hook }; }); + test('shows the correct information on cluster config', async function (assert) { + await render(hbs`,`, { + owner: this.engine, + }); + + assert + .dom(SELECTORS.rowValue("Mount's API path")) + .hasText('https://pr-a.vault.example.com/v1/ns1/pki-root', 'mount API path row renders'); + assert.dom(SELECTORS.rowValue('AIA path')).hasText('None', "renders 'None' when no data"); + }); + test('shows the correct information on global urls section', async function (assert) { await render( hbs`,`, diff --git a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js b/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js index 1879faa8b..e3e7304ec 100644 --- a/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js +++ b/ui/tests/integration/components/pki/page/pki-configuration-edit-test.js @@ -26,8 +26,12 @@ module('Integration | Component | page/pki-configuration-edit', function (hooks) this.backend = 'pki-engine'; // both models only use findRecord. API parameters for pki/crl // are set by default backend values when the engine is mounted - this.store.pushPayload('pki/crl', { - modelName: 'pki/crl', + this.store.pushPayload('pki/config/cluster', { + modelName: 'pki/config/cluster', + id: this.backend, + }); + this.store.pushPayload('pki/config/crl', { + modelName: 'pki/config/crl', id: this.backend, auto_rebuild: false, auto_rebuild_grace_period: '12h', @@ -38,19 +42,31 @@ module('Integration | Component | page/pki-configuration-edit', function (hooks) ocsp_disable: false, ocsp_expiry: '12h', }); - this.store.pushPayload('pki/urls', { - modelName: 'pki/urls', + this.store.pushPayload('pki/config/urls', { + modelName: 'pki/config/urls', id: this.backend, issuing_certificates: ['hashicorp.com'], crl_distribution_points: ['some-crl-distribution.com'], ocsp_servers: ['ocsp-stuff.com'], }); - this.urls = this.store.peekRecord('pki/urls', this.backend); - this.crl = this.store.peekRecord('pki/crl', this.backend); + this.cluster = this.store.peekRecord('pki/config/cluster', this.backend); + this.crl = this.store.peekRecord('pki/config/crl', this.backend); + this.urls = this.store.peekRecord('pki/config/urls', this.backend); }); test('it renders with config data and updates config', async function (assert) { - assert.expect(27); + assert.expect(28); + this.server.post(`/${this.backend}/config/cluster`, (schema, req) => { + assert.ok(true, 'request made to save cluster config'); + assert.propEqual( + JSON.parse(req.requestBody), + { + path: 'https://pr-a.vault.example.com/v1/ns1/pki-root', + aia_path: 'http://another-path.com', + }, + 'it updates config model attributes' + ); + }); this.server.post(`/${this.backend}/config/crl`, (schema, req) => { assert.ok(true, 'request made to save crl config'); assert.propEqual( @@ -83,6 +99,7 @@ module('Integration | Component | page/pki-configuration-edit', function (hooks) await render( hbs` { + test('it should make request to correct endpoint on update', async function (assert) { + assert.expect(1); + + this.server.post(`/${this.backend}/config/${this.endpoint}`, () => { + assert.ok(true, `request made to POST config/${this.endpoint} endpoint on update`); + }); + + this.store.pushPayload(`pki/config/${this.endpoint}`, { + modelName: `pki/config/${this.endpoint}`, + id: this.backend, + }); + + const model = this.store.peekRecord(`pki/config/${this.endpoint}`, this.backend); + await model.save(); + }); + + test('it should make request to correct endpoint on find', async function (assert) { + assert.expect(1); + + this.server.get(`/${this.backend}/config/${this.endpoint}`, () => { + assert.ok(true, `request is made to GET /config/${this.endpoint} endpoint on find`); + return { data: { id: this.backend } }; + }); + + this.store.findRecord(`pki/config/${this.endpoint}`, this.backend); + }); + }; + + module('cluster', function (hooks) { + hooks.beforeEach(async function () { + this.endpoint = 'cluster'; + }); + testHelper(test); + }); + + module('urls', function (hooks) { + hooks.beforeEach(async function () { + this.endpoint = 'urls'; + }); + testHelper(test); + }); + + module('crl', function (hooks) { + hooks.beforeEach(async function () { + this.endpoint = 'crl'; + }); + testHelper(test); + }); +}); diff --git a/ui/tests/unit/adapters/pki/crl-test.js b/ui/tests/unit/adapters/pki/crl-test.js deleted file mode 100644 index 160c3d9ab..000000000 --- a/ui/tests/unit/adapters/pki/crl-test.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -import { module, test } from 'qunit'; -import { setupTest } from 'vault/tests/helpers'; -import { setupMirage } from 'ember-cli-mirage/test-support'; - -module('Unit | Adapter | pki/crl', function (hooks) { - setupTest(hooks); - setupMirage(hooks); - - hooks.beforeEach(function () { - this.store = this.owner.lookup('service:store'); - this.backend = 'pki-engine'; - }); - - test('it should make request to correct endpoint on update', async function (assert) { - assert.expect(1); - - this.server.post(`/${this.backend}/config/crl`, () => { - assert.ok(true, 'request made to correct endpoint on update'); - }); - - this.store.pushPayload('pki/crl', { - modelName: 'pki/crl', - id: this.backend, - }); - - const model = this.store.peekRecord('pki/crl', this.backend); - await model.save(); - }); - - test('it should make request to correct endpoint on find', async function (assert) { - assert.expect(1); - - this.server.get(`/${this.backend}/config/crl`, () => { - assert.ok(true, 'request is made to correct endpoint on find'); - return { data: { id: this.backend } }; - }); - - this.store.findRecord('pki/crl', this.backend); - }); -}); diff --git a/ui/tests/unit/adapters/pki/urls-test.js b/ui/tests/unit/adapters/pki/urls-test.js deleted file mode 100644 index 333ade04f..000000000 --- a/ui/tests/unit/adapters/pki/urls-test.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -import { module, test } from 'qunit'; -import { setupTest } from 'vault/tests/helpers'; -import { setupMirage } from 'ember-cli-mirage/test-support'; - -module('Unit | Adapter | pki/urls', function (hooks) { - setupTest(hooks); - setupMirage(hooks); - - hooks.beforeEach(function () { - this.store = this.owner.lookup('service:store'); - this.backend = 'pki-engine'; - }); - - test('it should make request to correct endpoint on update', async function (assert) { - assert.expect(1); - - this.server.post(`/${this.backend}/config/urls`, () => { - assert.ok(true, 'request made to correct endpoint on update'); - }); - - this.store.pushPayload('pki/urls', { - modelName: 'pki/urls', - id: this.backend, - }); - - const model = this.store.peekRecord('pki/urls', this.backend); - await model.save(); - }); - - test('it should make request to correct endpoint on find', async function (assert) { - assert.expect(1); - - this.server.get(`/${this.backend}/config/urls`, () => { - assert.ok(true, 'request is made to correct endpoint on find'); - return { data: { id: this.backend } }; - }); - - this.store.findRecord('pki/urls', this.backend); - }); -}); diff --git a/ui/types/vault/models/pki/crl.d.ts b/ui/types/vault/models/pki/config/crl.d.ts similarity index 86% rename from ui/types/vault/models/pki/crl.d.ts rename to ui/types/vault/models/pki/config/crl.d.ts index 91891fbf5..4b0ef7e49 100644 --- a/ui/types/vault/models/pki/crl.d.ts +++ b/ui/types/vault/models/pki/config/crl.d.ts @@ -1,7 +1,7 @@ import Model from '@ember-data/model'; import { FormField } from 'vault/app-types'; -export default class PkiCrlModel extends Model { +export default class PkiConfigCrlModel extends Model { autoRebuild: boolean; autoRebuildGracePeriod: string; enableDelta: boolean; diff --git a/ui/types/vault/models/pki/urls.d.ts b/ui/types/vault/models/pki/config/urls.d.ts similarity index 81% rename from ui/types/vault/models/pki/urls.d.ts rename to ui/types/vault/models/pki/config/urls.d.ts index b3b54dd9b..0481507d8 100644 --- a/ui/types/vault/models/pki/urls.d.ts +++ b/ui/types/vault/models/pki/config/urls.d.ts @@ -1,6 +1,6 @@ import Model from '@ember-data/model'; -export default class PkiUrlsModel extends Model { +export default class PkiConfigUrlsModel extends Model { get useOpenAPI(): boolean; getHelpUrl(backendPath: string): string; issuingCertificates: array;