do not filter by specific registries, let api do it (#420)

Author: itai-codefresh

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

@@ -1,5 +1,4 @@
 const Command = require('../../Command');
-const { prepareKeyValueFromCLIEnvOption } = require('../../helpers/general');
 const { parseFamiliarName } = require('@codefresh-io/docker-reference');
 const annotateRoot = require('../root/annotate.cmd');
 const CFError = require('cf-errors');
@@ -33,7 +32,6 @@ const command = new Command({
     handler: async (argv) => {
         let dockerImageId = argv.id;
         const useFullName = dockerImageId.includes(':');
-        const annotations = prepareKeyValueFromCLIEnvOption(argv.label);
 
         if (useFullName) {
             const { repository, tag } = parseFamiliarName(dockerImageId);
@@ -54,7 +52,6 @@ const command = new Command({
             dockerImageId = results[0].internalImageId;
         }
 
-        await sdk.images.upsertMetadata({ dockerImageId }, annotations);
         await annotationLogic.createAnnotations({ entityId: dockerImageId, entityType: 'image', labels: argv.label });
         console.log('Annotations added successfully');
     },

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

@@ -72,7 +72,7 @@ const command = new Command({
             .example('codefresh get images -l key1=value1', "Get all images that are annotated with 'value1' for 'key1'");
     },
     handler: async (argv) => {
-        const imageIds = argv.id;
+        const imageIds = _.uniq(argv.id);
         const labels = prepareKeyValueFromCLIEnvOption(argv.label);
         const tags = argv.tag;
         const sha = argv.sha;
@@ -82,18 +82,24 @@ const command = new Command({
         const allRegistries = argv.all;
         const offset = (argv.page - 1) * limit;
         const imageName = argv['image-name'];
-        let filterRegistries;
+
+        let imageRepo;
         if (!allRegistries) {
-            filterRegistries = DEFAULTS.CODEFRESH_REGISTRIES;
+            imageRepo = DEFAULTS.INTERNAL_REGISTRY_PREFIX;
         }
 
         let images = [];
         // TODO:need to decide for one way for error handeling
         if (!_.isEmpty(imageIds)) {
-            images = await Promise.map(imageIds, id => sdk.images.get({
-                id,
-                allRegistries,
+            images = await Promise.map(imageIds, id => sdk.images.list({
+                filter: { internalImageId: id },
+                limit: 100,
+                select: IMAGE_FIELDS_TO_SELECT,
             }));
+            images = _.chain(images)
+                .map('docs')
+                .flatten()
+                .value();
         } else {
             images = await sdk.images.list({
                 metadata: labels,
@@ -105,10 +111,11 @@ const command = new Command({
                 imageDisplayNameRegex: imageName,
                 offset,
                 select: IMAGE_FIELDS_TO_SELECT,
+                ...(imageRepo && { imageRepo }),
             });
             images = images.docs;
         }
-        Output.print(extractImages(images, filterRegistries));
+        Output.print(extractImages(images));
     },
 });
 

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

@@ -98,15 +98,14 @@ describe('image commands', () => {
         it('should handle annotating given docker image id', async () => {
             const argv = { id: 'some id', label: ['test=test'] };
             await annotateCmd.handler(argv);
-            await verifyResponsesReturned([DEFAULT_RESPONSE, DEFAULT_RESPONSE]); // eslint-disable-line
+            await verifyResponsesReturned([DEFAULT_RESPONSE]); // eslint-disable-line
         });
 
         it('should handle annotating given full image name', async () => {
             const argv = { id: 'repo/name:tag', label: ['test=test'] };
             const responses = [
                 { statusCode: 200, body: [{ internalImageId: 'some id' }] },
                 DEFAULT_RESPONSE,
-                DEFAULT_RESPONSE,
             ];
             request.__queueResponses(responses);
             await annotateCmd.handler(argv);

lib/interface/cli/defaults.js

@@ -8,7 +8,7 @@ const DEFAULTS = {
     GET_LIMIT_RESULTS: 25,
     GET_ALL_PIPELINES_LIMIT: 10000,
     GET_PAGINATED_PAGE: 1,
-    CODEFRESH_REGISTRIES: ['r.cfcr.io', '192.168.99.100:5000'],
+    INTERNAL_REGISTRY_PREFIX: 'CFCR',
     WATCH_INTERVAL_MS: 3000,
     MAX_CONSECUTIVE_ERRORS_LIMIT: 10,
     CODEFRESH_PATH: path.resolve(homedir(), '.Codefresh'),

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

@@ -61,26 +61,6 @@ describe('helpers unit tests', () => {
                 ]);
             });
 
-            it('should filter tags by registries', () => {
-                expect(extractImages([
-                    {
-                        tags: [
-                            { tag: 'banana', registry: 'filtered' },
-                            { tag: 'beer', registry: 'r.cfcr.io' },
-                        ],
-                    },
-                    {
-                        tags: [
-                            { tag: 'banana', registry: 'r.cfcr.io' },
-                            { tag: 'beer', registry: 'filtered' },
-                        ],
-                    },
-                ], ['r.cfcr.io'])).toEqual([
-                    { tag: 'beer' },
-                    { tag: 'banana' },
-                ]);
-            });
-
             it('should filter images tagged as "volume"', () => {
                 expect(extractImages([
                     {

lib/interface/cli/helpers/image.js

@@ -14,8 +14,8 @@ class ImagesHelper {
 
     extractFieldsForImageEntity(image, tag){
         const newImage = {
-            name: image.imageDisplayName,
-            size: filesize(image.size),
+            name: image.imageDisplayName || image.imageName,
+            size: image.size && filesize(image.size),
             sha: image.sha,
             annotations: _.get(image, 'metadata', {}),
             tagId: tag._id,
@@ -33,30 +33,24 @@ class ImagesHelper {
     }
 
 
-    extractImages(images, filterRegistries) {
+    extractImages(images) {
         if (!_.isArray(images)) {
             images = [images]; // eslint-disable-line no-param-reassign
         }
         return _.chain(images)
             .map((image) => {
                 const res = [];
-                let addedCfCrTag = false;
+                let volumeImage = false;
                 _.forEach(image.tags, (tag) => {
                     if (_.isEqual(tag.tag, 'volume')) {
-                        addedCfCrTag = true;
+                        volumeImage = true;
                         return;
                     }
-                    // in case we are filtering by registries, ignore the image if it is not from the registires list
-                    if (filterRegistries && !_.includes(filterRegistries, tag.registry)) {
-                        return;
-                    }
-                    if (_.includes(DEFAULTS.CODEFRESH_REGISTRIES, tag.registry)) {
-                        addedCfCrTag = true;
-                    }
+
                     const data = this.extractFieldsForImageEntity(image, tag);
                     res.push(new Image(data));
                 });
-                if (_.isEmpty(image.tags) || !addedCfCrTag) {
+                if (_.isEmpty(image.tags) && !volumeImage) {
                     const data = this.extractFieldsForImageEntity(image, NONE_TAG);
                     res.push(new Image(data));
                 }

openapi.json

@@ -4862,6 +4862,20 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "in": "query",
+            "name": "imageRepo",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "filter",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "summary": "List",

package.json

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