From c17a6e457c34ebe81093f7cc6d792ad56469f01a Mon Sep 17 00:00:00 2001
From: Vikas Potluri <vikaspotluri123.github@gmail.com>
Date: Tue, 26 May 2020 15:12:13 -0500
Subject: [PATCH] Removed import of common sub-modules (#11849)

* replaced import of `common/logging` with destructuring the "module" in migrations
* removed reference to `index` in admin regression test
---
 .../data/migrations/versions/1.19/1-webhook-permissions.js  | 2 +-
 .../data/migrations/versions/1.21/1-add-contributor-role.js | 2 +-
 .../migrations/versions/2.15/2-insert-zapier-integration.js | 2 +-
 .../versions/2.2/2-add-integrations-and-api-key-tables.js   | 2 +-
 .../versions/2.2/3-insert-admin-integration-role.js         | 2 +-
 .../2.2/4-insert-integration-and-api-key-permissions.js     | 2 +-
 .../migrations/versions/2.21/1-update-editor-permissions.js | 2 +-
 .../versions/2.27/1-insert-ghost-db-backup-role.js          | 2 +-
 .../versions/2.27/2-insert-db-backup-integration.js         | 2 +-
 .../versions/2.28/1-add-db-backup-content-permission.js     | 2 +-
 .../2.28/2-add-db-backup-content-permission-to-roles.js     | 2 +-
 .../versions/2.28/3-insert-ghost-scheduler-role.js          | 2 +-
 .../versions/2.28/4-insert-scheduler-integration.js         | 2 +-
 .../versions/2.28/5-add-scheduler-permission-to-roles.js    | 2 +-
 .../versions/2.3/2-add-webhook-edit-permission.js           | 2 +-
 .../versions/2.6/1-add-webhook-permission-roles.js          | 2 +-
 .../versions/3.1/03-add-email-preview-permissions.js        | 2 +-
 .../migrations/versions/3.1/06-add-email-permissions.js     | 2 +-
 .../versions/3.1/09-add-further-email-permissions.js        | 2 +-
 .../migrations/versions/3.6/3-add-labels-permissions.js     | 2 +-
 .../3.7/01-fix-incorrect-member-labels-foreign-keys.js      | 2 +-
 .../versions/3.9/01-add-member-sigin-url-permissions.js     | 2 +-
 test/regression/api/admin_spec.js                           | 6 +++---
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
index 6d785783da..267c3c8111 100644
--- a/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
+++ b/core/server/data/migrations/versions/1.19/1-webhook-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const resource = 'webhook';
 const _private = {};
 
diff --git a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
index 4795f8d9a0..f745da6963 100644
--- a/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
+++ b/core/server/data/migrations/versions/1.21/1-add-contributor-role.js
@@ -2,7 +2,7 @@ const merge = require('lodash/merge');
 const utils = require('../../../schema/fixtures/utils');
 const models = require('../../../../models');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const _private = {};
 
 _private.addRole = function addRole(options) {
diff --git a/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js b/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js
index 4e66153565..14adfb9860 100644
--- a/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js
+++ b/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js b/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js
index a3d469f8c3..6af286f70b 100644
--- a/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js
+++ b/core/server/data/migrations/versions/2.2/2-add-integrations-and-api-key-tables.js
@@ -1,5 +1,5 @@
 const commands = require('../../../schema').commands;
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const tables = ['integrations', 'api_keys'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js b/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js
index 45d057eea5..8e411fddf4 100644
--- a/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js
+++ b/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js b/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js
index a16a363885..da14fc6a18 100644
--- a/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js
+++ b/core/server/data/migrations/versions/2.2/4-insert-integration-and-api-key-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['integration', 'api_key'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js b/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js
index a057e8d148..fe2fe5e629 100644
--- a/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js
+++ b/core/server/data/migrations/versions/2.21/1-update-editor-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['notification'];
 
diff --git a/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js b/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js
index 135aa472be..32382a695c 100644
--- a/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js
+++ b/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js b/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js
index 07d0cbe479..a803057daa 100644
--- a/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js
+++ b/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js b/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js
index f87bd9a8d3..c7005cc212 100644
--- a/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js
+++ b/core/server/data/migrations/versions/2.28/1-add-db-backup-content-permission.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
 
diff --git a/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js b/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js
index f30e0d4d72..d9828fd2fe 100644
--- a/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js
+++ b/core/server/data/migrations/versions/2.28/2-add-db-backup-content-permission-to-roles.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const utils = require('../../../schema/fixtures/utils');
 
 const relationFixtures = {
diff --git a/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js b/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js
index 625a44d46d..f21a249540 100644
--- a/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js
+++ b/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js b/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js
index c76b1c39fa..64106d39e6 100644
--- a/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js
+++ b/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
 const utils = require('../../../schema/fixtures/utils');
diff --git a/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js b/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js
index bbdfd5c885..7b523d1c5b 100644
--- a/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js
+++ b/core/server/data/migrations/versions/2.28/5-add-scheduler-permission-to-roles.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const utils = require('../../../schema/fixtures/utils');
 
 const relationFixtures = {
diff --git a/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js b/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js
index 87ddec04b0..0645a41bce 100644
--- a/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js
+++ b/core/server/data/migrations/versions/2.3/2-add-webhook-edit-permission.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['webhook'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js b/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js
index 0ebff09f50..42de2eb16e 100644
--- a/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js
+++ b/core/server/data/migrations/versions/2.6/1-add-webhook-permission-roles.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['webhook'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js b/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js
index 7d0d64ef24..00f85a5757 100644
--- a/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js
+++ b/core/server/data/migrations/versions/3.1/03-add-email-preview-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['email_preview'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/3.1/06-add-email-permissions.js b/core/server/data/migrations/versions/3.1/06-add-email-permissions.js
index cc46ec1ba6..9bae67500f 100644
--- a/core/server/data/migrations/versions/3.1/06-add-email-permissions.js
+++ b/core/server/data/migrations/versions/3.1/06-add-email-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['email'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js b/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js
index cc46ec1ba6..9bae67500f 100644
--- a/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js
+++ b/core/server/data/migrations/versions/3.1/09-add-further-email-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['email'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js b/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js
index a7295f6eed..052cd0e52b 100644
--- a/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js
+++ b/core/server/data/migrations/versions/3.6/3-add-labels-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['label'];
 const _private = {};
diff --git a/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js b/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js
index c2b0775967..db5799dd35 100644
--- a/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js
+++ b/core/server/data/migrations/versions/3.7/01-fix-incorrect-member-labels-foreign-keys.js
@@ -1,4 +1,4 @@
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 const commands = require('../../../schema').commands;
 
 const table = 'members_labels';
diff --git a/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js b/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js
index 5a5b72e110..3ad78d62a7 100644
--- a/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js
+++ b/core/server/data/migrations/versions/3.9/01-add-member-sigin-url-permissions.js
@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const utils = require('../../../schema/fixtures/utils');
 const permissions = require('../../../../services/permissions');
-const logging = require('../../../../lib/common/logging');
+const {logging} = require('../../../../lib/common');
 
 const resources = ['member_signin_url'];
 const _private = {};
diff --git a/test/regression/api/admin_spec.js b/test/regression/api/admin_spec.js
index c0137ab7db..2ce4bc0455 100644
--- a/test/regression/api/admin_spec.js
+++ b/test/regression/api/admin_spec.js
@@ -6,12 +6,12 @@
 const should = require('should');
 
 const supertest = require('supertest');
-const testUtils = require('../../utils/index');
+const testUtils = require('../../utils');
 const configUtils = require('../../utils/configUtils');
 const urlUtils = require('../../utils/urlUtils');
 const ghost = testUtils.startGhost;
-const {i18n} = require('../../../core/server/lib/common/index');
-const config = require('../../../core/server/config/index');
+const {i18n} = require('../../../core/server/lib/common');
+const config = require('../../../core/server/config');
 let request;
 
 i18n.init();