new tag/untag operations (#430)

* new tag/untag operations

* fix tests

* fix messages

* fix typi

* error processing

* update version

Co-authored-by: Itai Gendler <[email protected]>

Author: yaroslav-codefresh

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

@@ -72,7 +72,6 @@ describe('image commands', () => {
         it('should handle tagging', async () => {
             const argv = { id: 'some id', tags: ['tag'] };
             const responses = [
-                { statusCode: 200, body: { _id: 'some id' } },
                 DEFAULT_RESPONSE,
             ];
             request.__queueResponses(responses);
@@ -85,7 +84,6 @@ describe('image commands', () => {
         it('should handle removing tags', async () => {
             const argv = { id: 'some id', tags: ['tag'] };
             const responses = [
-                { statusCode: 200, body: { _id: 'some id', tags: [{ _id: 'tag id', tag: 'tag' }] } },
                 DEFAULT_RESPONSE,
             ];
             request.__queueResponses(responses);

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

@@ -8,7 +8,7 @@ const tag = new Command({
     command: 'tag <id> [tags..]',
     category: 'Images',
     description: 'Add an image tag',
-    usage: 'Tagging an image will result in the creation of a new Docker Image tag',
+    usage: 'Tagging an image will result in the creation of a new Docker Image tag. If registry not specified - default is used',
     webDocs: {
         category: 'Images',
         title: 'Tag Image',
@@ -25,21 +25,24 @@ const tag = new Command({
             .positional('names', {
                 description: 'Tag names',
             })
-            .example('codefresh tag 2dfacdaad466 1.0.0', "Tag image '2dfacdaad466' with a new tag: '1.0.0'")
+            .option('registry', {
+                alias: 'r',
+                description: 'Registry integration name',
+            })
+            .example('codefresh tag 2dfacdaad466 1.0.0', "Tag image '2dfacdaad466' with a new tag: '1.0.0' on default registry")
+            .example('codefresh tag 2dfacdaad466 1.0.0 --registry dockerhub', "Tag image '2dfacdaad466' with a new tag: '1.0.0' on dockerhub")
             .example('codefresh tag 2dfacdaad466 1.0.0 my-tag', "Tag image '2dfacdaad466' with multiple tags: '1.0.0' and 'my-tag'");
 
         return yargs;
     },
     handler: async (argv) => {
-        let id = argv.id;
+        const id = argv.id;
         const tags = argv.tags;
-
-        const result = await sdk.images.get({ id });
-        id = result._id;
+        const registry = argv.registry;
 
         await Promise.each(tags, async (tag) => {
-            await sdk.images.tag({ id, tag });
-            console.log(`Tag: ${tag} was added successfully to image: ${id}`);
+            await sdk.images.tag({ id, tag, registry });
+            console.log(`Tag "${tag}" was added successfully to image "${id}" on "${registry || 'default'}" registry`);
         });
     },
 });

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

@@ -8,6 +8,7 @@ const untag = new Command({
     command: 'untag <id> [tags..]',
     category: 'Images',
     description: 'Untag an image',
+    usage: 'Untagging an image will result in the removal of tag. If registry not specified - default is used',
     webDocs: {
         category: 'Images',
         title: 'Untag Image',
@@ -21,23 +22,24 @@ const untag = new Command({
             .positional('names', {
                 description: 'Tag names',
             })
-            .example('codefresh untag 2dfacdaad466 1.0.0', "Remove tag '1.0.0' from image '2dfacdaad466'")
+            .option('registry', {
+                alias: 'r',
+                description: 'Registry integration name',
+            })
+            .example('codefresh untag 2dfacdaad466 1.0.0', "Remove tag '1.0.0' from image '2dfacdaad466' on default registry")
+            .example('codefresh untag 2dfacdaad466 1.0.0 --registry dockerhub', "Remove tag '2dfacdaad466' with a new tag: '1.0.0' on dockerhub")
             .example('codefresh untag 2dfacdaad466 1.0.0 my-tag', "Remove tags '1.0.0' and 'my-tag' from image'2dfacdaad466'");
 
         return yargs;
     },
     handler: async (argv) => {
-        let id = argv.id;
+        const id = argv.id;
         const tags = argv.tags;
-
-        const result = await sdk.images.get({ id });
-        id = result._id;
+        const registry = argv.registry;
 
         await Promise.each(tags, async (tag) => {
-            const foundTag = _.find(result.tags, info => info.tag == tag); // eslint-disable-line
-            tag = foundTag && foundTag._id;
-            await sdk.images.untag({ id, tag });
-            console.log(`Tag: ${tag} was successfully removed from image: ${id}`);
+            await sdk.images.untag({ id, tag, registry });
+            console.log(`Tag "${tag}" was successfully removed from image "${id}" on "${registry || 'default'}" registry'`);
         });
     },
 });

lib/output/Output.js

@@ -64,9 +64,25 @@ class Output {
         if (isDebug()) {
             console.error(error.stack);
         } else {
-            console.error(`${error.toString()}`);
+            console.error(this._extractErrorMessage(error));
         }
     }
+
+    static _extractErrorMessage(error) {
+        if (_.isString(error.message)) {
+            try {
+                let json = JSON.parse(error.message);
+                if (_.isString(json)) {
+                    json = JSON.parse(json);
+                }
+                const message = json.message || error.message;
+                return message ? `Error: ${message}` : error.toString();
+            } catch (e) {
+                return error.toString();
+            }
+        }
+        return error.toString();
+    }
 }
 
 module.exports = Output;

openapi.json

@@ -4986,6 +4986,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "registry",
+            "in": "query",
+            "name": "registry",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -5019,6 +5028,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "registry",
+            "in": "query",
+            "name": "registry",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {

package.json

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