reflect changes in cli also

Author: jsajal

packages/flowtest-cli/bin/index.js

@@ -56,7 +56,6 @@ const argv = yargs(hideBin(process.argv))
         });
     },
     async (argv) => {
-      console.log(`Reading file: ${argv.file}`);
       if (argv.file.toLowerCase().endsWith(`.flow`)) {
         let content = undefined;
         try {
@@ -79,9 +78,9 @@ const argv = yargs(hideBin(process.argv))
             argv.env ? getEnvVariables(argv.env) : {},
             logger,
           );
-          console.log(chalk.yellow('Running Flow \n'));
+          console.log(chalk.blue('Running Flow \n'));
           console.log(
-            chalk.blue(
+            chalk.yellow(
               'Right now CLI commands must be run from root directory of collection. We will gradually add support to run commands from anywhere inside the collection. \n',
             ),
           );
@@ -109,27 +108,43 @@ const argv = yargs(hideBin(process.argv))
             };
             const accessId = process.env.FLOWTEST_ACCESS_ID;
             const accessKey = process.env.FLOWTEST_ACCESS_KEY;
-            try {
-              const response = await axiosClient.post('/upload', data, {
-                headers: {
-                  'Content-Type': 'application/json',
-                  'x-access-id': accessId,
-                  'x-access-key': accessKey,
-                },
-              });
-              console.log(chalk.bold('Flow Scan: ') + chalk.dim(`${baseUrl}/scan/${response.data.data[0].id}`));
-            } catch (error) {
-              if (error?.response) {
-                if (error.response?.status >= 400 && error.response?.status < 500) {
-                  console.log(chalk.red(`   ${JSON.stringify(error.response?.data)}`));
-                }
+            if (!accessId || accessId.trim() === '' || !accessKey || accessKey.trim() === '') {
+              console.log(chalk.red(`   ✕ `) + chalk.dim('Unable to upload flow scan'));
+              console.log(
+                chalk.yellow(`Failed to detect access key pairs. Make sure to set environment variables properly.`),
+              );
+              console.log(chalk.yellow(`   export FLOWTEST_ACCESS_ID="<<FLOWTEST_ACCESS_ID>>"`));
+              console.log(chalk.yellow(`   export FLOWTEST_ACCESS_KEY="<<FLOWTEST_ACCESS_KEY>>"`));
+            } else {
+              try {
+                const response = await axiosClient.post('/upload', data, {
+                  headers: {
+                    'Content-Type': 'application/json',
+                    'x-access-id': accessId,
+                    'x-access-key': accessKey,
+                  },
+                });
+                console.log(chalk.bold('Flow Scan: ') + chalk.dim(`${baseUrl}/scan/${response.data.data[0].id}`));
+              } catch (error) {
+                if (error?.response) {
+                  if (error.response?.status >= 400 && error.response?.status < 500) {
+                    console.log(chalk.red(`   ${JSON.stringify(error.response?.data)}`));
+                  }
 
-                if (error.response?.status === 500) {
-                  console.log(chalk.red('   Internal Server Error'));
+                  if (error.response?.status === 500) {
+                    console.log(chalk.red('   Internal Server Error'));
+                  }
                 }
+                console.log(chalk.red(`   ✕ `) + chalk.dim('Unable to upload flow scan'));
               }
-              console.log(chalk.red(`   ✕ `) + chalk.dim('Unable to upload flow scan'));
             }
+          } else {
+            console.log('\n');
+            console.log(
+              chalk.yellow(
+                'Enable flow scans today to get more value our of your APIs. Get your access key pairs at https://flowtest-ai.vercel.app/ \n',
+              ),
+            );
           }
 
           process.exit(1);

packages/flowtest-cli/graph/compute/authnode.js

@@ -4,27 +4,33 @@ const chalk = require('chalk');
 const { LogLevel } = require('../GraphLogger');
 
 class authNode extends Node {
-  constructor(auth, envVariables, logger) {
+  constructor(nodeData, envVariables, logger) {
     super('authNode');
-    (this.auth = auth), (this.envVariables = envVariables);
+    (this.nodeData = nodeData), (this.envVariables = envVariables);
     this.logger = logger;
   }
 
   evaluate() {
     //console.log('Evaluating an auth node');
-    if (this.auth.type === 'basic-auth') {
+    if (this.nodeData.type === 'basic-auth') {
       console.log(chalk.green(`   ✓ `) + chalk.dim('.....setting basic authentication'));
       this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'Basic Authentication' } });
-      this.auth.username = computeVariables(this.auth.username, this.envVariables);
-      this.auth.password = computeVariables(this.auth.password, this.envVariables);
+      const username = computeVariables(this.nodeData.username, this.envVariables);
+      const password = computeVariables(this.nodeData.password, this.envVariables);
 
-      return this.auth;
+      return {
+        type: 'basic-auth',
+        username,
+        password,
+      };
     } else if (this.auth.type === 'no-auth') {
       console.log(chalk.green(`   ✓ `) + chalk.dim('.....using no authentication'));
       this.logger.add(LogLevel.INFO, '', { type: 'authNode', data: { authType: 'No Authentication' } });
-      return this.auth;
+      return {
+        type: 'no-auth',
+      };
     } else {
-      throw Error(`auth type: ${this.auth.type} is not valid`);
+      throw Error(`auth type: ${this.nodeData.type} is not valid`);
     }
   }
 }

packages/flowtest-cli/graph/compute/requestnode.js

@@ -161,7 +161,7 @@ class requestNode extends Node {
         headers: request.headers,
         // form data obj gets serialized here so that it can be sent over wire
         // otherwise ipc communication errors out
-        data: JSON.parse(JSON.stringify(request.data)),
+        data: request.data ? JSON.parse(JSON.stringify(request.data)) : request.data,
       };
 
       const result = await axios({