Support ability to use local volume when running the pipeline --localy (#262)

Author: oren-codefresh

lib/interface/cli/commands/pipeline/run.cmd.js

@@ -8,11 +8,17 @@ const authManager = require('../../../../logic').auth.manager;
 const Docker = require('dockerode');
 const { validatePipelineYaml } = require('../../helpers/validation');
 const { printResult } = require('../root/validate.cmd');
-
+const DEFAULTS = require('../../defaults');
+const path = require('path');
 const regex = /##[0-9a-f]{24}##/i;
 const imageName = 'codefresh/engine:master';
 
 
+function _customizer(objValue, srcValue) {
+    if (Array.isArray(objValue)) {
+        return _.compact(objValue.concat(srcValue));
+    }
+}
 const run = new Command({
     root: true,
     command: 'run <name>',
@@ -70,6 +76,10 @@ const run = new Command({
                 type: Boolean,
                 default: false,
             })
+            .option('local-volume', {
+                describe: 'Use your file system as volume in local run',
+                alias: 'vl',
+            })
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master', 'Defining the source control context using a branch')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -s=52b992e783d2f84dd0123c70ac8623b4f0f938d1', 'Defining the source control context using a commit')
             .example('codefresh run PIPELINE_ID | PIPELINE_NAME -b=master -v key1=value1 -v key2=value2', 'Setting variables through the command')
@@ -99,9 +109,10 @@ const run = new Command({
         const enableNotifications = argv['enable-notifications'];
         const resetVolume = argv['reset-volume'];
         const variablesFromFile = argv['var-file'];
-        const contexts = argv['context'];
-        const userYamlDescriptor = argv['yaml'];
+        const contexts = argv.context;
+        const userYamlDescriptor = argv.yaml;
         const local = argv.local;
+        const localVolume = argv['local-volume'] === true ? path.join(DEFAULTS.CODEFRESH_PATH, pipelineName) : argv['local-volume'];
 
         try {
             await pipeline.getPipelineByName(pipelineName);
@@ -118,26 +129,48 @@ const run = new Command({
 
         if (local) {
             const docker = new Docker();
+            const cleanupActions = [];
+            const injectedOpts = {};
+            // TODO : Move to per command's handler so each command will be handled in a seperate handler
+            if (userYamlDescriptor) {
+                injectedOpts.Env = [`OVERRIDE_WORKFLOW_YAML=${userYamlDescriptor}`];
+            }
+
+            console.log(`Updating Codefresh engine ==>`);
             docker.pull(imageName, (err, stream) => {
                 docker.modem.followProgress(stream, onFinished, onProgress);
                 function onFinished(err) {
                     if (!err) {
-                        console.log('\nDone pulling.');
+                        console.log('Finished Update.\n');
+
+                        if (localVolume) {
+                            injectedOpts.Env = [`EXTERNAL_WORKSPACE=${localVolume}`];
+                            console.log(`\nUsing ${localVolume} as a local volume.\n`);
+                        }
+
                         const currentContext = authManager.getCurrentContext();
-                        docker.run(imageName, [], [], {
+                        console.log(`Running pipeline: ${pipelineName}`);
+
+                        docker.run(imageName, [], [], _.mergeWith({
                             Env: [
                                 `ACCESS_TOKEN=${currentContext.token}`,
                                 `PIPELINE_ID=${pipelineName}`, `BRANCH=${branch}`,
                                 `CF_HOST=${currentContext.url}`,
                                 'DOCKER_SOCKET_PATH=/var/run/docker.sock',
-                                userYamlDescriptor && `OVERRIDE_WORKFLOW_YAML=${userYamlDescriptor}`,
                             ],
                             Hostconfig: {
                                 Binds: [
                                     '/var/run/docker.sock:/var/run/docker.sock',
                                 ],
                             },
-                        }, (err, data) => {
+                        }, injectedOpts, _customizer), (err, data) => {
+                            cleanupActions.forEach((action) => {
+                                try {
+                                    action();
+                                } catch (error) {
+                                    console.error(err);
+                                }
+                            });
                             if (err) {
                                 return console.error(err);
                             }
@@ -158,8 +191,10 @@ const run = new Command({
                         process.exit(1);
                     }
                 }
-                function onProgress() {
-                    stream.pipe(process.stdout);
+                function onProgress(res) {
+                    if (_.get(res, 'status')) {
+                        console.log(res.status);
+                    }
                 }
             });
         } else {

lib/logic/auth/contexts/Context.js

@@ -26,6 +26,9 @@ class Context {
             this.status = 'Valid';
         } catch (err) {
             this.status = 'Revoked';
+            if (err.code === 'ECONNREFUSED') {
+                this.status = 'Cant connect to server';
+            }
         }
     }
 

package.json

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