fix issues with image (#65)

Author: ziv-codefresh

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

@@ -67,7 +67,10 @@ const command = new Command({
         let images;
         // TODO:need to decide for one way for error handeling
         if (imageId) {
-            images = await image.getImageById(imageId);
+            images = await image.getImageById({
+                imageId,
+                allRegistries,
+            });
         } else {
             images = await image.getAll({
                 labels,

lib/logic/api/image.js

@@ -12,7 +12,7 @@ const _extractFieldsForImageEntity = (image, tag) => {
         name: image.imageDisplayName,
         size: filesize(image.size),
     };
-    newImage.image_id = image.internalImageId ? image.internalImageId.substring(0, 12) : '';
+    newImage.image_id = image.internalImageId ? image.internalImageId.substring(0, 12) : '\b';
     if (_.isEqual(tag, '<none>')) {
         newImage.tag = tag;
         newImage.pull = '';
@@ -28,6 +28,32 @@ const _extractFieldsForImageEntity = (image, tag) => {
 };
 
 
+const _extractImages = (image, options) => {
+    const res = [];
+    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) {
+            return;
+        }
+        if (_.isEqual(tag.tag, 'volume')) {
+            addedCfCrTag = true;
+            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;
+};
+
+
 const getAll = async (options) => {
     const qs = {
         limit: options.limit,
@@ -52,49 +78,27 @@ const getAll = async (options) => {
     if (_.isEmpty(images)) {
         throw new CFError('Error from server (NotFound): Images not found');
     }
-    const res = [];
+    let 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) {
-                return;
-            }
-            if (_.isEqual(tag.tag, 'volume')) {
-                addedCfCrTag = true;
-                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));
-        }
+        res = res.concat(_extractImages(image, options));
     });
     return res;
 };
 
-const getImageById = async (imageId) => {
-    const options = {
-        url: `/api/images/${encodeURIComponent(imageId)}`,
+const getImageById = async (options) => {
+    const id = options.imageId;
+    const RequestOptions = {
+        url: `/api/images/${encodeURIComponent(id)}`,
         method: 'GET',
     };
-    const image = await sendHttpRequest(options);
-    if (_.isEmpty(image)) {
-        throw new CFError(`Error from server (NotFound): Image ${imageId} not found`);
+    const image = await sendHttpRequest(RequestOptions);
+    if (!_.isEmpty(image)) {
+        const res = _extractImages(image, options);
+        if (!_.isEmpty(res)) {
+            return res;
+        }
     }
-    const res = [];
-    let data = {};
-    _.forEach(image.tags, (tag) => {
-        data = _extractFieldsForImageEntity(image, tag);
-        res.push(new Image(data));
-    });
-
-    return res;
+    throw new CFError(`Error from server (NotFound): Image ${id} not found`);
 };
 
 const getDockerImageId = async (imageDisplayName, tag) => {