fix annotate image (#333)

* fix annotate image

* update version

Author: yaroslav-codefresh

lib/interface/cli/commands/annotation/annotation.logic.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-use-before-define,object-curly-newline,arrow-body-style */
 
+const _ = require('lodash');
+const CFError = require('cf-errors');
 const Promise = require('bluebird');
 const { sdk } = require('../../../../logic');
 
@@ -11,21 +13,27 @@ class AnnotationLogic {
             annotations = await sdk.annotations.list({ entityId, entityType });
         } catch (error) {
             if (error.statusCode === 404) {
-                throw new Error('Annotations not found for specified entity');
+                throw new CFError({
+                    message: `Annotations not found for specified entity: type = ${entityType}; id = ${entityId}`,
+                    cause: error,
+                });
             } else {
                 throw error;
             }
         }
 
-        if (labels && labels.length) {
-            annotations = annotations.filter(annotation => labels.includes(annotation.key));
+        if (_.isArray(labels) && !_.isEmpty(labels)) {
+            annotations = _.filter(annotations, annotation => labels.includes(annotation.key));
         }
 
         return annotations;
     }
 
     static createAnnotations({ entityId, entityType, labels }) {
-        if (!labels || !labels.length) {
+        if (!_.isArray(labels)) {
+            throw new Error('Labels should be an array');
+        }
+        if (_.isEmpty(labels)) {
             throw new Error('Labels are required for set command');
         }
 
@@ -34,15 +42,15 @@ class AnnotationLogic {
     }
 
     static deleteAnnotations({ entityId, entityType, labels }) {
-        if (labels && labels.length) {
+        if (!_.isEmpty(labels)) {
             return Promise.map(labels, key => sdk.annotations.delete({ entityId, entityType, key }));
         }
 
         return sdk.annotations.delete({ entityId, entityType });
     }
 
     static _parseAnnotations(labels) {
-        return labels.map((label) => {
+        return _.map(labels, (label) => {
             const [key, value] = label.split('=');
             return { key, value };
         });

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

@@ -21,6 +21,11 @@ const command = new Command({
             describe: 'Id of resource for annotation',
             required: true,
         })
+        .positional('labels', {
+            describe: 'Labels',
+            required: true,
+            array: true,
+        })
         .example('codefresh create annotation image 2dfacdaad466 coverage=75%', 'Annotate entity with a single label')
         .example('codefresh create annotation image 2dfacdaad466 coverage=75% tests_passed=true', 'Annotate entity with multiple labels'),
     handler: async (argv) => {

lib/interface/cli/commands/annotation/delete.cmd.js

@@ -21,6 +21,10 @@ const command = new Command({
             describe: 'Id of resource for annotation',
             required: true,
         })
+        .positional('labels', {
+            describe: 'Labels to delete',
+            array: true,
+        })
         .example('codefresh delete annotation image 2dfacdaad466 coverage tests_passed', 'Delete specified annotations')
         .example('codefresh delete annotation image 2dfacdaad466', 'Delete all annotations of entity'),
     handler: async (argv) => {

lib/interface/cli/commands/annotation/get.cmd.js

@@ -24,6 +24,11 @@ const command = new Command({
             describe: 'Id of resource for annotation',
             required: true,
         })
+        .positional('labels', {
+            describe: 'Labels to filter by',
+            array: true,
+            default: [],
+        })
         .example('codefresh get annotation image 2dfacdaad466', 'Get all annotations for entity')
         .example('codefresh get annotation image 2dfacdaad466 coverage tests_passed', 'Get specified annotations'),
     handler: async (argv) => {

lib/interface/cli/commands/image/annotate.cmd.js

@@ -25,6 +25,7 @@ const command = new Command({
                 describe: 'annotations to add to the image',
                 default: [],
                 alias: 'l',
+                array: true,
             })
             .example('codefresh annotate image 2dfacdaad466 -l coverage=75%', 'Annotate an image with a single label')
             .example('codefresh annotate image 2dfacdaad466 -l coverage=75% -l tests_passed=true', 'Annotate an image with multiple labels');

package.json

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