fix some Logger imports from cli/kibana_keystore

src/cli_keystore/add.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import { confirm, question } from '../legacy/server/utils';
 import { createPromiseFromStreams, createConcatStream } from '../legacy/utils';
 

src/cli_keystore/add.test.js

@@ -41,7 +41,7 @@ import { PassThrough } from 'stream';
 
 import { Keystore } from '../legacy/server/keystore';
 import { add } from './add';
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import * as prompt from '../legacy/server/utils/prompt';
 
 describe('Kibana keystore', () => {

src/cli_keystore/create.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import { confirm } from '../legacy/server/utils';
 
 export async function create(keystore, command, options) {

src/cli_keystore/create.test.js

@@ -40,7 +40,7 @@ import sinon from 'sinon';
 
 import { Keystore } from '../legacy/server/keystore';
 import { create } from './create';
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import * as prompt from '../legacy/server/utils/prompt';
 
 describe('Kibana keystore', () => {

src/cli_keystore/get_keystore.js

@@ -20,7 +20,7 @@
 import { existsSync } from 'fs';
 import { join } from 'path';
 
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import { getConfigDirectory, getDataPath } from '../core/server/path';
 
 export function getKeystore() {

src/cli_keystore/get_keystore.test.js

@@ -18,7 +18,7 @@
  */
 
 import { getKeystore } from './get_keystore';
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 import fs from 'fs';
 import sinon from 'sinon';
 

src/cli_keystore/list.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 
 export function list(keystore, command, options = {}) {
   const logger = new Logger(options);

src/cli_keystore/list.test.js

@@ -38,7 +38,7 @@ jest.mock('fs', () => ({
 import sinon from 'sinon';
 import { Keystore } from '../legacy/server/keystore';
 import { list } from './list';
-import Logger from '../cli_plugin/lib/logger';
+import { Logger } from '../cli_plugin/lib/logger';
 
 describe('Kibana keystore', () => {
   describe('list', () => {

src/cli_plugin/install/download.test.js

@@ -17,16 +17,18 @@
  * under the License.
  */
 
+import Fs from 'fs';
+import { join } from 'path';
+import http from 'http';
+
 import sinon from 'sinon';
 import nock from 'nock';
 import glob from 'glob-all';
 import del from 'del';
-import Fs from 'fs';
+
 import { Logger } from '../lib/logger';
 import { UnsupportedProtocolError } from '../lib/errors';
 import { download, _downloadSingle, _getFilePath, _checkFilePathDeprecation } from './download';
-import { join } from 'path';
-import http from 'http';
 
 describe('kibana cli', function () {
   describe('plugin downloader', function () {

src/cli_plugin/install/index.test.js

@@ -18,6 +18,7 @@
  */
 
 import sinon from 'sinon';
+
 import { installCommand } from './index';
 
 describe('kibana cli', function () {

src/cli_plugin/install/install.js

@@ -19,13 +19,14 @@
 
 import Fs from 'fs';
 import { promisify } from 'util';
+import path from 'path';
+
+import del from 'del';
 
 import { download } from './download';
-import path from 'path';
 import { cleanPrevious, cleanArtifacts } from './cleanup';
 import { extract, getPackData } from './pack';
 import { renamePlugin } from './rename';
-import del from 'del';
 import { errorIfXPackInstall } from '../lib/error_if_x_pack';
 import { existingInstall, assertVersion } from './kibana';
 
@@ -57,7 +58,6 @@ export async function install(settings, logger) {
     logger.log('Plugin installation complete');
   } catch (err) {
     logger.error(`Plugin installation was unsuccessful due to error "${err.message}"`);
-    console.error(err);
     cleanArtifacts(settings);
     process.exit(70);
   }

src/cli_plugin/install/kibana.js

@@ -18,9 +18,10 @@
  */
 
 import path from 'path';
-import { versionSatisfies, cleanVersion } from '../../legacy/utils/version';
 import { statSync } from 'fs';
 
+import { versionSatisfies, cleanVersion } from '../../legacy/utils/version';
+
 export function existingInstall(settings, logger) {
   try {
     statSync(path.join(settings.pluginDir, settings.plugins[0].id));

src/cli_plugin/install/kibana.test.js

@@ -17,12 +17,14 @@
  * under the License.
  */
 
-import sinon from 'sinon';
-import { Logger } from '../lib/logger';
 import { join } from 'path';
-import del from 'del';
 import fs from 'fs';
+
+import sinon from 'sinon';
+import del from 'del';
+
 import { existingInstall, assertVersion } from './kibana';
+import { Logger } from '../lib/logger';
 
 jest.spyOn(fs, 'statSync');
 

src/cli_plugin/install/pack.test.js

@@ -18,14 +18,15 @@
  */
 
 import Fs from 'fs';
+import { join } from 'path';
 
 import sinon from 'sinon';
 import glob from 'glob-all';
 import del from 'del';
+
 import { Logger } from '../lib/logger';
 import { extract, getPackData } from './pack';
 import { _downloadSingle } from './download';
-import { join } from 'path';
 
 describe('kibana cli', function () {
   describe('pack', function () {

src/cli_plugin/install/rename.js

@@ -18,6 +18,7 @@
  */
 
 import { rename } from 'fs';
+
 import { delay } from 'lodash';
 
 export function renamePlugin(workingPath, finalPath) {

src/cli_plugin/install/rename.test.js

@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import sinon from 'sinon';
 import fs from 'fs';
 
+import sinon from 'sinon';
+
 import { renamePlugin } from './rename';
 
 describe('plugin folder rename', function () {

src/cli_plugin/install/settings.js

@@ -17,8 +17,10 @@
  * under the License.
  */
 
-import expiry from 'expiry-js';
 import { resolve } from 'path';
+
+import expiry from 'expiry-js';
+
 import { fromRoot } from '../../core/server/utils';
 
 function generateUrls({ version, plugin }) {

src/cli_plugin/install/zip.test.js

@@ -17,11 +17,13 @@
  * under the License.
  */
 
-import del from 'del';
 import path from 'path';
 import os from 'os';
-import glob from 'glob';
 import fs from 'fs';
+
+import del from 'del';
+import glob from 'glob';
+
 import { analyzeArchive, extractArchive } from './zip';
 
 const getMode = (path) => (fs.statSync(path).mode & parseInt('777', 8)).toString(8);

src/cli_plugin/lib/logger.test.js

@@ -18,6 +18,7 @@
  */
 
 import sinon from 'sinon';
+
 import { Logger } from './logger';
 
 describe('kibana cli', function () {

src/cli_plugin/list/list.test.js

@@ -17,11 +17,13 @@
  * under the License.
  */
 
-import del from 'del';
-import { list } from './list';
 import { join } from 'path';
 import { writeFileSync, mkdirSync } from 'fs';
 
+import del from 'del';
+
+import { list } from './list';
+
 function createPlugin(name, version, pluginBaseDir) {
   const pluginDir = join(pluginBaseDir, name);
   mkdirSync(pluginDir, { recursive: true });

src/cli_plugin/remove/remove.js

@@ -18,10 +18,11 @@
  */
 
 import { statSync } from 'fs';
-import { errorIfXPackRemove } from '../lib/error_if_x_pack';
 
 import del from 'del';
 
+import { errorIfXPackRemove } from '../lib/error_if_x_pack';
+
 export function remove(settings, logger) {
   try {
     let stat;