@contrail/cli 1.0.30 → 1.0.32

package/src/auth/login.ts

@@ -5,151 +5,151 @@ import { Auth, AuthContext } from './auth';
 import { getConfig, storeConfig } from '../config/config';
 
 const CONFIGURATION = {
-    userPoolId: 'us-east-1_x8hXZUsL6',
-    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
+  userPoolId: 'us-east-1_x8hXZUsL6',
+  clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 
 export async function authUser(): Promise<AuthContext> {
-    console.debug("authorizing user")
-    const config = await getConfig();
-    if (
-        config &&
+  console.debug('authorizing user');
+  const config = await getConfig();
+  if (
+    config &&
         config.apiUserToken &&
         config.apiGateway &&
         config.orgSlug
-    ) {
-        console.debug("populating auth config from fs config")
-        Auth.config = {
-            apiUserToken: config.apiUserToken,
-            apiGateway: config.apiGateway,
-            orgSlug: config.orgSlug,
-        };
-        setSdkConfig(Auth.config);
-        try {
-            return await refreshCurrentUserOrg();
-        } catch (e) {
-            console.log("Token expired. Requesting auth credentials...")
-        }
-
-    }
-    const questions = [];
-    if (!process.env.CONTRAIL_CLI_EMAIL) {
-        questions.push({
-            type: 'input',
-            name: 'email',
-            validate: (val) => !!val,
-            message: 'Email',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_PASSWORD) {
-        questions.push({
-            type: 'password',
-            name: 'password',
-            validate: (val) => !!val,
-            message: 'Password',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_ORGSLUG) {
-        questions.push({
-            type: 'input',
-            name: 'orgSlug',
-            validate: (val) => !!val,
-            message: 'Org (slug)',
-        });
-    }
-
-    const answers = await inquirer.prompt(questions);
-    const params = {
-        email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
-        password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
-        orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
+  ) {
+    console.debug('populating auth config from fs config');
+    Auth.config = {
+      apiUserToken: config.apiUserToken,
+      apiGateway: config.apiGateway,
+      orgSlug: config.orgSlug,
     };
-    if (!params.email || !params.password) {
-        throw new Error('Email and Password required');
+    setSdkConfig(Auth.config);
+    try {
+      return await refreshCurrentUserOrg();
+    } catch (e) {
+      console.log('Token expired. Requesting auth credentials...');
     }
 
-    const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
-    };
+  }
+  const questions = [];
+  if (!process.env.CONTRAIL_CLI_EMAIL) {
+    questions.push({
+      type: 'input',
+      name: 'email',
+      validate: (val) => !!val,
+      message: 'Email',
+    });
+  }
+  if (!process.env.CONTRAIL_CLI_PASSWORD) {
+    questions.push({
+      type: 'password',
+      name: 'password',
+      validate: (val) => !!val,
+      message: 'Password',
+    });
+  }
+  if (!process.env.CONTRAIL_CLI_ORGSLUG) {
+    questions.push({
+      type: 'input',
+      name: 'orgSlug',
+      validate: (val) => !!val,
+      message: 'Org (slug)',
+    });
+  }
 
-    const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
-    const authData = {
-        Username: params.email,
-        Password: params.password,
-    };
+  const answers = await inquirer.prompt(questions);
+  const params = {
+    email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
+    password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
+    orgSlug: process.env.CONTRAIL_CLI_ORGSLUG || answers.orgSlug,
+  };
+  if (!params.email || !params.password) {
+    throw new Error('Email and Password required');
+  }
 
-    const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
-    const userData = {
-        Username: params.email,
-        Pool: userPool,
-    };
+  const poolData = {
+    UserPoolId: CONFIGURATION.userPoolId,
+    ClientId: CONFIGURATION.clientId,
+  };
+
+  const userPool = new AmazonCognitoIdentity.CognitoUserPool(poolData);
+  const authData = {
+    Username: params.email,
+    Password: params.password,
+  };
 
-    const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
+  const authDetails = new AmazonCognitoIdentity.AuthenticationDetails(authData);
+  const userData = {
+    Username: params.email,
+    Pool: userPool,
+  };
 
-    return new Promise((resolve, reject) => {
-        cognitoUser.authenticateUser(authDetails, {
-            onSuccess: async (result) => {
-                const user = result;
-                const config = await setAuthContext(user, params);
+  const cognitoUser = new AmazonCognitoIdentity.CognitoUser(userData);
 
-                resolve(config);
-            },
-            onFailure: (err) => {
-                reject(err);
-            },
-        });
+  return new Promise((resolve, reject) => {
+    cognitoUser.authenticateUser(authDetails, {
+      onSuccess: async (result) => {
+        const user = result;
+        const config = await setAuthContext(user, params);
+
+        resolve(config);
+      },
+      onFailure: (err) => {
+        reject(err);
+      },
     });
+  });
 }
 
 async function setAuthContext(user, params): Promise<AuthContext> {
-    const config = await getConfig();
-    let apiGateway;
-    console.log(config.environments)
-    if(config.environments) {
-        const questions = [];
-        questions.push({
-            type: 'list',
-            name: 'environment',
-            message: 'Which environment would you like to use?',
-            choices: Object.keys(config.environments),
-            default: Object.keys(config.environments)[0],
-        });
-        const answers = await inquirer.prompt(questions);
-        apiGateway = config.environments[answers.environment]
-    } else {
-        apiGateway = 'https://api.vibeiq.com/prod/api';
-    }
+  const config = await getConfig();
+  let apiGateway;
+  console.log(config.environments);
+  if(config.environments) {
+    const questions = [];
+    questions.push({
+      type: 'list',
+      name: 'environment',
+      message: 'Which environment would you like to use?',
+      choices: Object.keys(config.environments),
+      default: Object.keys(config.environments)[0],
+    });
+    const answers = await inquirer.prompt(questions);
+    apiGateway = config.environments[answers.environment];
+  } else {
+    apiGateway = 'https://api.vibeiq.com/prod/api';
+  }
 
-    // Set Auth Config
-    Auth.config = {
-        apiUserToken: user.idToken.jwtToken,
-        apiGateway,
-        orgSlug: params.orgSlug,
-    };
-    // SET SDK CONFIG
-    setSdkConfig(Auth.config);
+  // Set Auth Config
+  Auth.config = {
+    apiUserToken: user.idToken.jwtToken,
+    apiGateway,
+    orgSlug: params.orgSlug,
+  };
+  // SET SDK CONFIG
+  setSdkConfig(Auth.config);
 
-    return refreshCurrentUserOrg();
+  return refreshCurrentUserOrg();
 }
 
 async function refreshCurrentUserOrg() {
-    console.debug("refreshing current user org")
-    const currentUser = await Request.request('/users/current', {
-        method: 'GET',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-        },
-    });
-    if (!currentUser) {
-        throw Error('Could not get current user');
-    }
-    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
-    if (org) {
-        Auth.config.orgId = org.orgId || org.id;
-    }
-    // cache config in the fs
-    storeConfig(Object.assign({}, Auth.config))
-    return Object.assign({}, Auth.config);
-}
+  console.debug('refreshing current user org');
+  const currentUser = await Request.request('/users/current', {
+    method: 'GET',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+    },
+  });
+  if (!currentUser) {
+    throw Error('Could not get current user');
+  }
+  const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
+  if (org) {
+    Auth.config.orgId = org.orgId || org.id;
+  }
+  // cache config in the fs
+  storeConfig(Object.assign({}, Auth.config));
+  return Object.assign({}, Auth.config);
+}

package/src/cli.ts

@@ -7,9 +7,9 @@ import { UploadOptionSets } from './types/option-set-uploader';
 import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
 import { MergeOptionSets } from './types/option-set-merger';
 import { MergeTypeProperties } from './types/types-properties-merger';
-import { ParseTypesFromFiles, ParseTypesFromLocalFiles } from './types/parse-types';
+import { ParseTypesFromFiles, ParseTypesFromLocalFiles, ParseTypesFromTemplateFromLocalFiles } from './types/parse-types';
 import { loadColors, deleteColors } from './colors/color-loader';
-import {listConfig, removeConfig} from './config/configCommands'
+import {listConfig, removeConfig} from './config/configCommands';
 import {deleteWorkflowTemplate, deployWorkflowTemplate, listWorkflowTemplate} from './workflows/workflowCommands';
 const cliUsage = require('command-line-usage');
 
@@ -42,128 +42,132 @@ export async function cli(args) {
   command = commandParts[1];
 
   switch (domain) {
-    case 'app': {
-      switch (command) {
-        case 'create': {
-          create(args);
-          break;
-        }
-        case 'deploy': {
-          deployApp(args);
-          break;
-        }
-        case 'remove': {
-          removeApp(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
-      break;
-    }
-    case 'types': {
-      switch (command) {
-        case 'getAll': {
-          getTypes(args);
-          break;
-        }
-        case 'uploadTypes': {
-          uploadTypes(args);
-          break;
-        }
-        case 'uploadOptionSets': {
-          UploadOptionSets(args);
-          break;
-        }
-        case 'parseOptionSetsLocalFiles': {
-          ParseOptionSetsLocalFiles(args);
-          break;
-        }
-        case 'parseTypesFromLocalFiles': {
-          ParseTypesFromLocalFiles(args);
-          break;
-        }
-        case 'parseTypesFromFiles': {
-          ParseTypesFromFiles(args);
-          break;
-        }
-        case 'mergeOptionSets': {
-          MergeOptionSets(args);
-          break;
-        }
-        case 'mergeTypeProperties': {
-          MergeTypeProperties(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
+  case 'app': {
+    switch (command) {
+    case 'create': {
+      create(args);
       break;
     }
+    case 'deploy': {
+      deployApp(args);
+      break;
+    }
+    case 'remove': {
+      removeApp(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'types': {
+    switch (command) {
+    case 'getAll': {
+      getTypes(args);
+      break;
+    }
+    case 'uploadTypes': {
+      uploadTypes();
+      break;
+    }
+    case 'uploadOptionSets': {
+      UploadOptionSets(args);
+      break;
+    }
+    case 'parseOptionSetsLocalFiles': {
+      ParseOptionSetsLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromLocalFiles': {
+      ParseTypesFromLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromTemplateFromLocalFiles': {
+      ParseTypesFromTemplateFromLocalFiles(args);
+      break;
+    }
+    case 'parseTypesFromFiles': {
+      ParseTypesFromFiles(args);
+      break;
+    }
+    case 'mergeOptionSets': {
+      MergeOptionSets(args);
+      break;
+    }
+    case 'mergeTypeProperties': {
+      MergeTypeProperties(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
 
-    case 'colors': {
-      switch (command) {
-        case 'load': {
-          await loadColors();
-          break;
-        }
-        case 'delete': {
-          await deleteColors();
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
-      break;
-    }
-    case 'workflow-templates': {
-      switch (command) {
-        case 'load': {
-          await deployWorkflowTemplate();
-          break;
-        }
-        case 'delete': {
-          await deleteWorkflowTemplate();
-          break;
-        }
-        case 'list': {
-          await listWorkflowTemplate();
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
-      break;
-    }
-    case 'config': {
-      switch (command) {
-        case 'list': {
-          await listConfig();
-          break;
-        }
-        case 'remove': {
-          await removeConfig(args);
-          break;
-        }
-        default: {
-          printIllegalCommand();
-        }
-      }
-      break;
-    }
-    case 'help':
-    case '-help':
-    case '--help': {
-      printHelp();
+  case 'colors': {
+    switch (command) {
+    case 'load': {
+      await loadColors();
+      break;
+    }
+    case 'delete': {
+      await deleteColors();
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'workflow-templates': {
+    switch (command) {
+    case 'load': {
+      await deployWorkflowTemplate();
+      break;
+    }
+    case 'delete': {
+      await deleteWorkflowTemplate();
+      break;
+    }
+    case 'list': {
+      await listWorkflowTemplate();
       break;
     }
     default: {
       printIllegalCommand();
     }
+    }
+    break;
+  }
+  case 'config': {
+    switch (command) {
+    case 'list': {
+      await listConfig();
+      break;
+    }
+    case 'remove': {
+      await removeConfig(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+  case 'help':
+  case '-help':
+  case '--help': {
+    printHelp();
+    break;
+  }
+  default: {
+    printIllegalCommand();
+  }
   }
 }
 
@@ -235,16 +239,18 @@ const helpSections = [
       'parseOptionSetsLocalFiles <File Paths>  Parse CSV files into OptionSets',
       'parseTypesFromLocalFiles <File Paths>   Parse CSV files into Types and ',
       '.                                       OptionSets from local files.\n',
+      'parseTypesFromTemplateFromLocalFiles <File Paths> Parse CSV files into ',
+      '.                                       Types and OptionSets from local files.\n',
       'parseTypesFromFiles <fileIds>           Parse CSV files into Types and ',
       '.                                       OptionSets from VibeIQ Files.\n',
       'mergeOptionSets <File Path>             Merge the OptionSets from an existing',
-      '.                                       org and the OptionSets passed in.', 
+      '.                                       org and the OptionSets passed in.',
       '.                                       File must be .yml\n',
-      'mergeTypeProperties <File Path> <TypePaths> ', 
+      'mergeTypeProperties <File Path> <TypePaths> ',
       '.                                       Merge the TypeProperties from an existing',
       '.                                       org and the TypeProperties passed in.',
-      '.                                       Add to Types via TypePath', 
+      '.                                       Add to Types via TypePath',
       '.                                       File must be .yml\n',
     ],
   },
-];
+];

package/src/colors/color-loader.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { authUser } from '../auth/login';
 import { getSeparatorByPlatform } from '../common';
 
-const csv = require('csvtojson')
+const csv = require('csvtojson');
 
 interface Color {
   name: string;
@@ -17,7 +17,7 @@ export async function deleteColors() {
   try {
     await authUser();
     const colors = await getExistingColors();
-    console.log("Deleting %s colors", colors.length)
+    console.log('Deleting %s colors', colors.length);
     for (const color of colors) {
       await deleteColor(color);
     }
@@ -32,10 +32,10 @@ export async function deleteColors() {
 export async function loadColors() {
   try {
     await authUser();
-    console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
-    console.log(`%s Uploading`, chalk.yellow.bold('COLORS'));
+    console.log('%s Getting Existing Colors', chalk.yellow.bold('COLORS'));
+    console.log('%s Uploading', chalk.yellow.bold('COLORS'));
     await uploadColors();
-    console.log(`%s Uploaded`, chalk.yellow.bold('COLORS'));
+    console.log('%s Uploaded', chalk.yellow.bold('COLORS'));
 
   }
   catch (e) {
@@ -47,23 +47,23 @@ export async function loadColors() {
 }
 
 async function getLocalColors() {
-  console.log("loading colors from local file")
+  console.log('loading colors from local file');
   const TARGET_DIR = process.cwd();
   try {
     const separator = getSeparatorByPlatform();
 
-    const csvFilePath = TARGET_DIR + separator + 'colors.csv'
-    return await csv().fromFile(csvFilePath)
+    const csvFilePath = TARGET_DIR + separator + 'colors.csv';
+    return await csv().fromFile(csvFilePath);
   } catch (e) {
     throw new Error(`ERROR PARSING COLORS CSV: ${e}`);
   }
 }
 
 async function getExistingColors() {
-  console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+  console.log('%s Getting Existing Colors', chalk.yellow.bold('COLORS'));
   try {
     const result = await new Entities().get({ entityName: 'color', take: 3000}); //, useSearch: false }); Not in EntitiesClientGetOptions yet
-    console.log("Found %s existing colors", result.length)
+    console.log('Found %s existing colors', result.length);
     return result;
   } catch (e) {
     throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
@@ -81,10 +81,10 @@ async function deleteColor(color) {
 async function uploadColors() {
   const colors: Color[] = await getLocalColors();
   const existingColors = await getExistingColors();
-  const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name)
+  const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name);
   for (const color of colors) {
     if (existingNamesValues.includes(color.name)) {
-      console.log(`%s SKIPPING %s (%s)`, chalk.yellow.bold('COLORS'), color.hex, color.name);
+      console.log('%s SKIPPING %s (%s)', chalk.yellow.bold('COLORS'), color.hex, color.name);
       continue;
     }
     if (color.hex.length > 1 && color.hex[0] === '#') {
@@ -93,15 +93,15 @@ async function uploadColors() {
     const o: any = {
       hex: color.hex,
       name: color.name
-    }
+    };
     if (color.red) {
-      o.red = color.red
+      o.red = color.red;
     }
     if (color.green) {
-      o.green = color.green
+      o.green = color.green;
     }
     if (color.blue) {
-      o.blue = color.blue
+      o.blue = color.blue;
     }
 
     await new Entities().create({