From 68868e44bc461c4e230a052bd48764cf0e6abee5 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Nov 2020 11:47:51 -0500 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20port=20mirage=20mock?= =?UTF-8?q?s=20into=20api=20addon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/README.md | 9 +++++++++ {ui/admin => addons/api}/mirage/config.js | 0 {ui/admin => addons/api}/mirage/factories/account.js | 0 {ui/admin => addons/api}/mirage/factories/auth-method.js | 0 {ui/admin => addons/api}/mirage/factories/group.js | 0 .../api}/mirage/factories/host-catalog.js | 0 {ui/admin => addons/api}/mirage/factories/host-set.js | 0 {ui/admin => addons/api}/mirage/factories/host.js | 0 {ui/admin => addons/api}/mirage/factories/role.js | 0 {ui/admin => addons/api}/mirage/factories/scope.js | 0 {ui/admin => addons/api}/mirage/factories/session.js | 0 {ui/admin => addons/api}/mirage/factories/target.js | 0 {ui/admin => addons/api}/mirage/factories/user.js | 0 .../api}/mirage/generated/factories/account.js | 0 .../api}/mirage/generated/factories/auth-method.js | 0 .../api}/mirage/generated/factories/group.js | 0 .../api}/mirage/generated/factories/host-catalog.js | 0 .../api}/mirage/generated/factories/host-set.js | 0 .../api}/mirage/generated/factories/host.js | 0 .../api}/mirage/generated/factories/org.js | 0 .../api}/mirage/generated/factories/project.js | 0 .../api}/mirage/generated/factories/role.js | 0 .../api}/mirage/generated/factories/scope.js | 0 .../api}/mirage/generated/factories/session.js | 0 .../api}/mirage/generated/factories/target.js | 0 .../api}/mirage/generated/factories/user.js | 0 {ui/admin => addons/api}/mirage/models/account.js | 0 {ui/admin => addons/api}/mirage/models/auth-method.js | 0 {ui/admin => addons/api}/mirage/models/group.js | 0 {ui/admin => addons/api}/mirage/models/host-catalog.js | 0 {ui/admin => addons/api}/mirage/models/host-set.js | 0 {ui/admin => addons/api}/mirage/models/host.js | 0 {ui/admin => addons/api}/mirage/models/role.js | 0 {ui/admin => addons/api}/mirage/models/session.js | 0 {ui/admin => addons/api}/mirage/models/target.js | 0 {ui/admin => addons/api}/mirage/models/user.js | 0 {ui/admin => addons/api}/mirage/route-handlers/auth.js | 0 {ui/admin => addons/api}/mirage/scenarios/default.js | 0 {ui/admin => addons/api}/mirage/serializers/account.js | 0 .../api}/mirage/serializers/application.js | 0 .../api}/mirage/serializers/auth-method.js | 0 {ui/admin => addons/api}/mirage/serializers/group.js | 0 .../api}/mirage/serializers/host-catalog.js | 0 {ui/admin => addons/api}/mirage/serializers/host-set.js | 0 {ui/admin => addons/api}/mirage/serializers/host.js | 0 {ui/admin => addons/api}/mirage/serializers/role.js | 0 {ui/admin => addons/api}/mirage/serializers/scope.js | 0 {ui/admin => addons/api}/mirage/serializers/session.js | 0 {ui/admin => addons/api}/mirage/serializers/target.js | 0 {ui/admin => addons/api}/mirage/serializers/user.js | 0 ui/admin/config/environment.js | 4 ++++ 51 files changed, 13 insertions(+) rename {ui/admin => addons/api}/mirage/config.js (100%) rename {ui/admin => addons/api}/mirage/factories/account.js (100%) rename {ui/admin => addons/api}/mirage/factories/auth-method.js (100%) rename {ui/admin => addons/api}/mirage/factories/group.js (100%) rename {ui/admin => addons/api}/mirage/factories/host-catalog.js (100%) rename {ui/admin => addons/api}/mirage/factories/host-set.js (100%) rename {ui/admin => addons/api}/mirage/factories/host.js (100%) rename {ui/admin => addons/api}/mirage/factories/role.js (100%) rename {ui/admin => addons/api}/mirage/factories/scope.js (100%) rename {ui/admin => addons/api}/mirage/factories/session.js (100%) rename {ui/admin => addons/api}/mirage/factories/target.js (100%) rename {ui/admin => addons/api}/mirage/factories/user.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/account.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/auth-method.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/group.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/host-catalog.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/host-set.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/host.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/org.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/project.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/role.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/scope.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/session.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/target.js (100%) rename {ui/admin => addons/api}/mirage/generated/factories/user.js (100%) rename {ui/admin => addons/api}/mirage/models/account.js (100%) rename {ui/admin => addons/api}/mirage/models/auth-method.js (100%) rename {ui/admin => addons/api}/mirage/models/group.js (100%) rename {ui/admin => addons/api}/mirage/models/host-catalog.js (100%) rename {ui/admin => addons/api}/mirage/models/host-set.js (100%) rename {ui/admin => addons/api}/mirage/models/host.js (100%) rename {ui/admin => addons/api}/mirage/models/role.js (100%) rename {ui/admin => addons/api}/mirage/models/session.js (100%) rename {ui/admin => addons/api}/mirage/models/target.js (100%) rename {ui/admin => addons/api}/mirage/models/user.js (100%) rename {ui/admin => addons/api}/mirage/route-handlers/auth.js (100%) rename {ui/admin => addons/api}/mirage/scenarios/default.js (100%) rename {ui/admin => addons/api}/mirage/serializers/account.js (100%) rename {ui/admin => addons/api}/mirage/serializers/application.js (100%) rename {ui/admin => addons/api}/mirage/serializers/auth-method.js (100%) rename {ui/admin => addons/api}/mirage/serializers/group.js (100%) rename {ui/admin => addons/api}/mirage/serializers/host-catalog.js (100%) rename {ui/admin => addons/api}/mirage/serializers/host-set.js (100%) rename {ui/admin => addons/api}/mirage/serializers/host.js (100%) rename {ui/admin => addons/api}/mirage/serializers/role.js (100%) rename {ui/admin => addons/api}/mirage/serializers/scope.js (100%) rename {ui/admin => addons/api}/mirage/serializers/session.js (100%) rename {ui/admin => addons/api}/mirage/serializers/target.js (100%) rename {ui/admin => addons/api}/mirage/serializers/user.js (100%) diff --git a/addons/api/README.md b/addons/api/README.md index d0c3f3b2e..66ee38911 100644 --- a/addons/api/README.md +++ b/addons/api/README.md @@ -23,6 +23,15 @@ This addon contains the API data access layer for Boundary. Add this addon to an Ember application's `devDependencies` as: `"api": "*"`, for applications included in this monorepo. +Since this addon also includes Mirage mocks, be sure to install +`ember-cli-mirage` and add the following config to your UI project: + +```js +'ember-cli-mirage': { + directory: '../../addons/api/mirage' +} +``` + ## Installation See monorepo README for installation instructions. diff --git a/ui/admin/mirage/config.js b/addons/api/mirage/config.js similarity index 100% rename from ui/admin/mirage/config.js rename to addons/api/mirage/config.js diff --git a/ui/admin/mirage/factories/account.js b/addons/api/mirage/factories/account.js similarity index 100% rename from ui/admin/mirage/factories/account.js rename to addons/api/mirage/factories/account.js diff --git a/ui/admin/mirage/factories/auth-method.js b/addons/api/mirage/factories/auth-method.js similarity index 100% rename from ui/admin/mirage/factories/auth-method.js rename to addons/api/mirage/factories/auth-method.js diff --git a/ui/admin/mirage/factories/group.js b/addons/api/mirage/factories/group.js similarity index 100% rename from ui/admin/mirage/factories/group.js rename to addons/api/mirage/factories/group.js diff --git a/ui/admin/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js similarity index 100% rename from ui/admin/mirage/factories/host-catalog.js rename to addons/api/mirage/factories/host-catalog.js diff --git a/ui/admin/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js similarity index 100% rename from ui/admin/mirage/factories/host-set.js rename to addons/api/mirage/factories/host-set.js diff --git a/ui/admin/mirage/factories/host.js b/addons/api/mirage/factories/host.js similarity index 100% rename from ui/admin/mirage/factories/host.js rename to addons/api/mirage/factories/host.js diff --git a/ui/admin/mirage/factories/role.js b/addons/api/mirage/factories/role.js similarity index 100% rename from ui/admin/mirage/factories/role.js rename to addons/api/mirage/factories/role.js diff --git a/ui/admin/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js similarity index 100% rename from ui/admin/mirage/factories/scope.js rename to addons/api/mirage/factories/scope.js diff --git a/ui/admin/mirage/factories/session.js b/addons/api/mirage/factories/session.js similarity index 100% rename from ui/admin/mirage/factories/session.js rename to addons/api/mirage/factories/session.js diff --git a/ui/admin/mirage/factories/target.js b/addons/api/mirage/factories/target.js similarity index 100% rename from ui/admin/mirage/factories/target.js rename to addons/api/mirage/factories/target.js diff --git a/ui/admin/mirage/factories/user.js b/addons/api/mirage/factories/user.js similarity index 100% rename from ui/admin/mirage/factories/user.js rename to addons/api/mirage/factories/user.js diff --git a/ui/admin/mirage/generated/factories/account.js b/addons/api/mirage/generated/factories/account.js similarity index 100% rename from ui/admin/mirage/generated/factories/account.js rename to addons/api/mirage/generated/factories/account.js diff --git a/ui/admin/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js similarity index 100% rename from ui/admin/mirage/generated/factories/auth-method.js rename to addons/api/mirage/generated/factories/auth-method.js diff --git a/ui/admin/mirage/generated/factories/group.js b/addons/api/mirage/generated/factories/group.js similarity index 100% rename from ui/admin/mirage/generated/factories/group.js rename to addons/api/mirage/generated/factories/group.js diff --git a/ui/admin/mirage/generated/factories/host-catalog.js b/addons/api/mirage/generated/factories/host-catalog.js similarity index 100% rename from ui/admin/mirage/generated/factories/host-catalog.js rename to addons/api/mirage/generated/factories/host-catalog.js diff --git a/ui/admin/mirage/generated/factories/host-set.js b/addons/api/mirage/generated/factories/host-set.js similarity index 100% rename from ui/admin/mirage/generated/factories/host-set.js rename to addons/api/mirage/generated/factories/host-set.js diff --git a/ui/admin/mirage/generated/factories/host.js b/addons/api/mirage/generated/factories/host.js similarity index 100% rename from ui/admin/mirage/generated/factories/host.js rename to addons/api/mirage/generated/factories/host.js diff --git a/ui/admin/mirage/generated/factories/org.js b/addons/api/mirage/generated/factories/org.js similarity index 100% rename from ui/admin/mirage/generated/factories/org.js rename to addons/api/mirage/generated/factories/org.js diff --git a/ui/admin/mirage/generated/factories/project.js b/addons/api/mirage/generated/factories/project.js similarity index 100% rename from ui/admin/mirage/generated/factories/project.js rename to addons/api/mirage/generated/factories/project.js diff --git a/ui/admin/mirage/generated/factories/role.js b/addons/api/mirage/generated/factories/role.js similarity index 100% rename from ui/admin/mirage/generated/factories/role.js rename to addons/api/mirage/generated/factories/role.js diff --git a/ui/admin/mirage/generated/factories/scope.js b/addons/api/mirage/generated/factories/scope.js similarity index 100% rename from ui/admin/mirage/generated/factories/scope.js rename to addons/api/mirage/generated/factories/scope.js diff --git a/ui/admin/mirage/generated/factories/session.js b/addons/api/mirage/generated/factories/session.js similarity index 100% rename from ui/admin/mirage/generated/factories/session.js rename to addons/api/mirage/generated/factories/session.js diff --git a/ui/admin/mirage/generated/factories/target.js b/addons/api/mirage/generated/factories/target.js similarity index 100% rename from ui/admin/mirage/generated/factories/target.js rename to addons/api/mirage/generated/factories/target.js diff --git a/ui/admin/mirage/generated/factories/user.js b/addons/api/mirage/generated/factories/user.js similarity index 100% rename from ui/admin/mirage/generated/factories/user.js rename to addons/api/mirage/generated/factories/user.js diff --git a/ui/admin/mirage/models/account.js b/addons/api/mirage/models/account.js similarity index 100% rename from ui/admin/mirage/models/account.js rename to addons/api/mirage/models/account.js diff --git a/ui/admin/mirage/models/auth-method.js b/addons/api/mirage/models/auth-method.js similarity index 100% rename from ui/admin/mirage/models/auth-method.js rename to addons/api/mirage/models/auth-method.js diff --git a/ui/admin/mirage/models/group.js b/addons/api/mirage/models/group.js similarity index 100% rename from ui/admin/mirage/models/group.js rename to addons/api/mirage/models/group.js diff --git a/ui/admin/mirage/models/host-catalog.js b/addons/api/mirage/models/host-catalog.js similarity index 100% rename from ui/admin/mirage/models/host-catalog.js rename to addons/api/mirage/models/host-catalog.js diff --git a/ui/admin/mirage/models/host-set.js b/addons/api/mirage/models/host-set.js similarity index 100% rename from ui/admin/mirage/models/host-set.js rename to addons/api/mirage/models/host-set.js diff --git a/ui/admin/mirage/models/host.js b/addons/api/mirage/models/host.js similarity index 100% rename from ui/admin/mirage/models/host.js rename to addons/api/mirage/models/host.js diff --git a/ui/admin/mirage/models/role.js b/addons/api/mirage/models/role.js similarity index 100% rename from ui/admin/mirage/models/role.js rename to addons/api/mirage/models/role.js diff --git a/ui/admin/mirage/models/session.js b/addons/api/mirage/models/session.js similarity index 100% rename from ui/admin/mirage/models/session.js rename to addons/api/mirage/models/session.js diff --git a/ui/admin/mirage/models/target.js b/addons/api/mirage/models/target.js similarity index 100% rename from ui/admin/mirage/models/target.js rename to addons/api/mirage/models/target.js diff --git a/ui/admin/mirage/models/user.js b/addons/api/mirage/models/user.js similarity index 100% rename from ui/admin/mirage/models/user.js rename to addons/api/mirage/models/user.js diff --git a/ui/admin/mirage/route-handlers/auth.js b/addons/api/mirage/route-handlers/auth.js similarity index 100% rename from ui/admin/mirage/route-handlers/auth.js rename to addons/api/mirage/route-handlers/auth.js diff --git a/ui/admin/mirage/scenarios/default.js b/addons/api/mirage/scenarios/default.js similarity index 100% rename from ui/admin/mirage/scenarios/default.js rename to addons/api/mirage/scenarios/default.js diff --git a/ui/admin/mirage/serializers/account.js b/addons/api/mirage/serializers/account.js similarity index 100% rename from ui/admin/mirage/serializers/account.js rename to addons/api/mirage/serializers/account.js diff --git a/ui/admin/mirage/serializers/application.js b/addons/api/mirage/serializers/application.js similarity index 100% rename from ui/admin/mirage/serializers/application.js rename to addons/api/mirage/serializers/application.js diff --git a/ui/admin/mirage/serializers/auth-method.js b/addons/api/mirage/serializers/auth-method.js similarity index 100% rename from ui/admin/mirage/serializers/auth-method.js rename to addons/api/mirage/serializers/auth-method.js diff --git a/ui/admin/mirage/serializers/group.js b/addons/api/mirage/serializers/group.js similarity index 100% rename from ui/admin/mirage/serializers/group.js rename to addons/api/mirage/serializers/group.js diff --git a/ui/admin/mirage/serializers/host-catalog.js b/addons/api/mirage/serializers/host-catalog.js similarity index 100% rename from ui/admin/mirage/serializers/host-catalog.js rename to addons/api/mirage/serializers/host-catalog.js diff --git a/ui/admin/mirage/serializers/host-set.js b/addons/api/mirage/serializers/host-set.js similarity index 100% rename from ui/admin/mirage/serializers/host-set.js rename to addons/api/mirage/serializers/host-set.js diff --git a/ui/admin/mirage/serializers/host.js b/addons/api/mirage/serializers/host.js similarity index 100% rename from ui/admin/mirage/serializers/host.js rename to addons/api/mirage/serializers/host.js diff --git a/ui/admin/mirage/serializers/role.js b/addons/api/mirage/serializers/role.js similarity index 100% rename from ui/admin/mirage/serializers/role.js rename to addons/api/mirage/serializers/role.js diff --git a/ui/admin/mirage/serializers/scope.js b/addons/api/mirage/serializers/scope.js similarity index 100% rename from ui/admin/mirage/serializers/scope.js rename to addons/api/mirage/serializers/scope.js diff --git a/ui/admin/mirage/serializers/session.js b/addons/api/mirage/serializers/session.js similarity index 100% rename from ui/admin/mirage/serializers/session.js rename to addons/api/mirage/serializers/session.js diff --git a/ui/admin/mirage/serializers/target.js b/addons/api/mirage/serializers/target.js similarity index 100% rename from ui/admin/mirage/serializers/target.js rename to addons/api/mirage/serializers/target.js diff --git a/ui/admin/mirage/serializers/user.js b/addons/api/mirage/serializers/user.js similarity index 100% rename from ui/admin/mirage/serializers/user.js rename to addons/api/mirage/serializers/user.js diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index 1c832b45b..c071cd17c 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -80,6 +80,10 @@ module.exports = function (environment) { 'media-src': ["'self'"], 'manifest-src': ["'self'"], }, + + 'ember-cli-mirage': { + directory: '../../addons/api/mirage' + } }; // Unsafe policy is necessary in development and test environments, but should