Add beta features (#82)

Author: ziv-codefresh

lib/interface/cli/Command.js

@@ -2,13 +2,15 @@ const yargs = require('yargs');
 const assert = require('assert');
 const _ = require('lodash');
 const { printError, wrapHandler } = require('./helpers/general');
+const authManager = require('../../logic').auth.manager;
 
 
 class Command {
     constructor(command) {
         this.root = command.root;
         delete command.root;
 
+        this.betaCommand = command.betaCommand || false;
         this.command = command;
         this.subCommands = [];
         this.builders = [];
@@ -26,6 +28,10 @@ class Command {
         return this.root;
     }
 
+    isBetaCommand() {
+        return this.betaCommand;
+    }
+
     addBuilder(b) {
         this.builders.push(b);
     }
@@ -44,7 +50,7 @@ class Command {
                 b(yargs);
                 _.forEach(this.subCommands, (subCommand) => {
                     // TODO use .toCommand here too
-                    if (subCommand instanceof Command) {
+                    if (subCommand instanceof Command && (!subCommand.isBetaCommand() || authManager.getCurrentContext().beta)) {
                         yargs.command(subCommand.toCommand());
                     } else {
                         yargs.command(subCommand);

lib/interface/cli/codefresh

@@ -21,16 +21,6 @@ process.on('unhandledRejection', error => {
 
 recursive(path.resolve(__dirname, 'commands'), (err, files) => {
     const rootCommands = [];
-
-    _.forEach(files, (file) => {
-        if (file.endsWith('.cmd.js')) {
-            const command = require(file);
-            if (command.isRoot()) {
-                rootCommands.push(command);
-            }
-        }
-    });
-
     yargs
         .env('')
         .options('cfconfig', {
@@ -40,15 +30,28 @@ recursive(path.resolve(__dirname, 'commands'), (err, files) => {
         .config('cfconfig', 'Custom path for authentication contexts config file', (configFilePath) => {
             try {
                 authManager.loadContexts(configFilePath, process.env.CF_API_KEY, process.env.CF_URL || DEFAULTS.URL);
+                if (_.isEmpty(authManager.getAllContexts())) {
+                    printError('Unauthorized error: Please create an authentication context (see codefresh auth create-context --help)');
+                    process.exit(1);
+                }
+                _.forEach(files, (file) => {
+                    if (file.endsWith('.cmd.js')) {
+                        const command = require(file);
+                        if (command.isRoot() && (!command.isBetaCommand() || authManager.getCurrentContext().beta)) {
+                            rootCommands.push(command);
+                        }
+                    }
+                });
+                _.forEach(rootCommands, (command) => {
+                    yargs.command(command.toCommand());
+                });
             } catch (err) {
                 printError(err);
                 process.exit(1);
             }
         });
 
-    _.forEach(rootCommands, (command) => {
-        yargs.command(command.toCommand());
-    });
+
 
 
     yargs // eslint-disable-line

lib/logic/auth/contexts/APIKeyContext.js

@@ -12,6 +12,7 @@ class APIKeyContext extends Context {
         this.token = options.token;
         this.name = options.name || this.name;
         this.defaultColumns = ['current', 'name', 'url'];
+        this.beta = options.beta || this.beta;
     }
 
     prepareHttpOptions() {
@@ -42,6 +43,7 @@ class APIKeyContext extends Context {
     serialize() {
         const data = {
             token: this.token,
+            beta: this.beta,
         };
 
         return _.assignIn(super.serialize(), data);
@@ -52,6 +54,7 @@ class APIKeyContext extends Context {
             name: rawContext.name,
             url: rawContext.url,
             token: rawContext.token,
+            beta: rawContext.beta,
         });
     }
 

lib/logic/auth/contexts/Context.js

@@ -5,6 +5,7 @@ class Context {
     constructor(options) {
         this.name = options.name || uuidv4();
         this.url = options.url;
+        this.beta = false;
     }
 
     setName(name) {

lib/logic/auth/contexts/JWTContext.js

@@ -19,6 +19,7 @@ class JWTContext extends Context {
         this.expires = new Date(options.expires * 1000);
         this.name = options.name || this.name;
         this.defaultColumns = ['current', 'name', 'url'];
+        this.beta = options.beta || this.beta;
     }
 
     _reCalculateName() {
@@ -65,6 +66,7 @@ class JWTContext extends Context {
             'user-id': this.userId,
             'account-id': this.accountId,
             expires: this.expires.getTime() / 1000,
+            beta: this.beta,
         };
 
         if (this.userName) {
@@ -89,6 +91,7 @@ class JWTContext extends Context {
             accountId: rawContext['account-id'],
             accountName: rawContext['account-name'],
             expires: rawContext.expires,
+            beta: rawContext.beta,
         });
     }