Refactor cli to use new codefresh-sdk (codefresh-io#279)

Author: yaroslav-codefresh

Diff for: __mocks__/requestretry.js

@@ -0,0 +1,35 @@
+const _ = require('lodash');
+
+const DEFAULT_RESPONSE = { statusCode: 200, body: { test: 'test' } };
+
+let RESPONSE = _.clone(DEFAULT_RESPONSE);
+
+let QUEUE = [];
+
+const request = jest.fn(async () => {
+    if (!_.isEmpty(QUEUE)) {
+        return QUEUE.shift();
+    }
+    return RESPONSE;
+});
+
+request.defaults = () => request;
+
+request.__setResponse = (response) => {
+    RESPONSE = response;
+};
+
+request.__reset = () => {
+    RESPONSE = _.clone(DEFAULT_RESPONSE);
+    QUEUE = [];
+};
+
+request.__defaultResponse = () => {
+    return _.clone(DEFAULT_RESPONSE);
+};
+
+request.__queueResponses = (queue) => {
+    QUEUE = QUEUE.concat(queue);
+};
+
+module.exports = request;

Diff for: lib/interface/cli/Command.js

@@ -2,8 +2,9 @@ const yargs = require('yargs');
 const CFError = require('cf-errors');
 const assert = require('assert');
 const _ = require('lodash');
-const { printError, wrapHandler } = require('./helpers/general');
+const { wrapHandler } = require('./helpers/general');
 const authManager = require('../../logic').auth.manager;
+const Output = require('../../output/Output');
 
 
 class Command {
@@ -51,7 +52,7 @@ class Command {
         this.addBuilder(this._createUsageBuilder.bind(this));
 
         (_.isUndefined(command.handler)) ? command.handler = (args) => {
-            printError(`Error: unknown command "${args._[args._.length - 1]}"\n` +
+            Output.printError(`Error: unknown command "${args._[args._.length - 1]}"\n` +
                 'Run \'codefresh --help\' for usage.');
 
         } : _.noop();

Diff for: lib/interface/cli/commands/board/apply.cmd.js

@@ -1,5 +1,5 @@
 const Command = require('../../Command');
-const { board: boardLogic } = require('../../../../logic').api;
+const { sdk } = require('../../../../logic');
 
 const applyRoot = require('../root/apply.cmd');
 
@@ -38,23 +38,23 @@ const command = new Command({
         return yargs;
     },
     handler: async (argv) => {
-        let { id } = argv;
+        let { id, name } = argv;
 
         const data = {
             name: argv.newName,
             filter: argv.filter,
         };
 
         if (!id) {
-            if (!argv.name) throw Error('Nor board-id nor board-name was specified');
+            if (!name) throw Error('Neither board-id nor board-name were specified');
 
-            const boardObj = await boardLogic.getBoardByName(argv.name);
-            id = boardObj.id;
+            const boardObj = await sdk.helm.boards.getByName({ name });
+            id = boardObj._id;
         }
 
 
-        await boardLogic.updateBoard(id, data);
-        console.log(`Board: "${data.name}" patched.`);
+        await sdk.helm.boards.patch({ id }, data);
+        console.log(`Board: "${name || id}" patched.`);
     },
 });
 

Diff for: lib/interface/cli/commands/board/board.sdk.spec.js

@@ -0,0 +1,87 @@
+const getCmd = require('./get.cmd').toCommand();
+const deleteCmd = require('./delete.cmd').toCommand();
+const createCmd = require('./create.cmd').toCommand();
+const applyCmd = require('./apply.cmd').toCommand();
+
+
+jest.mock('../../../../logic/entities/Board');
+
+const request = require('requestretry');
+
+const DEFAULT_RESPONSE = request.__defaultResponse();
+
+describe('board commands', () => {
+    beforeEach(async () => {
+        request.__reset();
+        request.mockClear();
+        await configureSdk(); // eslint-disable-line
+    });
+
+    describe('get', () => {
+        it('should handle getting given id', async () => {
+            const argv = { id: 'some id' };
+            await getCmd.handler(argv);
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
+        });
+
+        it('should handle getting given name', async () => {
+            const argv = { name: 'some name' };
+            await getCmd.handler(argv);
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
+        });
+
+        it('should handle getting all', async () => {
+            const argv = {};
+            const response = { statusCode: 200, body: [DEFAULT_RESPONSE.body] };
+            request.__setResponse(response);
+            await getCmd.handler(argv);
+            await verifyResponsesReturned([response]); // eslint-disable-line
+        });
+    });
+
+    describe('create', () => {
+        it('should handle creation', async () => {
+            const argv = { name: 'some name' };
+            await createCmd.handler(argv);
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
+        });
+    });
+
+    describe('apply', () => {
+        it('should handle patching by id', async () => {
+            const argv = { id: 'some id' };
+            await applyCmd.handler(argv);
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
+        });
+
+        it('should handle patching by name', async () => {
+            const argv = { name: 'some name' };
+            const responses = [
+                { statusCode: 200, body: { _id: 'some id' } },
+                DEFAULT_RESPONSE,
+            ];
+            request.__queueResponses(responses);
+            await applyCmd.handler(argv);
+            await verifyResponsesReturned(responses); // eslint-disable-line
+        });
+    });
+
+    describe('delete', () => {
+        it('should handle deletion given id', async () => {
+            const argv = { id: 'some id' };
+            await deleteCmd.handler(argv);
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
+        });
+
+        it('should handle deletion given name', async () => {
+            const argv = { name: 'some name' };
+            const responses = [
+                { statusCode: 200, body: { _id: 'some id' } },
+                DEFAULT_RESPONSE,
+            ];
+            request.__queueResponses(responses);
+            await deleteCmd.handler(argv);
+            await verifyResponsesReturned(responses); // eslint-disable-line
+        });
+    });
+});

Diff for: lib/interface/cli/commands/board/create.cmd.js

@@ -1,11 +1,11 @@
 const Command = require('../../Command');
-const { board: boardLogic } = require('../../../../logic').api;
+const { sdk } = require('../../../../logic');
 const createRoot = require('../root/create.cmd');
 
 const command = new Command({
     command: 'board <name>',
     parent: createRoot,
-    description: 'Create a team',
+    description: 'Create a board',
     usage: 'You can create a board specifying name unique for account.',
     webDocs: {
         category: 'Boards',
@@ -25,7 +25,7 @@ const command = new Command({
     handler: async (argv) => {
         const reqBody = Object.assign({ name: argv.name }, argv.filter);
 
-        await boardLogic.createBoard(reqBody);
+        await sdk.helm.boards.create(reqBody);
         console.log(`Board: "${reqBody.name}" created`);
     },
 });

Diff for: lib/interface/cli/commands/board/delete.cmd.js

@@ -1,5 +1,5 @@
 const Command = require('../../Command');
-const { board } = require('../../../../logic').api;
+const { sdk } = require('../../../../logic');
 const deleteRoot = require('../root/delete.cmd');
 
 const command = new Command({
@@ -28,13 +28,13 @@ const command = new Command({
         let { id } = argv;
 
         if (!id) {
-            if (!name) throw Error('Nor board-id nor board-name was specified');
+            if (!name) throw Error('Neither board-id nor board-name was specified');
 
-            const boardObj = await board.getBoardByName(name);
-            id = boardObj.id;
+            const boardObj = await sdk.helm.boards.getByName({ name });
+            id = boardObj._id;
         }
 
-        await board.deleteBoard(id);
+        await sdk.helm.boards.delete({ id });
         console.log(`Board '${name || id}' deleted.`);
     },
 });

Diff for: lib/interface/cli/commands/board/get.cmd.js

@@ -1,7 +1,8 @@
 const debug = require('debug')('codefresh:cli:create:pipelines2');
 const Command = require('../../Command');
 const CFError = require('cf-errors');
-const { board: boardLogic } = require('../../../../logic').api;
+const { sdk } = require('../../../../logic');
+const Board = require('../../../../logic/entities/Board');
 const Output = require('../../../../output/Output');
 
 const getRoot = require('../root/get.cmd');
@@ -28,8 +29,8 @@ const command = new Command({
         const { id, name } = argv;
         if (id) {
             try {
-                const board = await boardLogic.getBoardById(id);
-                Output.print(board);
+                const board = await sdk.helm.boards.get({ id });
+                Output.print(Board.fromResponse(board));
             } catch (err) {
                 debug(err.toString());
                 const message = `Board '${id}' was not found`;
@@ -40,8 +41,8 @@ const command = new Command({
             }
         } else if (name) {
             try {
-                const board = await boardLogic.getBoardByName(name);
-                Output.print(board);
+                const board = await sdk.helm.boards.getByName({ name });
+                Output.print(Board.fromResponse(board));
             } catch (err) {
                 debug(err.toString());
                 const message = `Board '${name}' was not found`;
@@ -51,8 +52,8 @@ const command = new Command({
                 });
             }
         } else {
-            const boards = await boardLogic.getAll({ name });
-            Output.print(boards);
+            const boards = await sdk.helm.boards.list();
+            Output.print(boards.map(Board.fromResponse));
         }
     },
 });

Diff for: lib/interface/cli/commands/cluster/cluster.sdk.spec.js

@@ -0,0 +1,60 @@
+const getCmd = require('./get.cmd').toCommand();
+const deleteCmd = require('./delete.cmd').toCommand();
+const createCmd = require('./create.cmd').toCommand();
+
+const request = require('requestretry');
+
+jest.mock('../../../../logic/entities/Cluster');
+
+
+const DEFAULT_RESPONSE = request.__defaultResponse();
+
+describe('cluster commands', () => {
+    beforeEach(async () => {
+        request.__reset();
+        request.mockClear();
+        await configureSdk(); // eslint-disable-line
+    });
+
+    describe('get', () => {
+        it('should handle getting all', async () => {
+            const argv = {};
+            const response = { statusCode: 200, body: [DEFAULT_RESPONSE.body] };
+            request.__setResponse(response);
+            await getCmd.handler(argv);
+            await verifyResponsesReturned([response]); // eslint-disable-line
+        });
+    });
+
+    describe('create', () => {
+        it.skip('should skip', () => {
+            // todo : test custom sdk logic
+        });
+    });
+
+    describe('delete', () => {
+        it('should handle deletion given name', async () => {
+            const clusterName = 'some name';
+            const provider = 'some provider';
+            const argv = { name: clusterName };
+            const responses = [
+                { statusCode: 200, body: [{ _id: 'some id', selector: clusterName, provider }] },
+                DEFAULT_RESPONSE,
+            ];
+            request.__queueResponses(responses);
+            await deleteCmd.handler(argv);
+            await verifyResponsesReturned(responses); // eslint-disable-line
+        });
+
+        it('should throw on cluster not found', async () => {
+            const clusterName = 'some name';
+            const argv = { name: clusterName };
+            const response = { statusCode: 200, body: [] };
+            request.__setResponse(response); // no clusters on getAll
+            await expectThrows(async () => { // eslint-disable-line
+                await deleteCmd.handler(argv);
+            });
+            await verifyResponsesReturned([response]); // eslint-disable-line
+        });
+    });
+});

Diff for: lib/interface/cli/commands/cluster/create.cmd.js

@@ -1,8 +1,7 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const { cluster } = require('../../../../logic').api;
 const createRoot = require('../root/create.cmd');
 const authManager = require('../../../../logic/auth').manager; // eslint-disable-line
+const { sdk } = require('../../../../logic');
 
 const command = new Command({
     command: 'clusters [name]',
@@ -49,7 +48,7 @@ const command = new Command({
             'behind-firewall': behindFirewall,
             name,
         } = argv;
-        await cluster.createCluster({
+        await sdk.clusters.create({
             contextName,
             context,
             namespace,

Diff for: lib/interface/cli/commands/cluster/delete.cmd.js

@@ -1,7 +1,8 @@
-const debug = require('debug')('codefresh:cli:create:context');
 const Command = require('../../Command');
-const { cluster } = require('../../../../logic').api;
 const deleteRoot = require('../root/delete.cmd');
+const { sdk } = require('../../../../logic');
+const CFError = require('cf-errors');
+const _ = require('lodash');
 
 const command = new Command({
     command: 'cluster <name>',
@@ -21,8 +22,17 @@ const command = new Command({
             .example('codefresh delete cluster NAME', 'Delete cluster NAME');
     },
     handler: async (argv) => {
-        await cluster.deleteCluster(argv.name);
-        console.log(`Cluster: ${argv.name} deleted`);
+        const clusters = await sdk.clusters.list();
+        const cluster = _.find(clusters, (curr) => {
+            return _.isEqual(curr.selector, argv.name);
+        });
+
+        if (!cluster) {
+            throw new CFError(`No such cluster: ${argv.name}`);
+        }
+
+        await sdk.clusters.delete({ id: cluster._id, provider: cluster.provider });
+        console.log(`Cluster: '${argv.name}' deleted`);
     },
 });