fix runtime environment modle (#201)

Author: ziv-codefresh

lib/interface/cli/commands/runtimeEnvironments/get.cmd.js

@@ -2,6 +2,8 @@ const debug = require('debug')('codefresh:cli:create:pipelines2');
 const Command = require('../../Command');
 const _ = require('lodash');
 const { runtimeEnvironments } = require('../../../../logic/index').api;
+const { specifyOutputForSingle } = require('../../helpers/get');
+
 
 const getRoot = require('../root/get.cmd');
 
@@ -25,27 +27,32 @@ const command = new Command({
             .positional('version', {
                 describe: 'Runtime environments version',
             })
+            /*
             .option('account', {
-                describe: 'Return a specific account configuration from the current runtime environments by his name',
+                describe: 'Return a specific account configuration by the given name from the current runtime environments',
             })
+            */
             .option('history', {
                 describe: 'Return all the history of the specific runtime environments',
                 type: 'boolean',
             });
     },
     handler: async (argv) => {
         const { name, version, history, account } = argv;
-        let currruntimeEnvironments;
-        if (account) {
-            currruntimeEnvironments = await runtimeEnvironments.getRuntimeEvironment(account);
-        } else {
-            currruntimeEnvironments = await runtimeEnvironments.getRuntimeEvironmentsByName({
+        if (history){
+            const allHistory = await runtimeEnvironments.getRuntimeEvironmentsHistory({
+                name,
+            });
+            console.log(JSON.stringify(allHistory, null, '\t'));
+
+        }
+        else {
+            const currruntimeEnvironments = await runtimeEnvironments.getRuntimeEvironmentsByName({
                 name,
                 version,
-                history,
             });
+            specifyOutputForSingle(argv.output, currruntimeEnvironments);
         }
-        console.log(JSON.stringify(currruntimeEnvironments, null, '\t'));
     },
 });
 

lib/logic/api/runtimeEnvironments.js

@@ -3,23 +3,27 @@ const { sendHttpRequest } = require('./helper');
 const RuntimeEnvironments = require('../entities/RuntimeEnvironments');
 
 
-const _extractFieldsForRuntimeEnvironmentsEntity = (runtimeEnvironments) => {
-    return {
-        id: runtimeEnvironments.id,
-        name: runtimeEnvironments.name,
-        version: runtimeEnvironments.version,
-        userName : runtimeEnvironments.userName,
-        runtimeEnvironments: runtimeEnvironments.runtimeEnvironments,
-        history : runtimeEnvironments.history,
-    };
-};
-
+const _extractFieldsForRuntimeEnvironmentEntity = runtimeEnv => _.pick(runtimeEnv, '_id', 'version', 'metadata', 'runtimeEnvironments', 'history');
 
 const getRuntimeEvironmentsByName = async (option) => {
     const qs = {
         name: option.name,
         version: option.version,
-        history: option.history,
+    };
+    const options = {
+        url: '/api/admin/runtime-environment-manager/runtimeEnvironmentsName',
+        method: 'GET',
+        qs,
+    };
+    const runtimeEnvironments = await sendHttpRequest(options);
+    const runtimeObj = new RuntimeEnvironments(_extractFieldsForRuntimeEnvironmentEntity(runtimeEnvironments));
+    return runtimeObj;
+};
+
+const getRuntimeEvironmentsHistory = async (option) => {
+    const qs = {
+        name: option.name,
+        history: true,
     };
     const options = {
         url: '/api/admin/runtime-environment-manager/runtimeEnvironmentsName',
@@ -54,6 +58,7 @@ const replaceByName = async (runtimeEnvironmentName, data) => {
 
 module.exports = {
     getRuntimeEvironmentsByName,
+    getRuntimeEvironmentsHistory,
     replaceByName,
     getRuntimeEvironment,
 };

lib/logic/entities/RuntimeEnvironments.js

@@ -1,10 +1,16 @@
 const Entity = require('./Entity');
+const _ = require('lodash');
 
 class RuntimeEnvironments extends Entity {
     constructor(data) {
         super();
         this.entityType = 'RuntimeEnvironments';
         this.info = data;
+        this.id = _.get(data, '_id');
+        this.name = _.get(data, 'metadata.name');
+        this.last_updated_by = _.get(data, 'metadata.userName');
+        this.defaultColumns = ['id', 'version', 'name', 'last_updated_by'];
+        this.wideColumns = this.defaultColumns.concat([]);
     }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.8.57",
+  "version": "0.8.58",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
@@ -71,5 +71,8 @@
   "license": "ISC",
   "engines": {
     "node": ">8.0.0"
+  },
+  "yargs": {
+    "boolean-negation": false
   }
 }