Move pipeline name under metadata

Author: arikmaor

examples/pipeline2.yml

@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: pipeline
-name: new-pipeline
 metadata:
+  name: new-pipeline
   labels:
     repo: ArikMaor/ping-server
+    appPort: 3000
 spec:
   triggers:
     - type: scm

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

@@ -31,17 +31,17 @@ const command = new Command({
             throw new CFError('Pipeline definitions file must be provided');
         }
 
-        if (!filename.name && !name) {
+        if (!_.get(filename, 'metadata.name') && !name) {
             throw new CFError('Name must be provided');
         }
 
         const data = argv.filename;
         if (name) {
-            data.name = name;
+            _.set(data, 'metadata.name', name);
         }
 
         await pipeline2.createPipeline(data);
-        console.log(`Pipeline '${data.name}' created`);
+        console.log(`Pipeline '${data.metadata.name}' created`);
     },
 });
 

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

@@ -31,17 +31,17 @@ const command = new Command({
             throw new CFError('Pipeline definitions file must be provided');
         }
 
-        if (!filename.name && !name) {
+        if (!_.get(filename, 'metadata.name') && !name) {
             throw new CFError('Name must be provided');
         }
 
         const data = argv.filename;
         if (name) {
-            data.name = name;
+            _.set(data, 'metadata.name', name);
         };
 
-        await pipeline2.replaceByName(data.name, data);
-        console.log(`Pipeline '${data.name}' updated`);
+        await pipeline2.replaceByName(data.metadata.name, data);
+        console.log(`Pipeline '${data.metadata.name}' updated`);
     },
 });
 

lib/logic/api/pipeline2.js

@@ -5,7 +5,6 @@ const Pipeline = require('../entities/Pipeline2');
 
 const _extractFieldsForPipelineEntity = pipeline => ({
     id: pipeline.id,
-    name: pipeline.name,
     metadata: pipeline.metadata,
     spec: pipeline.spec,
 });

lib/logic/entities/Entity.js

@@ -1,5 +1,5 @@
 const yaml = require('js-yaml');
-
+const _ = require('lodash');
 class Entity {
     // get all the information about the entity
     getInfo() {
@@ -30,7 +30,7 @@ class Entity {
     extractValues(columns) {
         const values = {};
         columns.forEach((key) => {
-            values[key] = this.info[key];
+            values[key.replace(/^.*\./, '')] = _.get(this.info, key);
         });
         return values;
     }

lib/logic/entities/Pipeline2.js

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