add filter options to images (#44)

Author: ziv-codefresh

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

@@ -21,7 +21,7 @@ const command = new Command({
                 describe: 'Limit amount of returned results',
                 default: DEFAULTS.GET_LIMIT_RESULTS,
             })
-            .option('all-registries', {
+            .option('all', {
                 describe: 'Return images from all possible registries (by default only r.cfcr.io images will be returned)',
                 default: false,
             })
@@ -33,15 +33,30 @@ const command = new Command({
             .option('sha', {
                 describe: 'Filter by specific commit sha',
                 alias: 's',
+            })
+            .option('image-name', {
+                describe: 'Filter by specific image name',
+                type: 'array',
+            })
+            .option('branch', {
+                describe: 'Filter by specific branch',
+                type: 'array',
+            })
+            .option('page', {
+                describe: 'Paginated page',
+                default: DEFAULTS.GET_PAGINATED_PAGE,
             });
     },
     handler: async (argv) => {
         const imageId = argv.id;
         const labels = prepareKeyValueFromCLIEnvOption(argv.label);
         const sha = argv.sha;
         const limit = argv.limit;
-        const volumeImages = argv['volume-images'];
-        const allRegistries = argv['all-registries'];
+        const type = argv.type;
+        const branch = argv.branch;
+        const allRegistries = argv.all;
+        const offset = (argv.page - 1) * limit;
+        const imageName = argv['image-name'];
         let filterRegistries;
         if (!allRegistries) {
             filterRegistries = DEFAULTS.CODEFRESH_REGISTRIES;
@@ -56,8 +71,11 @@ const command = new Command({
                 labels,
                 sha,
                 limit,
-                volumeImages,
                 filterRegistries,
+                type,
+                branch,
+                imageName,
+                offset,
             });
         }
 

lib/logic/api/image.js

@@ -4,30 +4,41 @@ const { sendHttpRequest } = require('./helper');
 const filesize = require('filesize');
 const moment = require('moment');
 const Image = require('../entities/Image');
+const DEFAULTS = require('../../interface/cli/defaults');
 
 
-const _extractFieldsForImageEntity = (image, tag) => ({
-    name: image.imageDisplayName,
-    tag: tag.tag,
-    image_id: image.internalImageId.substring(0, 12),
-    created: moment(tag.created).fromNow(),
-    size: filesize(image.size),
-    pull: `${tag.registry}/${tag.repository}:${tag.tag}`,
-});
+const _extractFieldsForImageEntity = (image, tag) => {
+    const newImage = {
+        name: image.imageDisplayName,
+        size: filesize(image.size),
+    };
+    newImage.image_id = image.internalImageId ? image.internalImageId.substring(0, 12) : '';
+    if (_.isEqual(tag, '<none>')) {
+        newImage.tag = tag;
+        newImage.pull = '';
+        newImage.created = moment(image.created)
+            .fromNow();
+    } else {
+        newImage.tag = tag.tag;
+        newImage.pull = `${tag.registry}/${tag.repository}:${tag.tag}`;
+        newImage.created = moment(tag.created)
+            .fromNow();
+    }
+    return newImage;
+};
 
 
 const getAll = async (options) => {
     const qs = {
         limit: options.limit,
-        offset: 0,
+        offset: options.offset,
         metadata: options.labels,
+        type: options.type,
+        branch: options.branch,
+        imageDisplayNameRegex: options.imageName,
         select: 'internalName tags internalImageId created size imageDisplayName',
     };
 
-    if (!options.volumeImages) {
-        qs.metadata.cf_volume = false;
-    }
-
     if (options.sha) {
         qs.sha = options.sha;
     }
@@ -43,14 +54,22 @@ const getAll = async (options) => {
     }
     const res = [];
     _.forEach(images.docs, (image) => {
+        let addedCfCrTag = false;
         _.forEach(image.tags, (tag) => {
             // in case we are filtering by registries, ignore the image if it is not from the registires list
-            if (options.filterRegistries && options.filterRegistries.indexOf(tag.registry) === -1) {
+            if ((options.filterRegistries && options.filterRegistries.indexOf(tag.registry) === -1) || _.isEqual(tag.tag, 'volume')) {
                 return;
             }
+            if (DEFAULTS.CODEFRESH_REGISTRIES.indexOf(tag.registry) !== -1) {
+                addedCfCrTag = true;
+            }
             const data = _extractFieldsForImageEntity(image, tag);
             res.push(new Image(data));
         });
+        if (_.isEmpty(image.tags) || !addedCfCrTag) {
+            const data = _extractFieldsForImageEntity(image, '<none>');
+            res.push(new Image(data));
+        }
     });
     return res;
 };