Feature/olegz/saas 4818 create annotation from manifest (#382)

* SAAS-4818 #time 1h 30m Added creating annotation from manifest format, made some refactoring in process

* SAAS-4818 #time 0h 1m Bump

* SAAS-4818 #time 0h 1m Bump

* SAAS-4818 #time 0h 1m Bump

* rebuild

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

Author: olegz-codefresh

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

@@ -1,12 +1,11 @@
 const _ = require('lodash');
-const CFError = require('cf-errors');
 const Command = require('../../Command');
 const { crudFilenameOption } = require('../../helpers/general');
-const EntitiesManifests = require('../../helpers/entitiesManifests');
+const { createEntity, entityList } = require('../../helpers/entitiesManifests');
 const yargs = require('yargs');
 
 function _getSupportedResourcesStr() {
-    return EntitiesManifests.list
+    return entityList
         .map(entity => `\n\t'${entity}'`)
         .join('');
 }
@@ -33,15 +32,10 @@ const get = new Command({
 
         const data = argv.filename;
         const entity = data.kind;
-
         const name = data.metadata.name;
-        if (!name) {
-            throw new CFError('Name is missing');
-        }
 
-        const manifests = new EntitiesManifests({ name, data });
-        await manifests.createEntity(entity);
-        console.log(`${_.capitalize(entity)}: ${name} created`);
+        await createEntity({ name, data, entity });
+        console.log(_.compact([_.capitalize(entity), name, 'created']).join(' '));
     },
 });
 

lib/interface/cli/helpers/entitiesManifests.js

@@ -2,33 +2,59 @@ const _ = require('lodash');
 const CFError = require('cf-errors');
 const { validatePipelineSpec, checkOrProjectExists } = require('./validation');
 const { sdk } = require('../../../logic');
+const { createAnnotations } = require('../commands/annotation/annotation.logic');
 
-class EntitiesManifests {
-    constructor({ name, data } = {}) {
-        this.name = name;
-        this.data = data;
-    }
-
-    createEntity(entity) {
-        if (!EntitiesManifests._entities[entity]) {
-            throw new CFError(`Entity: ${entity} not supported`);
-        }
-        return EntitiesManifests._entities[entity]({
-            name: this.name,
-            data: this.data,
-        });
+function _basicValidation({ name }) {
+    if (!name) {
+        throw new CFError('Name is missing');
     }
 }
 
-EntitiesManifests._entities = {
-    context: ({ data }) => sdk.contexts.create(data),
-    'step-type': ({ data }) => sdk.steps.create(data),
-    project: ({ name, data }) => checkOrProjectExists(name)
-        .then(() => sdk.projects.create({ projectName: name, ..._.pick(data.metadata, ['tags', 'variables']) })),
-    pipeline: ({ data }) => validatePipelineSpec(data)
-        .then((result = {}) => (result.valid ? sdk.pipelines.create(data) : console.warn(result.message))),
+const _entities = {
+
+    context: {
+        validate: _basicValidation,
+        create: ({ data }) => sdk.contexts.create(data),
+    },
+    'step-type': {
+        validate: _basicValidation,
+        create: ({ data }) => sdk.steps.create(data),
+    },
+    project: {
+        validate: _basicValidation,
+        create: ({ name, data }) => checkOrProjectExists(name)
+            .then(() => sdk.projects.create({ projectName: name, ..._.pick(data.metadata, ['tags', 'variables']) })),
+    },
+    pipeline: {
+        validate: _basicValidation,
+        create: ({ data }) => validatePipelineSpec(data)
+            .then((result = {}) => (result.valid ? sdk.pipelines.create(data) : console.warn(result.message))),
+    },
+    annotation: {
+        create: ({ data }) => {
+            const labels = _.get(data.metadata, 'labels', [])
+                .map(({ key, value }) => `${key}=${value}`);
+            return createAnnotations({ labels, ..._.pick(data.metadata, ['entityId', 'entityType']) });
+        },
+    },
 };
 
-EntitiesManifests.list = Object.keys(EntitiesManifests._entities);
+const entityList = Object.keys(_entities);
+
+function createEntity(options) {
+    const { entity } = options;
+    if (!_entities[entity]) {
+        throw new CFError(`Entity: ${entity} not supported`);
+    }
+
+    if (_entities[entity].validate instanceof Function) {
+        _entities[entity].validate(options);
+    }
 
-module.exports = EntitiesManifests;
+    return _entities[entity].create(options);
+}
+
+module.exports = {
+    createEntity,
+    entityList,
+};

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

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const helper = require('./image');
-const EntitiesManifests = require('./entitiesManifests');
+const { createEntity, entityList } = require('./entitiesManifests');
 
 const { extractImages } = helper;
 
@@ -10,6 +10,12 @@ jest.mock('../../../logic/entities/Image', () => class {
     }
 });
 
+jest.mock('../commands/annotation/annotation.logic', () => class {
+    static createAnnotations() {
+        return Promise.resolve();
+    }
+});
+
 describe('helpers unit tests', () => {
     describe('creating entites', () => {
         const request = require('requestretry');
@@ -18,11 +24,11 @@ describe('helpers unit tests', () => {
             request.mockClear();
             await configureSdk(); // eslint-disable-line
         });
-        const manifests = new EntitiesManifests({});
 
-        it('should have some length', () => expect(EntitiesManifests.list.length).not.toBe(0));
-        for (const entity of EntitiesManifests.list) {
-            it(`${entity} should be promise`, () => expect(manifests.createEntity(entity).catch(() => null) instanceof Promise).toBe(true));
+        it('should have some length', () => expect(entityList.length).not.toBe(0));
+        for (const entity of entityList) {
+            const args = { entity, name: 'default', data: {} };
+            it(`${entity} should be promise`, () => expect(createEntity(args).catch(() => null) instanceof Promise).toBe(true));
         }
     });
 

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.4",
+  "version": "0.39.5",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,