Update pipeline V2 output entity

Author: Itai Gendler

examples/pipeline2-url.yml

@@ -1,5 +1,5 @@
-name: new-pipeline
-account: 59d33c4e9f75220a3710b2ee
+name: new-pipeline-url
+#account: 59d33c4e9f75220a3710b2ee
 metadata:
   labels:
     repo: github:ArikMaor/ping-server
@@ -9,7 +9,7 @@ spec:
       repo: ArikMaor/ping-server
       events: [push, pullrequest]
       branchRegex: '.'
-  contexts: ['lala']
+  contexts: []
   variables:
     - key: PORT
       value: 3000
@@ -19,4 +19,4 @@ spec:
       encrypted: true
   source:
     location: url
-    url: https://raw.githubusercontent.csom/ArikMaor/ping-server/master/codefresh.yml
+    url: https://raw.githubusercontent.com/codefresh-io/cli/master/codefresh.yml

examples/pipeline2.yml

@@ -1,5 +1,5 @@
 name: new-pipeline
-account: 59d33c4e9f75220a3710b2ee
+#account: 59d33c4e9f75220a3710b2ee
 metadata:
   labels:
     repo: github:ArikMaor/ping-server
@@ -9,7 +9,7 @@ spec:
       repo: ArikMaor/ping-server
       events: [push, pullrequest]
       branchRegex: '.'
-  contexts: ['lala']
+  contexts: []
   variables:
     - key: PORT
       value: 3000

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

@@ -80,6 +80,24 @@ const run = new Command({
             }
         }
 
+        let pipelineVersion = 'v1';
+        if (authManager.getCurrentContext()
+                .isBetaFeatEnabled()) {
+            try {
+                await pipeline.getPipelineById(pipelineId);
+            } catch (err) {
+                try {
+                    await pipeline2.getPipelineByName(pipelineId);
+                    pipelineVersion = 'v2';
+                } catch (err) {
+                    throw new CFError({
+                        message: `Passed pipeline id: ${pipelineId} does not exist`,
+                    });
+                }
+            }
+        }
+
+
         const executionRequests = [];
         const executionRequestTemplate = {
             pipelineId,
@@ -106,10 +124,10 @@ const run = new Command({
 
         _.forEach(executionRequests, async ({ pipelineId, options }) => {
             let workflowId;
-            if (!ObjectID.isValid(pipelineId)) {
-                workflowId = await pipeline2.runPipelineByName(pipelineId, options);
-            } else {
+            if (pipelineVersion === 'v1') {
                 workflowId = await pipeline.runPipelineById(pipelineId, options);
+            } else {
+                workflowId = await pipeline2.runPipelineByName(pipelineId, options);
             }
 
             if (executionRequests.length === 1) {

lib/interface/cli/commands/pipeline2/create.cmd.js

@@ -9,6 +9,7 @@ const createRoot = require('../root/create.cmd');
 const command = new Command({
     betaCommand: true,
     command: 'pipeline2 [name]',
+    aliases: ['pip2'],
     parent: createRoot,
     cliDocs: {
         description: 'Create a pipeline',

lib/interface/cli/commands/pipeline2/delete.cmd.js

@@ -10,6 +10,7 @@ const deleteRoot = require('../root/delete.cmd');
 const command = new Command({
     betaCommand: true,
     command: 'pipeline2 [name]',
+    aliases: ['pip2'],
     parent: deleteRoot,
     cliDocs: {
         description: 'Delete a pipeline',

lib/interface/cli/commands/pipeline2/replace.cmd.js

@@ -9,6 +9,7 @@ const replaceRoot = require('../root/replace.cmd');
 const command = new Command({
     betaCommand: true,
     command: 'pipeline2 [name]',
+    aliases: ['pip2'],
     parent: replaceRoot,
     cliDocs: {
         description: 'Replace a pipeline',

lib/logic/api/pipeline2.js

@@ -3,14 +3,26 @@ const CFError = require('cf-errors'); // eslint-disable-line
 const { sendHttpRequest } = require('./helper');
 const Pipeline = require('../entities/Pipeline2');
 
+const _extractFieldsForPipelineEntity = pipeline => ({
+    id: pipeline._id,
+    name: pipeline.name,
+    spec: pipeline.spec,
+});
+
 const getAll = async () => {
     const options = {
         url: '/api/pipelines/new',
         method: 'GET',
     };
 
-    const pipelines = await sendHttpRequest(options);
-    return pipelines.map(p => new Pipeline(p));
+    const result = await sendHttpRequest(options);
+    const pipelines = [];
+    _.forEach(result, (pipeline) => {
+        const data = _extractFieldsForPipelineEntity(pipeline);
+        pipelines.push(new Pipeline(data));
+    });
+
+    return pipelines;
 };
 
 const getPipelineByName = async (name) => {
@@ -19,8 +31,9 @@ const getPipelineByName = async (name) => {
         method: 'GET',
     };
 
-    const pipeline = await sendHttpRequest(options);
-    return new Pipeline(pipeline);
+    const result = await sendHttpRequest(options);
+    const data = _extractFieldsForPipelineEntity(result);
+    return new Pipeline(data);
 };
 
 const createPipeline = async (data) => {

lib/logic/entities/Pipeline2.js

@@ -5,8 +5,8 @@ class Pipeline2 extends Entity {
         super();
         this.entityType = 'pipeline2';
         this.info = data;
-        this.defaultColumns = ['id', 'name', 'imageName'];
-        this.wideColumns = ['id', 'name', 'imageName'];
+        this.defaultColumns = ['id', 'name'];
+        this.wideColumns = this.defaultColumns.concat([]);
     }
 }