From 8fd1ac3e7dc818c25ca07629649059605febe110 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 10:53:07 -0800
Subject: [PATCH 01/10] reroute pki config routes

---
 ui/lib/pki/addon/routes.js                               | 9 +--------
 ui/lib/pki/addon/routes/configuration.js                 | 3 +++
 ui/lib/pki/addon/routes/configuration/create.js          | 3 +++
 .../addon/routes/configuration/create/generate-csr.js    | 3 ---
 .../addon/routes/configuration/create/generate-root.js   | 3 ---
 .../pki/addon/routes/configuration/create/import-ca.js   | 3 ---
 ui/lib/pki/addon/routes/configuration/create/index.js    | 3 ---
 ui/lib/pki/addon/routes/configuration/details.js         | 3 ---
 ui/lib/pki/addon/routes/configuration/index.js           | 3 ---
 .../{configuration/index.hbs => configuration.hbs}       | 0
 ui/lib/pki/addon/templates/configuration/create.hbs      | 1 +
 .../templates/configuration/create/generate-csr.hbs      | 1 -
 .../templates/configuration/create/generate-root.hbs     | 1 -
 .../addon/templates/configuration/create/import-ca.hbs   | 1 -
 .../pki/addon/templates/configuration/create/index.hbs   | 1 -
 ui/lib/pki/addon/templates/configuration/details.hbs     | 1 -
 ui/lib/pki/addon/templates/overview.hbs                  | 4 ++--
 17 files changed, 10 insertions(+), 33 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/configuration.js
 create mode 100644 ui/lib/pki/addon/routes/configuration/create.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/create/generate-csr.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/create/generate-root.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/create/import-ca.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/create/index.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/details.js
 delete mode 100644 ui/lib/pki/addon/routes/configuration/index.js
 rename ui/lib/pki/addon/templates/{configuration/index.hbs => configuration.hbs} (100%)
 create mode 100644 ui/lib/pki/addon/templates/configuration/create.hbs
 delete mode 100644 ui/lib/pki/addon/templates/configuration/create/generate-csr.hbs
 delete mode 100644 ui/lib/pki/addon/templates/configuration/create/generate-root.hbs
 delete mode 100644 ui/lib/pki/addon/templates/configuration/create/import-ca.hbs
 delete mode 100644 ui/lib/pki/addon/templates/configuration/create/index.hbs
 delete mode 100644 ui/lib/pki/addon/templates/configuration/details.hbs

diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index fb54435516a1..aa2c3313e8c1 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -3,16 +3,9 @@ import buildRoutes from 'ember-engines/routes';
 export default buildRoutes(function () {
   this.route('overview');
   this.route('configuration', function () {
-    this.route('index', { path: '/' });
     this.route('tidy');
-    this.route('create', function () {
-      this.route('index', { path: '/' });
-      this.route('import-ca');
-      this.route('generate-root');
-      this.route('generate-csr');
-    });
+    this.route('create');
     this.route('edit');
-    this.route('details');
   });
   this.route('roles', function () {
     this.route('index', { path: '/' });
diff --git a/ui/lib/pki/addon/routes/configuration.js b/ui/lib/pki/addon/routes/configuration.js
new file mode 100644
index 000000000000..c7a5d12c71c9
--- /dev/null
+++ b/ui/lib/pki/addon/routes/configuration.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiConfigurationRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/create.js b/ui/lib/pki/addon/routes/configuration/create.js
new file mode 100644
index 000000000000..73d6caa11f41
--- /dev/null
+++ b/ui/lib/pki/addon/routes/configuration/create.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiConfigurationCreateRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/create/generate-csr.js b/ui/lib/pki/addon/routes/configuration/create/generate-csr.js
deleted file mode 100644
index bd35d7c0ef0f..000000000000
--- a/ui/lib/pki/addon/routes/configuration/create/generate-csr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiConfigurationCreateGenerateCsrRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/create/generate-root.js b/ui/lib/pki/addon/routes/configuration/create/generate-root.js
deleted file mode 100644
index 4db5cef108ac..000000000000
--- a/ui/lib/pki/addon/routes/configuration/create/generate-root.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiConfigurationCreateGenerateRootRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/create/import-ca.js b/ui/lib/pki/addon/routes/configuration/create/import-ca.js
deleted file mode 100644
index 34021583d672..000000000000
--- a/ui/lib/pki/addon/routes/configuration/create/import-ca.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiConfigurationCreateImportCaRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/create/index.js b/ui/lib/pki/addon/routes/configuration/create/index.js
deleted file mode 100644
index 70fc318ba2f0..000000000000
--- a/ui/lib/pki/addon/routes/configuration/create/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ConfigurationCreateIndexRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/details.js b/ui/lib/pki/addon/routes/configuration/details.js
deleted file mode 100644
index a7208797762f..000000000000
--- a/ui/lib/pki/addon/routes/configuration/details.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiConfigurationDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/configuration/index.js b/ui/lib/pki/addon/routes/configuration/index.js
deleted file mode 100644
index 008389a1ca51..000000000000
--- a/ui/lib/pki/addon/routes/configuration/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiConfigurationIndexRoute extends Route {}
diff --git a/ui/lib/pki/addon/templates/configuration/index.hbs b/ui/lib/pki/addon/templates/configuration.hbs
similarity index 100%
rename from ui/lib/pki/addon/templates/configuration/index.hbs
rename to ui/lib/pki/addon/templates/configuration.hbs
diff --git a/ui/lib/pki/addon/templates/configuration/create.hbs b/ui/lib/pki/addon/templates/configuration/create.hbs
new file mode 100644
index 000000000000..5df068240ee0
--- /dev/null
+++ b/ui/lib/pki/addon/templates/configuration/create.hbs
@@ -0,0 +1 @@
+route: pki.configuration.create
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create/generate-csr.hbs b/ui/lib/pki/addon/templates/configuration/create/generate-csr.hbs
deleted file mode 100644
index 69caa62151c2..000000000000
--- a/ui/lib/pki/addon/templates/configuration/create/generate-csr.hbs
+++ /dev/null
@@ -1 +0,0 @@
-configuration.create.generate-csr
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create/generate-root.hbs b/ui/lib/pki/addon/templates/configuration/create/generate-root.hbs
deleted file mode 100644
index 539da1070340..000000000000
--- a/ui/lib/pki/addon/templates/configuration/create/generate-root.hbs
+++ /dev/null
@@ -1 +0,0 @@
-configuration.create.generate-root
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create/import-ca.hbs b/ui/lib/pki/addon/templates/configuration/create/import-ca.hbs
deleted file mode 100644
index 6627ec6760dd..000000000000
--- a/ui/lib/pki/addon/templates/configuration/create/import-ca.hbs
+++ /dev/null
@@ -1 +0,0 @@
-configuration.create.import-ca
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/create/index.hbs b/ui/lib/pki/addon/templates/configuration/create/index.hbs
deleted file mode 100644
index 6b8911318eb4..000000000000
--- a/ui/lib/pki/addon/templates/configuration/create/index.hbs
+++ /dev/null
@@ -1 +0,0 @@
-configuration.create.index
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/configuration/details.hbs b/ui/lib/pki/addon/templates/configuration/details.hbs
deleted file mode 100644
index 313389f22708..000000000000
--- a/ui/lib/pki/addon/templates/configuration/details.hbs
+++ /dev/null
@@ -1 +0,0 @@
-configuration.details
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/overview.hbs b/ui/lib/pki/addon/templates/overview.hbs
index 9f27316275e2..ffd90bb995fe 100644
--- a/ui/lib/pki/addon/templates/overview.hbs
+++ b/ui/lib/pki/addon/templates/overview.hbs
@@ -10,14 +10,14 @@
 />
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="configuration.create.index">
+    <ToolbarLink @route="configuration.create">
       Configure PKI
     </ToolbarLink>
   </ToolbarActions>
 </Toolbar>
 
 <EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
-  <LinkTo @route="configuration.create.index" @model={{this.model}}>
+  <LinkTo @route="configuration.create" @model={{this.model}}>
     Configure PKI
   </LinkTo>
 </EmptyState>
\ No newline at end of file

From 2f5906f24d4a94de7b8e40026e20a086ad6011b0 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 13:33:59 -0800
Subject: [PATCH 02/10] issuers routes

---
 ui/app/serializers/pki/issuer.js                         | 2 ++
 ui/lib/pki/addon/routes.js                               | 6 +++++-
 ui/lib/pki/addon/routes/issuers/index.js                 | 7 +++----
 ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js     | 3 +++
 ui/lib/pki/addon/routes/issuers/issuer/details.js        | 3 +++
 ui/lib/pki/addon/routes/issuers/issuer/edit.js           | 3 +++
 ui/lib/pki/addon/routes/issuers/issuer/sign.js           | 3 +++
 ui/lib/pki/addon/templates/issuers/index.hbs             | 6 +++---
 ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs | 1 +
 ui/lib/pki/addon/templates/issuers/issuer/details.hbs    | 1 +
 ui/lib/pki/addon/templates/issuers/issuer/edit.hbs       | 1 +
 ui/lib/pki/addon/templates/issuers/issuer/sign.hbs       | 1 +
 12 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js
 create mode 100644 ui/lib/pki/addon/routes/issuers/issuer/details.js
 create mode 100644 ui/lib/pki/addon/routes/issuers/issuer/edit.js
 create mode 100644 ui/lib/pki/addon/routes/issuers/issuer/sign.js
 create mode 100644 ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs
 create mode 100644 ui/lib/pki/addon/templates/issuers/issuer/details.hbs
 create mode 100644 ui/lib/pki/addon/templates/issuers/issuer/edit.hbs
 create mode 100644 ui/lib/pki/addon/templates/issuers/issuer/sign.hbs

diff --git a/ui/app/serializers/pki/issuer.js b/ui/app/serializers/pki/issuer.js
index 5db741e40853..9d5eddaa8931 100644
--- a/ui/app/serializers/pki/issuer.js
+++ b/ui/app/serializers/pki/issuer.js
@@ -1,6 +1,8 @@
 import ApplicationSerializer from '../application';
 
 export default class PkiIssuerSerializer extends ApplicationSerializer {
+  primaryKey = 'issuer_ref';
+
   // rehydrate each issuer model so all model attributes are accessible from the LIST response
   normalizeItems(payload) {
     if (payload.data) {
diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index aa2c3313e8c1..e99ae29a299b 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -4,6 +4,8 @@ export default buildRoutes(function () {
   this.route('overview');
   this.route('configuration', function () {
     this.route('tidy');
+    this.route('generate');
+    this.route('import');
     this.route('create');
     this.route('edit');
   });
@@ -17,9 +19,11 @@ export default buildRoutes(function () {
   });
   this.route('issuers', function () {
     this.route('index', { path: '/' });
-    this.route('issuer', { path: '/:id' }, function () {
+    this.route('issuer', { path: '/:issuer_ref' }, function () {
       this.route('details');
       this.route('edit');
+      this.route('sign');
+      this.route('cross-sign');
     });
   });
   this.route('certificates', function () {
diff --git a/ui/lib/pki/addon/routes/issuers/index.js b/ui/lib/pki/addon/routes/issuers/index.js
index b945ff308136..14667bdc310e 100644
--- a/ui/lib/pki/addon/routes/issuers/index.js
+++ b/ui/lib/pki/addon/routes/issuers/index.js
@@ -8,15 +8,14 @@ export default class PkiIssuersIndexRoute extends Route {
 
   beforeModel() {
     // Must call this promise before the model hook otherwise it doesn't add OpenApi to record.
-    return this.pathHelp.getNewModel('pki/pki-issuer-engine', 'pki');
+    return this.pathHelp.getNewModel('pki/issuer', 'pki');
   }
 
   model() {
     // the pathHelp service is needed for adding openAPI to the model
-    this.pathHelp.getNewModel('pki/pki-issuer-engine', 'pki');
-
+    this.pathHelp.getNewModel('pki/issuer', 'pki');
     return this.store
-      .query('pki/pki-issuer-engine', { backend: this.secretMountPath.currentPath })
+      .query('pki/issuer', { backend: this.secretMountPath.currentPath })
       .then((issuersModel) => {
         return { issuersModel, parentModel: this.modelFor('issuers') };
       })
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js b/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js
new file mode 100644
index 000000000000..7b4d515d5271
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/issuer/cross-sign.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuerCrossSignRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/details.js b/ui/lib/pki/addon/routes/issuers/issuer/details.js
new file mode 100644
index 000000000000..db8ba0c3ce9e
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/issuer/details.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuerDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/edit.js b/ui/lib/pki/addon/routes/issuers/issuer/edit.js
new file mode 100644
index 000000000000..31614efcf696
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/issuer/edit.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuerEditRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/issuers/issuer/sign.js b/ui/lib/pki/addon/routes/issuers/issuer/sign.js
new file mode 100644
index 000000000000..dc2476b60df2
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/issuer/sign.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuerSignRoute extends Route {}
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
index 34c685be583f..f10803d107e9 100644
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ b/ui/lib/pki/addon/templates/issuers/index.hbs
@@ -10,7 +10,7 @@
 />
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="configuration.create.import-ca">
+    <ToolbarLink @route="configuration.import">
       Import
     </ToolbarLink>
     <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
@@ -22,12 +22,12 @@
         <nav class="box menu" aria-label="generate options">
           <ul class="menu-list">
             <li class="action">
-              <LinkTo @route="configuration.create.generate-root" {{on "click" (fn this.onLinkClick D)}}>
+              <LinkTo @route="configuration.generate" {{on "click" (fn this.onLinkClick D)}}>
                 Root
               </LinkTo>
             </li>
             <li class="action">
-              <LinkTo @route="configuration.create.generate-csr" {{on "click" (fn this.onLinkClick D)}}>
+              <LinkTo @route="configuration.generate" {{on "click" (fn this.onLinkClick D)}}>
                 Intermediate CSR
               </LinkTo>
             </li>
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs b/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs
new file mode 100644
index 000000000000..87b32c66269e
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers/issuer/cross-sign.hbs
@@ -0,0 +1 @@
+route: issuers.issuer.cross-sign
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/details.hbs b/ui/lib/pki/addon/templates/issuers/issuer/details.hbs
new file mode 100644
index 000000000000..85e2f9a38e53
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers/issuer/details.hbs
@@ -0,0 +1 @@
+route: issuers.issuer.details
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs b/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs
new file mode 100644
index 000000000000..62fec9342611
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers/issuer/edit.hbs
@@ -0,0 +1 @@
+route: issuers.issuer.edit
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs b/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs
new file mode 100644
index 000000000000..6398a41cc4ad
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers/issuer/sign.hbs
@@ -0,0 +1 @@
+route: issuers.issuer.sign
\ No newline at end of file

From 9a664ddbf6fcd4eefee2f20dfb84880351eb259d Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 14:48:02 -0800
Subject: [PATCH 03/10] refactor role routes

---
 ui/app/serializers/pki/issuer.js                   | 2 --
 ui/lib/pki/addon/routes.js                         | 4 +++-
 ui/lib/pki/addon/routes/roles/role/details.js      | 2 +-
 ui/lib/pki/addon/routes/roles/role/edit.js         | 2 +-
 ui/lib/pki/addon/routes/roles/role/generate.js     | 3 +++
 ui/lib/pki/addon/routes/roles/role/sign.js         | 3 +++
 ui/lib/pki/addon/templates/roles/role/generate.hbs | 1 +
 ui/lib/pki/addon/templates/roles/role/sign.hbs     | 1 +
 8 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/roles/role/generate.js
 create mode 100644 ui/lib/pki/addon/routes/roles/role/sign.js
 create mode 100644 ui/lib/pki/addon/templates/roles/role/generate.hbs
 create mode 100644 ui/lib/pki/addon/templates/roles/role/sign.hbs

diff --git a/ui/app/serializers/pki/issuer.js b/ui/app/serializers/pki/issuer.js
index 9d5eddaa8931..5db741e40853 100644
--- a/ui/app/serializers/pki/issuer.js
+++ b/ui/app/serializers/pki/issuer.js
@@ -1,8 +1,6 @@
 import ApplicationSerializer from '../application';
 
 export default class PkiIssuerSerializer extends ApplicationSerializer {
-  primaryKey = 'issuer_ref';
-
   // rehydrate each issuer model so all model attributes are accessible from the LIST response
   normalizeItems(payload) {
     if (payload.data) {
diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index e99ae29a299b..80680bdf936b 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -12,9 +12,11 @@ export default buildRoutes(function () {
   this.route('roles', function () {
     this.route('index', { path: '/' });
     this.route('create');
-    this.route('role', { path: '/:id' }, function () {
+    this.route('role', { path: '/:role' }, function () {
       this.route('details');
       this.route('edit');
+      this.route('generate');
+      this.route('sign');
     });
   });
   this.route('issuers', function () {
diff --git a/ui/lib/pki/addon/routes/roles/role/details.js b/ui/lib/pki/addon/routes/roles/role/details.js
index a1ac0a95bcf6..eabe10072cd9 100644
--- a/ui/lib/pki/addon/routes/roles/role/details.js
+++ b/ui/lib/pki/addon/routes/roles/role/details.js
@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class RolesRoleDetailsRoute extends Route {}
+export default class PkiRoleDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/role/edit.js b/ui/lib/pki/addon/routes/roles/role/edit.js
index 5f192cc684ed..b6a9f2101264 100644
--- a/ui/lib/pki/addon/routes/roles/role/edit.js
+++ b/ui/lib/pki/addon/routes/roles/role/edit.js
@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class RolesRoleEditRoute extends Route {}
+export default class PkiRoleEditRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/role/generate.js b/ui/lib/pki/addon/routes/roles/role/generate.js
new file mode 100644
index 000000000000..7d8db3b836ed
--- /dev/null
+++ b/ui/lib/pki/addon/routes/roles/role/generate.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiRoleGenerateRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/roles/role/sign.js b/ui/lib/pki/addon/routes/roles/role/sign.js
new file mode 100644
index 000000000000..7db7059c6ae9
--- /dev/null
+++ b/ui/lib/pki/addon/routes/roles/role/sign.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiRoleSignRoute extends Route {}
diff --git a/ui/lib/pki/addon/templates/roles/role/generate.hbs b/ui/lib/pki/addon/templates/roles/role/generate.hbs
new file mode 100644
index 000000000000..57ff919f55e2
--- /dev/null
+++ b/ui/lib/pki/addon/templates/roles/role/generate.hbs
@@ -0,0 +1 @@
+route: roles.role.generate
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/roles/role/sign.hbs b/ui/lib/pki/addon/templates/roles/role/sign.hbs
new file mode 100644
index 000000000000..8b6bc4f56565
--- /dev/null
+++ b/ui/lib/pki/addon/templates/roles/role/sign.hbs
@@ -0,0 +1 @@
+route: roles.role.sign
\ No newline at end of file

From 4f20c2a202e2e7d1367cd015cc228c93df8709b8 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 14:59:14 -0800
Subject: [PATCH 04/10] add issuer/generate- routes

---
 ui/lib/pki/addon/routes.js                                   | 2 ++
 ui/lib/pki/addon/routes/issuers/generate-intermediate.js     | 3 +++
 ui/lib/pki/addon/routes/issuers/generate-root.js             | 3 +++
 ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs | 0
 ui/lib/pki/addon/templates/issuers/generate-root.hbs         | 0
 5 files changed, 8 insertions(+)
 create mode 100644 ui/lib/pki/addon/routes/issuers/generate-intermediate.js
 create mode 100644 ui/lib/pki/addon/routes/issuers/generate-root.js
 create mode 100644 ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
 create mode 100644 ui/lib/pki/addon/templates/issuers/generate-root.hbs

diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index 80680bdf936b..6780ef46006a 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -21,6 +21,8 @@ export default buildRoutes(function () {
   });
   this.route('issuers', function () {
     this.route('index', { path: '/' });
+    this.route('generate-root');
+    this.route('generate-intermediate');
     this.route('issuer', { path: '/:issuer_ref' }, function () {
       this.route('details');
       this.route('edit');
diff --git a/ui/lib/pki/addon/routes/issuers/generate-intermediate.js b/ui/lib/pki/addon/routes/issuers/generate-intermediate.js
new file mode 100644
index 000000000000..28b45943e217
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/generate-intermediate.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuersGenerateIntermediateRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/issuers/generate-root.js b/ui/lib/pki/addon/routes/issuers/generate-root.js
new file mode 100644
index 000000000000..6f96fa2bcaf1
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/generate-root.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuersGenerateRootRoute extends Route {}
diff --git a/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs b/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/ui/lib/pki/addon/templates/issuers/generate-root.hbs b/ui/lib/pki/addon/templates/issuers/generate-root.hbs
new file mode 100644
index 000000000000..e69de29bb2d1

From ece7ac94638f97e431dabd996bfc9922ca6f01f0 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 15:03:26 -0800
Subject: [PATCH 05/10] update key routes

---
 ui/lib/pki/addon/routes.js                  | 4 ++--
 ui/lib/pki/addon/routes/keys/create.js      | 3 +++
 ui/lib/pki/addon/routes/keys/generate.js    | 3 ---
 ui/lib/pki/addon/routes/keys/key/details.js | 2 +-
 ui/lib/pki/addon/routes/keys/key/edit.js    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/keys/create.js
 delete mode 100644 ui/lib/pki/addon/routes/keys/generate.js

diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index 6780ef46006a..1fb3438c166e 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -40,9 +40,9 @@ export default buildRoutes(function () {
   });
   this.route('keys', function () {
     this.route('index', { path: '/' });
-    this.route('generate');
+    this.route('create');
     this.route('import');
-    this.route('key', { path: '/:id' }, function () {
+    this.route('key', { path: '/:name' }, function () {
       this.route('details');
       this.route('edit');
     });
diff --git a/ui/lib/pki/addon/routes/keys/create.js b/ui/lib/pki/addon/routes/keys/create.js
new file mode 100644
index 000000000000..a33164a73668
--- /dev/null
+++ b/ui/lib/pki/addon/routes/keys/create.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiKeysCreateRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/keys/generate.js b/ui/lib/pki/addon/routes/keys/generate.js
deleted file mode 100644
index 2163b11d44f6..000000000000
--- a/ui/lib/pki/addon/routes/keys/generate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class PkiKeysGenerateRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/keys/key/details.js b/ui/lib/pki/addon/routes/keys/key/details.js
index dc016101b428..40c1d6773e1e 100644
--- a/ui/lib/pki/addon/routes/keys/key/details.js
+++ b/ui/lib/pki/addon/routes/keys/key/details.js
@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class PkiKeysKeyDetailsRoute extends Route {}
+export default class PkiKeyDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/keys/key/edit.js b/ui/lib/pki/addon/routes/keys/key/edit.js
index 39aced1c8bb4..8ad970c5638a 100644
--- a/ui/lib/pki/addon/routes/keys/key/edit.js
+++ b/ui/lib/pki/addon/routes/keys/key/edit.js
@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class PkiKeysKeyEditRoute extends Route {}
+export default class PkiKeyEditRoute extends Route {}

From 4ab8793807f7fae37431fe5a3bb48c78a6487cc6 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 15:08:48 -0800
Subject: [PATCH 06/10] refactor cert routes;

---
 ui/lib/pki/addon/routes.js                                   | 5 ++---
 ui/lib/pki/addon/routes/certificates/certificate/details.js  | 3 +++
 ui/lib/pki/addon/routes/certificates/index.js                | 4 ++--
 .../pki/addon/templates/certificates/certificate/details.hbs | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/certificates/certificate/details.js
 create mode 100644 ui/lib/pki/addon/templates/certificates/certificate/details.hbs

diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index 1fb3438c166e..5ac834404ed2 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -32,8 +32,7 @@ export default buildRoutes(function () {
   });
   this.route('certificates', function () {
     this.route('index', { path: '/' });
-    this.route('create');
-    this.route('certificate', { path: '/:id' }, function () {
+    this.route('certificate', { path: '/:serial' }, function () {
       this.route('details');
       this.route('edit');
     });
@@ -42,7 +41,7 @@ export default buildRoutes(function () {
     this.route('index', { path: '/' });
     this.route('create');
     this.route('import');
-    this.route('key', { path: '/:name' }, function () {
+    this.route('key', { path: '/:key_ref' }, function () {
       this.route('details');
       this.route('edit');
     });
diff --git a/ui/lib/pki/addon/routes/certificates/certificate/details.js b/ui/lib/pki/addon/routes/certificates/certificate/details.js
new file mode 100644
index 000000000000..a0bec30d0359
--- /dev/null
+++ b/ui/lib/pki/addon/routes/certificates/certificate/details.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiCertificateDetailsRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/certificates/index.js b/ui/lib/pki/addon/routes/certificates/index.js
index 71b4fac767e9..91d9a94c71b5 100644
--- a/ui/lib/pki/addon/routes/certificates/index.js
+++ b/ui/lib/pki/addon/routes/certificates/index.js
@@ -8,12 +8,12 @@ export default class PkiCertificatesIndexRoute extends Route {
 
   beforeModel() {
     // Must call this promise before the model hook otherwise it doesn't add OpenApi to record.
-    return this.pathHelp.getNewModel('pki/pki-certificate-engine', 'pki');
+    return this.pathHelp.getNewModel('pki/certificate', 'pki');
   }
 
   model() {
     return this.store
-      .query('pki/pki-certificate-engine', { backend: this.secretMountPath.currentPath })
+      .query('pki/certificate', { backend: this.secretMountPath.currentPath })
       .then((certificateModel) => {
         return { certificateModel, parentModel: this.modelFor('certificates') };
       })
diff --git a/ui/lib/pki/addon/templates/certificates/certificate/details.hbs b/ui/lib/pki/addon/templates/certificates/certificate/details.hbs
new file mode 100644
index 000000000000..2ac0cad72c89
--- /dev/null
+++ b/ui/lib/pki/addon/templates/certificates/certificate/details.hbs
@@ -0,0 +1 @@
+route: certificate.details
\ No newline at end of file

From 3f246925867d85c94a0e1236ad44d9e8117deaa3 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 15:20:13 -0800
Subject: [PATCH 07/10] template cleanup, update routes

---
 ui/lib/pki/addon/routes.js                                | 3 +--
 ui/lib/pki/addon/routes/issuers/import.js                 | 3 +++
 ui/lib/pki/addon/routes/keys/index.js                     | 4 ++--
 ui/lib/pki/addon/templates/certificates/index.hbs         | 2 +-
 .../pki/addon/templates/issuers/generate-intermediate.hbs | 1 +
 ui/lib/pki/addon/templates/issuers/generate-root.hbs      | 1 +
 ui/lib/pki/addon/templates/issuers/import.hbs             | 2 ++
 ui/lib/pki/addon/templates/issuers/index.hbs              | 8 ++++----
 .../pki/addon/templates/keys/{generate.hbs => create.hbs} | 0
 ui/lib/pki/addon/templates/keys/index.hbs                 | 4 ++--
 10 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 ui/lib/pki/addon/routes/issuers/import.js
 create mode 100644 ui/lib/pki/addon/templates/issuers/import.hbs
 rename ui/lib/pki/addon/templates/keys/{generate.hbs => create.hbs} (100%)

diff --git a/ui/lib/pki/addon/routes.js b/ui/lib/pki/addon/routes.js
index 5ac834404ed2..568a4ce7e79d 100644
--- a/ui/lib/pki/addon/routes.js
+++ b/ui/lib/pki/addon/routes.js
@@ -4,8 +4,6 @@ export default buildRoutes(function () {
   this.route('overview');
   this.route('configuration', function () {
     this.route('tidy');
-    this.route('generate');
-    this.route('import');
     this.route('create');
     this.route('edit');
   });
@@ -21,6 +19,7 @@ export default buildRoutes(function () {
   });
   this.route('issuers', function () {
     this.route('index', { path: '/' });
+    this.route('import');
     this.route('generate-root');
     this.route('generate-intermediate');
     this.route('issuer', { path: '/:issuer_ref' }, function () {
diff --git a/ui/lib/pki/addon/routes/issuers/import.js b/ui/lib/pki/addon/routes/issuers/import.js
new file mode 100644
index 000000000000..6e2cd2751796
--- /dev/null
+++ b/ui/lib/pki/addon/routes/issuers/import.js
@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class PkiIssuersImportRoute extends Route {}
diff --git a/ui/lib/pki/addon/routes/keys/index.js b/ui/lib/pki/addon/routes/keys/index.js
index 18b453c0abbf..3234b3a0e13f 100644
--- a/ui/lib/pki/addon/routes/keys/index.js
+++ b/ui/lib/pki/addon/routes/keys/index.js
@@ -8,12 +8,12 @@ export default class PkiKeysIndexRoute extends Route {
 
   beforeModel() {
     // Must call this promise before the model hook otherwise it doesn't add OpenApi to record.
-    return this.pathHelp.getNewModel('pki/pki-key-engine', 'pki');
+    return this.pathHelp.getNewModel('pki/key', 'pki');
   }
 
   model() {
     return this.store
-      .query('pki/pki-key-engine', { backend: this.secretMountPath.currentPath })
+      .query('pki/key', { backend: this.secretMountPath.currentPath })
       .then((keyModel) => {
         return { keyModel, parentModel: this.modelFor('keys') };
       })
diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs
index a6b0cec939d2..f5fda06b2242 100644
--- a/ui/lib/pki/addon/templates/certificates/index.hbs
+++ b/ui/lib/pki/addon/templates/certificates/index.hbs
@@ -55,7 +55,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn't yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create.index" @model={{this.model.certificateModel}}>
+    <LinkTo @route="configuration.create" @model={{this.model.certificateModel}}>
       {{! ARG TODO if configuration of engine not setup then direct toward setting that up otherwise replace with new design language }}
     </LinkTo>
   </EmptyState>
diff --git a/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs b/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
index e69de29bb2d1..9f8e9fd6c9e8 100644
--- a/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
+++ b/ui/lib/pki/addon/templates/issuers/generate-intermediate.hbs
@@ -0,0 +1 @@
+route: issuers.generate-intermediate
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/generate-root.hbs b/ui/lib/pki/addon/templates/issuers/generate-root.hbs
index e69de29bb2d1..a26a27ca674c 100644
--- a/ui/lib/pki/addon/templates/issuers/generate-root.hbs
+++ b/ui/lib/pki/addon/templates/issuers/generate-root.hbs
@@ -0,0 +1 @@
+route: issuers.generate-root
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/import.hbs b/ui/lib/pki/addon/templates/issuers/import.hbs
new file mode 100644
index 000000000000..829143eed48b
--- /dev/null
+++ b/ui/lib/pki/addon/templates/issuers/import.hbs
@@ -0,0 +1,2 @@
+{{! https://github.com/hashicorp/vault/blob/main/website/content/api-docs/secret/pki.mdx#import-ca-certificates-and-keys }}
+route: issuers.import POST /pki/issuers/import/bundle POST /pki/issuers/import/cert
\ No newline at end of file
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
index f10803d107e9..ca2dc23807c4 100644
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ b/ui/lib/pki/addon/templates/issuers/index.hbs
@@ -10,7 +10,7 @@
 />
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink @route="configuration.import">
+    <ToolbarLink @route="issuers.import">
       Import
     </ToolbarLink>
     <BasicDropdown @class="popup-menu" @horizontalPosition="auto-right" @verticalPosition="below" as |D|>
@@ -22,12 +22,12 @@
         <nav class="box menu" aria-label="generate options">
           <ul class="menu-list">
             <li class="action">
-              <LinkTo @route="configuration.generate" {{on "click" (fn this.onLinkClick D)}}>
+              <LinkTo @route="issuers.generate-root" {{on "click" (fn this.onLinkClick D)}}>
                 Root
               </LinkTo>
             </li>
             <li class="action">
-              <LinkTo @route="configuration.generate" {{on "click" (fn this.onLinkClick D)}}>
+              <LinkTo @route="issuers.generate-intermediate" {{on "click" (fn this.onLinkClick D)}}>
                 Intermediate CSR
               </LinkTo>
             </li>
@@ -82,7 +82,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create.index" @model={{this.model.issuersModel}}>
+    <LinkTo @route="configuration.create" @model={{this.model.issuersModel}}>
       Configure PKI
     </LinkTo>
   </EmptyState>
diff --git a/ui/lib/pki/addon/templates/keys/generate.hbs b/ui/lib/pki/addon/templates/keys/create.hbs
similarity index 100%
rename from ui/lib/pki/addon/templates/keys/generate.hbs
rename to ui/lib/pki/addon/templates/keys/create.hbs
diff --git a/ui/lib/pki/addon/templates/keys/index.hbs b/ui/lib/pki/addon/templates/keys/index.hbs
index 8cf40fbee363..e91b411c2964 100644
--- a/ui/lib/pki/addon/templates/keys/index.hbs
+++ b/ui/lib/pki/addon/templates/keys/index.hbs
@@ -13,7 +13,7 @@
     <ToolbarLink @route="keys.import" @type="download">
       Import
     </ToolbarLink>
-    <ToolbarLink @route="keys.generate" @type="add">
+    <ToolbarLink @route="keys.create" @type="add">
       Generate
     </ToolbarLink>
   </ToolbarActions>
@@ -63,7 +63,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create.index" @model={{this.model.keyModel}}>
+    <LinkTo @route="configuration.create" @model={{this.model.keyModel}}>
       ARG TODO waiting for language from design
     </LinkTo>
   </EmptyState>

From 7798623ebd3e6e75d0d43712eb3db80470403443 Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Wed, 16 Nov 2022 15:30:06 -0800
Subject: [PATCH 08/10] update component names with pki-

---
 .../{key-parameters.hbs => pki-key-parameters.hbs}        | 0
 .../{key-parameters.js => pki-key-parameters.js}          | 8 ++++----
 .../addon/components/{key-usage.hbs => pki-key-usage.hbs} | 0
 .../addon/components/{key-usage.ts => pki-key-usage.ts}   | 0
 .../addon/components/{role-form.hbs => pki-role-form.hbs} | 4 ++--
 .../addon/components/{role-form.js => pki-role-form.js}   | 8 ++++----
 ui/lib/pki/addon/templates/certificates/index.hbs         | 2 +-
 ui/lib/pki/addon/templates/issuers/index.hbs              | 2 +-
 ui/lib/pki/addon/templates/keys/index.hbs                 | 2 +-
 ui/lib/pki/addon/templates/roles/create.hbs               | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename ui/lib/pki/addon/components/{key-parameters.hbs => pki-key-parameters.hbs} (100%)
 rename ui/lib/pki/addon/components/{key-parameters.js => pki-key-parameters.js} (80%)
 rename ui/lib/pki/addon/components/{key-usage.hbs => pki-key-usage.hbs} (100%)
 rename ui/lib/pki/addon/components/{key-usage.ts => pki-key-usage.ts} (100%)
 rename ui/lib/pki/addon/components/{role-form.hbs => pki-role-form.hbs} (97%)
 rename ui/lib/pki/addon/components/{role-form.js => pki-role-form.js} (89%)

diff --git a/ui/lib/pki/addon/components/key-parameters.hbs b/ui/lib/pki/addon/components/pki-key-parameters.hbs
similarity index 100%
rename from ui/lib/pki/addon/components/key-parameters.hbs
rename to ui/lib/pki/addon/components/pki-key-parameters.hbs
diff --git a/ui/lib/pki/addon/components/key-parameters.js b/ui/lib/pki/addon/components/pki-key-parameters.js
similarity index 80%
rename from ui/lib/pki/addon/components/key-parameters.js
rename to ui/lib/pki/addon/components/pki-key-parameters.js
index 7f0e1946b379..cbc201fb15dc 100644
--- a/ui/lib/pki/addon/components/key-parameters.js
+++ b/ui/lib/pki/addon/components/pki-key-parameters.js
@@ -2,12 +2,12 @@ import Component from '@glimmer/component';
 import { action } from '@ember/object';
 
 /**
- * @module KeyParameters
- * KeyParameters components are used to set the default and update the key_bits pki role api param whenever the key_type changes.
+ * @module PkiKeyParameters
+ * PkiKeyParameters components are used to set the default and update the key_bits pki role api param whenever the key_type changes.
  * key_bits is conditional on key_type and should be set as a default value whenever key_type changes.
  * @example
  * ```js
- * <KeyParameters @model={@model} @group={group}/>
+ * <PkiKeyParameters @model={@model} @group={group}/>
  * ```
  * @param {class} model - The pki/role model.
  * @param {string} group - The name of the group created in the model. In this case, it's the "Key parameters" group.
@@ -20,7 +20,7 @@ const KEY_BITS_OPTIONS = {
   any: [0],
 };
 
-export default class KeyParameters extends Component {
+export default class PkiKeyParameters extends Component {
   get keyBitOptions() {
     return KEY_BITS_OPTIONS[this.args.model.keyType];
   }
diff --git a/ui/lib/pki/addon/components/key-usage.hbs b/ui/lib/pki/addon/components/pki-key-usage.hbs
similarity index 100%
rename from ui/lib/pki/addon/components/key-usage.hbs
rename to ui/lib/pki/addon/components/pki-key-usage.hbs
diff --git a/ui/lib/pki/addon/components/key-usage.ts b/ui/lib/pki/addon/components/pki-key-usage.ts
similarity index 100%
rename from ui/lib/pki/addon/components/key-usage.ts
rename to ui/lib/pki/addon/components/pki-key-usage.ts
diff --git a/ui/lib/pki/addon/components/role-form.hbs b/ui/lib/pki/addon/components/pki-role-form.hbs
similarity index 97%
rename from ui/lib/pki/addon/components/role-form.hbs
rename to ui/lib/pki/addon/components/pki-role-form.hbs
index e4c145daf5bf..a72f26d670d8 100644
--- a/ui/lib/pki/addon/components/role-form.hbs
+++ b/ui/lib/pki/addon/components/pki-role-form.hbs
@@ -47,9 +47,9 @@
             </FormField>
           {{/each}}
         {{else if (eq group "Key usage")}}
-          <KeyUsage @model={{@model}} @group={{group}} />
+          <PkiKeyUsage @model={{@model}} @group={{group}} />
         {{else if (eq group "Key parameters")}}
-          <KeyParameters @model={{@model}} @group={{group}} />
+          <PkiKeyParameters @model={{@model}} @group={{group}} />
         {{else}}
           {{! Groups hidden behind Toggles }}
           {{#let (camelize (concat "show" group)) as |prop|}}
diff --git a/ui/lib/pki/addon/components/role-form.js b/ui/lib/pki/addon/components/pki-role-form.js
similarity index 89%
rename from ui/lib/pki/addon/components/role-form.js
rename to ui/lib/pki/addon/components/pki-role-form.js
index bd58a7d698fb..9e138fabe281 100644
--- a/ui/lib/pki/addon/components/role-form.js
+++ b/ui/lib/pki/addon/components/pki-role-form.js
@@ -5,12 +5,12 @@ import { task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
 
 /**
- * @module RoleForm
- * RoleForm components are used to create and update PKI roles.
+ * @module PkiRoleForm
+ * PkiRoleForm components are used to create and update PKI roles.
  *
  * @example
  * ```js
- * <RoleForm @model={{this.model}}/>
+ * <PkiRoleForm @model={{this.model}}/>
  * ```
  * @callback onCancel
  * @callback onSave
@@ -19,7 +19,7 @@ import { tracked } from '@glimmer/tracking';
  * @param {onSave} onSave - Callback triggered on save success.
  */
 
-export default class RoleForm extends Component {
+export default class PkiRoleForm extends Component {
   @service store;
   @service flashMessages;
 
diff --git a/ui/lib/pki/addon/templates/certificates/index.hbs b/ui/lib/pki/addon/templates/certificates/index.hbs
index f5fda06b2242..4e5a17bfee39 100644
--- a/ui/lib/pki/addon/templates/certificates/index.hbs
+++ b/ui/lib/pki/addon/templates/certificates/index.hbs
@@ -55,7 +55,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn't yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create" @model={{this.model.certificateModel}}>
+    <LinkTo @route="configuration.create">
       {{! ARG TODO if configuration of engine not setup then direct toward setting that up otherwise replace with new design language }}
     </LinkTo>
   </EmptyState>
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
index ca2dc23807c4..099ed80f4ef0 100644
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ b/ui/lib/pki/addon/templates/issuers/index.hbs
@@ -82,7 +82,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create" @model={{this.model.issuersModel}}>
+    <LinkTo @route="configuration.create">
       Configure PKI
     </LinkTo>
   </EmptyState>
diff --git a/ui/lib/pki/addon/templates/keys/index.hbs b/ui/lib/pki/addon/templates/keys/index.hbs
index e91b411c2964..32b609f03426 100644
--- a/ui/lib/pki/addon/templates/keys/index.hbs
+++ b/ui/lib/pki/addon/templates/keys/index.hbs
@@ -63,7 +63,7 @@
   {{/each}}
 {{else}}
   <EmptyState @title="PKI not configured" @message="This PKI mount hasn’t yet been configured with a certificate issuer.">
-    <LinkTo @route="configuration.create" @model={{this.model.keyModel}}>
+    <LinkTo @route="configuration.create">
       ARG TODO waiting for language from design
     </LinkTo>
   </EmptyState>
diff --git a/ui/lib/pki/addon/templates/roles/create.hbs b/ui/lib/pki/addon/templates/roles/create.hbs
index 748bbcf24d82..6f6978786e81 100644
--- a/ui/lib/pki/addon/templates/roles/create.hbs
+++ b/ui/lib/pki/addon/templates/roles/create.hbs
@@ -1,4 +1,4 @@
-<RoleForm
+<PkiRoleForm
   @model={{this.model}}
   @onCancel={{transition-to "vault.cluster.secrets.backend.pki.roles.index"}}
   @onSave={{transition-to "vault.cluster.secrets.backend.pki.roles.role.details" this.model.id}}

From a50ce9dded768d0c7629a56e63748e5ba826a45b Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Thu, 17 Nov 2022 14:49:45 -0800
Subject: [PATCH 09/10] update components in test files

---
 .../{key-parameters-test.js => pki-key-parameters-test.js}  | 6 +++---
 .../pki/{key-usage-test.js => pki-key-usage-test.js}        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ui/tests/integration/components/pki/{key-parameters-test.js => pki-key-parameters-test.js} (96%)
 rename ui/tests/integration/components/pki/{key-usage-test.js => pki-key-usage-test.js} (95%)

diff --git a/ui/tests/integration/components/pki/key-parameters-test.js b/ui/tests/integration/components/pki/pki-key-parameters-test.js
similarity index 96%
rename from ui/tests/integration/components/pki/key-parameters-test.js
rename to ui/tests/integration/components/pki/pki-key-parameters-test.js
index e7dc8b4fe25b..43fc27bbc0bd 100644
--- a/ui/tests/integration/components/pki/key-parameters-test.js
+++ b/ui/tests/integration/components/pki/pki-key-parameters-test.js
@@ -5,7 +5,7 @@ import { hbs } from 'ember-cli-htmlbars';
 import { setupEngine } from 'ember-engines/test-support';
 import { SELECTORS } from 'vault/tests/helpers/pki-engine';
 
-module('Integration | Component | pki/key-parameters', function (hooks) {
+module('Integration | Component | pki-key-parameters', function (hooks) {
   setupRenderingTest(hooks);
   setupEngine(hooks, 'pki');
 
@@ -20,7 +20,7 @@ module('Integration | Component | pki/key-parameters', function (hooks) {
     await render(
       hbs`
       <div class="has-top-margin-xxl">
-        <KeyParameters
+        <PkiKeyParameters
           @model={{this.model}}
           @group="Key parameters"
         />
@@ -39,7 +39,7 @@ module('Integration | Component | pki/key-parameters', function (hooks) {
     await render(
       hbs`
       <div class="has-top-margin-xxl">
-        <KeyParameters
+        <PkiKeyParameters
           @model={{this.model}}
           @group="Key parameters"
         />
diff --git a/ui/tests/integration/components/pki/key-usage-test.js b/ui/tests/integration/components/pki/pki-key-usage-test.js
similarity index 95%
rename from ui/tests/integration/components/pki/key-usage-test.js
rename to ui/tests/integration/components/pki/pki-key-usage-test.js
index 31dfd03519f7..c4b9b9ca82c5 100644
--- a/ui/tests/integration/components/pki/key-usage-test.js
+++ b/ui/tests/integration/components/pki/pki-key-usage-test.js
@@ -5,7 +5,7 @@ import { hbs } from 'ember-cli-htmlbars';
 import { setupEngine } from 'ember-engines/test-support';
 import { SELECTORS } from 'vault/tests/helpers/pki-engine';
 
-module('Integration | Component | pki/key-usage', function (hooks) {
+module('Integration | Component | pki-key-usage', function (hooks) {
   setupRenderingTest(hooks);
   setupEngine(hooks, 'pki');
 
@@ -20,7 +20,7 @@ module('Integration | Component | pki/key-usage', function (hooks) {
     await render(
       hbs`
       <div class="has-top-margin-xxl">
-        <KeyUsage
+        <PkiKeyUsage
           @model={{this.model}}
           @group="Key usage"
         />
@@ -50,7 +50,7 @@ module('Integration | Component | pki/key-usage', function (hooks) {
     await render(
       hbs`
       <div class="has-top-margin-xxl">
-        <KeyUsage
+        <PkiKeyUsage
           @model={{this.model}}
           @group="Key usage"
         />

From 21069752d2ad1491d1cb84e5ed6ebfc5974fdd7a Mon Sep 17 00:00:00 2001
From: "clairebontempo@gmail.com" <clairebontempo@gmail.com>
Date: Thu, 17 Nov 2022 16:36:51 -0800
Subject: [PATCH 10/10] rename role form test

---
 .../pki/{role-form-test.js => pki-role-form-test.js}        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename ui/tests/integration/components/pki/{role-form-test.js => pki-role-form-test.js} (97%)

diff --git a/ui/tests/integration/components/pki/role-form-test.js b/ui/tests/integration/components/pki/pki-role-form-test.js
similarity index 97%
rename from ui/tests/integration/components/pki/role-form-test.js
rename to ui/tests/integration/components/pki/pki-role-form-test.js
index 060f3f5235a6..d15eb1a359ce 100644
--- a/ui/tests/integration/components/pki/role-form-test.js
+++ b/ui/tests/integration/components/pki/pki-role-form-test.js
@@ -6,7 +6,7 @@ import { setupEngine } from 'ember-engines/test-support';
 import { SELECTORS } from 'vault/tests/helpers/pki-engine';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 
-module('Integration | Component | pki/role-form', function (hooks) {
+module('Integration | Component | pki-role-form', function (hooks) {
   setupRenderingTest(hooks);
   setupMirage(hooks);
   setupEngine(hooks, 'pki'); // https://github.com/ember-engines/ember-engines/pull/653
@@ -21,7 +21,7 @@ module('Integration | Component | pki/role-form', function (hooks) {
     assert.expect(13);
     await render(
       hbs`
-      <RoleForm
+      <PkiRoleForm
          @model={{this.model}}
          @onCancel={{this.onCancel}}
          @onSave={{this.onSave}}
@@ -72,7 +72,7 @@ module('Integration | Component | pki/role-form', function (hooks) {
 
     await render(
       hbs`
-      <RoleForm
+      <PkiRoleForm
          @model={{this.model}}
          @onCancel={{this.onCancel}}
          @onSave={{this.onSave}}