Adding pipeline V2 beta commands (#51)

arikmaor · itai-codefresh · commit 4d936628805a · 2018-01-11T02:29:35.000+02:00
diff --git a/examples/pipeline2.yml b/examples/pipeline2.yml
@@ -0,0 +1,20 @@
+name: new-pipeline
+account: 59d33c4e9f75220a3710b2ee
+metadata:
+  labels:
+    repo: github:ArikMaor/ping-server
+spec:
+  variables:
+    - key: PORT
+      value: 3000
+      encrypted: false
+    - key: PAPA
+      value: BLA BLA
+      encrypted: true
+  steps:
+    test_step:
+      image: alpine
+      commands:
+      - echo "hello world"
+      - echo "plain value $PORT"
+      - echo "encrypted value $PAPA"
diff --git a/lib/interface/cli/Command.js b/lib/interface/cli/Command.js
@@ -50,7 +50,7 @@ class Command {
                 b(yargs);
                 _.forEach(this.subCommands, (subCommand) => {
                     // TODO use .toCommand here too
-                    if (subCommand instanceof Command && (!subCommand.isBetaCommand() || authManager.getCurrentContext().beta)) {
+                    if (subCommand instanceof Command && (!subCommand.isBetaCommand() || authManager.getCurrentContext().isBetaFeatEnabled())) {
                         yargs.command(subCommand.toCommand());
                     } else {
                         yargs.command(subCommand);
diff --git a/lib/interface/cli/codefresh b/lib/interface/cli/codefresh
@@ -52,16 +52,23 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
         });
 
 
-
-
     yargs // eslint-disable-line
         .completion()
         .demandCommand(1, 'You need at least one command before moving on')
         .wrap(null)
         .version(false)
         .help('help')
-        .option('help', {
-            global: false,
-        })
+        .epilogue(`
+  ___|           |       _|               |       ___| |    _ _|
+ |      _ \\   _\` |  _ \\ |    __| _ \\  __| __ \\   |     |      | 
+ |     (   | (   |  __/ __| |    __/\\__ \\ | | |  |     |      | 
+\\____|\\___/ \\__,_|\\___|_|  _|  \\___|____/_| |_| \\____|_____|___|
+ 
+ 
+For more information, find our official documentation at http://cli.codefresh.io                                                                
+`)
+        // .option('help', {
+        //     global: false,
+        // })
         .argv;
 });
diff --git a/lib/interface/cli/commands/pipeline2/create.cmd.js b/lib/interface/cli/commands/pipeline2/create.cmd.js
@@ -0,0 +1,44 @@
+const debug = require('debug')('codefresh:cli:create:pipelines2');
+const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
+const { prepareKeyValueFromCLIEnvOption } = require('../../helpers/general');
+const { pipeline2 } = require('../../../../logic').api;
+const createRoot = require('../root/create.cmd');
+
+const command = new Command({
+    betaCommand: true,
+    command: 'pipeline2 [name]',
+    description: 'Create a pipeline',
+    builder: (yargs) => {
+        return yargs
+            .positional('name', {
+                describe: 'Name of context',
+            });
+    },
+    handler: async (argv) => {
+        const {filename, name} = argv;
+
+        if (!filename) {
+            throw new CFError('Pipeline definitions file must be provided');
+        }
+
+        if (!filename.name && !name) {
+            throw new CFError('Name must be provided');
+        }
+
+        const data = argv.filename;
+        if (name) {
+            data.name = name;
+        }
+
+        await pipeline2.createPipeline(data);
+        console.log(`Pipeline '${data.name}' created`);
+    },
+});
+
+createRoot.subCommand(command);
+
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/pipeline2/delete.cmd.js b/lib/interface/cli/commands/pipeline2/delete.cmd.js
@@ -0,0 +1,31 @@
+const debug = require('debug')('codefresh:cli:create:pipelines2');
+const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
+const { pipeline2 } = require('../../../../logic').api;
+const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const deleteRoot = require('../root/delete.cmd');
+
+
+const command = new Command({
+    betaCommand: true,
+    command: 'pipeline2 [name]',
+    description: 'Deletes a pipeline',
+    builder: (yargs) => {
+        return yargs
+            .positional('name', {
+                describe: 'Pipeline name',
+            });
+    },
+    handler: async (argv) => {
+        const {name} = argv;
+
+        await pipeline2.deletePipelineByName(name);
+        console.log(`Pipeline '${name}' deleted.`);
+    },
+});
+deleteRoot.subCommand(command);
+
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/pipeline2/get.cmd.js b/lib/interface/cli/commands/pipeline2/get.cmd.js
@@ -0,0 +1,35 @@
+const debug = require('debug')('codefresh:cli:create:pipelines2');
+const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
+const { pipeline2 } = require('../../../../logic').api;
+const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const getRoot = require('../root/get.cmd');
+
+
+const command = new Command({
+    betaCommand: true,
+    command: 'pipelines2 [name]',
+    aliases: ['pip2', 'pipeline2'],
+    description: 'Get pipelines',
+    builder: (yargs) => {
+        return yargs
+            .positional('name', {
+                describe: 'Pipeline name',
+            });
+    },
+    handler: async (argv) => {
+        const {name, output} = argv;
+
+        if (name) {
+            specifyOutputForSingle(output, await pipeline2.getPipelineByName(name));
+        } else {
+            specifyOutputForArray(output, await pipeline2.getAll());
+        }
+    },
+});
+getRoot.subCommand(command);
+
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/pipeline2/replace.cmd.js b/lib/interface/cli/commands/pipeline2/replace.cmd.js
@@ -0,0 +1,44 @@
+const debug = require('debug')('codefresh:cli:create:pipelines2');
+const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
+const { prepareKeyValueFromCLIEnvOption } = require('../../helpers/general');
+const { pipeline2 } = require('../../../../logic').api;
+const replaceRoot = require('../root/replace.cmd');
+
+const command = new Command({
+    betaCommand: true,
+    command: 'pipeline2 [name]',
+    description: 'Replaces a pipeline',
+    builder: (yargs) => {
+        return yargs
+            .positional('name', {
+                describe: 'Name of context',
+            });
+    },
+    handler: async (argv) => {
+        const {filename, name} = argv;
+
+        if (!filename) {
+            throw new CFError('Pipeline definitions file must be provided');
+        }
+
+        if (!filename.name && !name) {
+            throw new CFError('Name must be provided');
+        }
+
+        const data = argv.filename;
+        if (name) {
+            data.name = name;
+        };
+
+        await pipeline2.replaceByName(data.name, data);
+        console.log(`Pipeline '${data.name}' updated`);
+    },
+});
+
+replaceRoot.subCommand(command);
+
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/pipeline2/run.cmd.js b/lib/interface/cli/commands/pipeline2/run.cmd.js
@@ -0,0 +1,31 @@
+const debug = require('debug')('codefresh:cli:create:pipelines2');
+const Command = require('../../Command');
+const CFError = require('cf-errors');
+const _ = require('lodash');
+const { pipeline2 } = require('../../../../logic').api;
+const { specifyOutputForSingle, specifyOutputForArray } = require('../../helpers/get');
+const runRoot = require('../workflow/run.cmd');
+
+
+const command = new Command({
+    betaCommand: true,
+    command: 'pipeline2 [name]',
+    description: 'Runs a pipeline',
+    builder: (yargs) => {
+        return yargs
+            .positional('name', {
+                describe: 'Pipeline name',
+            });
+    },
+    handler: async (argv) => {
+        const {name, output} = argv;
+
+        const buildId = await pipeline2.runPipelineByName(name);
+        console.log(`New build created for pipeline '${name}': ${buildId}`);
+    },
+});
+runRoot.subCommand(command);
+
+
+module.exports = command;
+
diff --git a/lib/interface/cli/commands/workflow/run.cmd.js b/lib/interface/cli/commands/workflow/run.cmd.js
@@ -3,10 +3,9 @@ const Command = require('../../Command');
 const _ = require('lodash');
 const CFError = require('cf-errors');
 const { prepareKeyValueFromCLIEnvOption, crudFilenameOption } = require('../../helpers/general');
-const { pipeline } = require('../../../../logic').api;
 const ObjectID = require('mongodb').ObjectID;
-const { log } = require('../../../../logic').api;
-const { workflow } = require('../../../../logic').api;
+const { workflow, pipeline, pipeline2, log } = require('../../../../logic').api;
+const authManager = require('../../../../logic').auth.manager;
 
 
 const run = new Command({
@@ -69,10 +68,15 @@ const run = new Command({
         const scale = argv['scale'];
         const variablesFromFile = argv['var-file'];
 
-        if (!ObjectID.isValid(pipelineId)) {
-            throw new CFError({
-                message: `Passed pipeline id: ${pipelineId} is not valid`,
-            });
+
+        if (!authManager.getCurrentContext()
+                .isBetaFeatEnabled()) {
+            // validate that passed pipeline id an a mongo object id in case of pipeline V1
+            if (!ObjectID.isValid(pipelineId)) {
+                throw new CFError({
+                    message: `Passed pipeline id: ${pipelineId} is not valid`,
+                });
+            }
         }
 
         const executionRequests = [];
@@ -101,8 +105,15 @@ const run = new Command({
             }
         }
 
-        _.forEach(executionRequests, async (request) => {
-            const workflowId = await pipeline.runPipelineById(request.pipelineId, request.options);
+        _.forEach(executionRequests, async ({ pipelineId, options }) => {
+            let workflowId;
+            if (authManager.getCurrentContext()
+                    .isBetaFeatEnabled()) {
+                workflowId = await pipeline2.runPipelineByName(pipelineId, options);
+            } else {
+                workflowId = await pipeline.runPipelineById(pipelineId, options);
+            }
+
             if (executionRequests.length === 1) {
                 if (argv.detach) {
                     console.log(workflowId);
diff --git a/lib/logic/api/index.js b/lib/logic/api/index.js
@@ -1,5 +1,6 @@
 const user = require('./user');
 const pipeline = require('./pipeline');
+const pipeline2 = require('./pipeline2');
 const context = require('./context');
 const image = require('./image');
 const composition = require('./composition');
@@ -10,6 +11,7 @@ const log = require('./log');
 module.exports = {
     user,
     pipeline,
+    pipeline2,
     context,
     image,
     composition,
diff --git a/lib/logic/api/pipeline2.js b/lib/logic/api/pipeline2.js
@@ -0,0 +1,77 @@
+const _ = require('lodash'); // eslint-disable-line
+const CFError = require('cf-errors'); // eslint-disable-line
+const { sendHttpRequest } = require('./helper');
+const Pipeline = require('../entities/Pipeline2');
+
+const getAll = async () => {
+    const options = {
+        url: '/api/pipelines/new',
+        method: 'GET',
+    };
+
+    const pipelines = await sendHttpRequest(options);
+    return pipelines.map(p => new Pipeline(p));
+};
+
+const getPipelineByName = async (name) => {
+    const options = {
+        url: `/api/pipelines/new/${name}`,
+        method: 'GET',
+    };
+
+    const pipeline = await sendHttpRequest(options);
+    return new Pipeline(pipeline);
+};
+
+const createPipeline = async (data) => {
+    const options = {
+        url: '/api/pipelines/new',
+        method: 'POST',
+        body: data,
+    };
+
+    return sendHttpRequest(options);
+};
+
+const replaceByName = async (name, data) => {
+    const body = data;
+
+    const options = {
+        url: `/api/pipelines/new/${name}`,
+        method: 'PUT',
+        body,
+    };
+
+    return sendHttpRequest(options);
+};
+
+const deletePipelineByName = async (name) => {
+    const options = {
+        url: `/api/pipelines/new/${name}`,
+        method: 'DELETE',
+    };
+
+    return sendHttpRequest(options);
+};
+
+const runPipelineByName = async (name, data) => {
+
+    const body = _.pick(data, 'variables', 'branch');
+
+    const options = {
+        url: `/api/pipelines/new/run/${name}`,
+        method: 'POST',
+        body
+    };
+
+    return sendHttpRequest(options);
+};
+
+module.exports = {
+    getAll,
+    getPipelineByName,
+    createPipeline,
+    replaceByName,
+    deletePipelineByName,
+    runPipelineByName,
+};
diff --git a/lib/logic/auth/contexts/Context.js b/lib/logic/auth/contexts/Context.js
diff --git a/lib/logic/entities/Pipeline2.js b/lib/logic/entities/Pipeline2.js
diff --git a/package.json b/package.json
