Feauture/olegz/saas 4818 refactored root creating (#380)

* SAAS-4712 #time 2h 10m Made some small refactoring - moved checking existing project to the helper.

* SAAS-4712 #time 0h 50m Added manifest file supporting for creating command

* SAAS-4712 #time 0h 50m Added manifest file supporting for creating command

* SAAS-4712 #time 0h 50m removed `creating entities` from cmd to the helper

* SAAS-4712 #time 0h 5m bump

* SAAS-4818 #time 0h 1m rename var

* SAAS-4818 #time 0h 40m write tests for creatingEntities.js

* SAAS-4818 #time 0h 10m fixed tests

* rebuild

Co-authored-by: Denis Melnik <[email protected]>

Author: olegz-codefresh

lib/interface/cli/commands/root/create.cmd.js

@@ -2,9 +2,8 @@ const _ = require('lodash');
 const CFError = require('cf-errors');
 const Command = require('../../Command');
 const { crudFilenameOption } = require('../../helpers/general');
+const creatingEntities = require('../../helpers/creatingEntities');
 const yargs = require('yargs');
-const { validatePipelineSpec, checkOrProjectExists } = require('../../helpers/validation');
-const { sdk } = require('../../../../logic');
 
 const get = new Command({
     root: true,
@@ -35,32 +34,14 @@ const get = new Command({
             throw new CFError('Name is missing');
         }
 
-        switch (entity) {
-            case 'context':
-                await sdk.contexts.create(data);
-                console.log(`Context: ${name} created`);
-                break;
-            case 'pipeline':
-                const result = await validatePipelineSpec(data);
-                if (!result.valid) {
-                    console.warn(result.message);
-                    return;
-                }
-                await sdk.pipelines.create(data);
-                console.log(`Pipeline '${name}' created`);
-                break;
-            case 'step-type':
-                await sdk.steps.create(data);
-                console.log(`Step-type '${name}' created`);
-                break;
-            case 'project':
-                await checkOrProjectExists(name);
-                await sdk.projects.create({ projectName: name, ..._.pick(data.metadata, ['tags', 'variables']) });
-                console.log(`Project: ${name} created`);
-                break;
-            default:
-                throw new CFError(`Entity: ${entity} not supported`);
+        const entities = creatingEntities({ name, data });
+
+        if (!entities[entity]) {
+            throw new CFError(`Entity: ${entity} not supported`);
         }
+
+        await entities[entity]();
+        console.log(`${_.capitalize(entity)}: ${name} created`);
     },
 });
 

lib/interface/cli/commands/root/root.sdk.spec.js

@@ -24,8 +24,8 @@ validateCmd = validateCmd.toCommand();
 
 jest.mock('../../helpers/validation', () => { // eslint-disable-line
     return {
-        validatePipelineSpec: () => ({ valid: true }),
-        validatePipelineYaml: () => ({ valid: false }),
+        validatePipelineSpec: async () => ({ valid: true }),
+        validatePipelineYaml: async () => ({ valid: false }),
     };
 });
 

lib/interface/cli/helpers/creatingEntities.js

@@ -0,0 +1,14 @@
+const _ = require('lodash');
+const { validatePipelineSpec, checkOrProjectExists } = require('./validation');
+const { sdk } = require('../../../logic');
+
+module.exports = ({ name, data }) => ({
+
+    context: () => sdk.contexts.create(data),
+    'step-type': () => sdk.steps.create(data),
+    project: () => checkOrProjectExists(name)
+        .then(() => sdk.projects.create({ projectName: name, ..._.pick(data.metadata, ['tags', 'variables']) })),
+    pipeline: () => validatePipelineSpec(data)
+        .then((result = {}) => (result.valid ? sdk.pipelines.create(data) : console.warn(result.message))),
+
+});

lib/interface/cli/helpers/helpers.unit.spec.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const helper = require('./image');
 const moment = require('moment');
+const creatingEntities = require('./creatingEntities');
 
 const { extractImages } = helper;
 
@@ -11,6 +12,22 @@ jest.mock('../../../logic/entities/Image', () => class {
 });
 
 describe('helpers unit tests', () => {
+    describe('creating entites', () => {
+        const request = require('requestretry');
+        beforeEach(async () => {
+            request.__reset();
+            request.mockClear();
+            await configureSdk(); // eslint-disable-line
+        });
+        const entities = creatingEntities({});
+        it('should be an Object', () => expect(entities instanceof Object).toBe(true));
+        it('should have some size', () => expect(_.size(entities)).not.toBe(0));
+        for (const entity in entities) {
+            it(`${entity} should be a function`, () => expect(entities[entity] instanceof Function).toBe(true));
+            it(`${entity} should be promise`, () => expect(entities[entity]().catch(() => null) instanceof Promise).toBe(true));
+        }
+    });
+
     describe('images', () => {
         describe('#extractImages', () => {
             beforeAll(() => {
@@ -21,7 +38,7 @@ describe('helpers unit tests', () => {
                 const image = {
                     tags: [{ tag: 'test', registry: 'r.cfcr.io' }],
                 };
-                expect(extractImages(image)).toEqual([{tag: 'test'}]);
+                expect(extractImages(image)).toEqual([{ tag: 'test' }]);
             });
 
             it('should extract image tags as separate images', () => {

lib/logic/index.js

@@ -3,3 +3,4 @@ const sdk = require('./sdk');
 module.exports = {
     sdk,
 };
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.39.2",
+  "version": "0.39.3",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,