@contrail/cli 1.0.66 → 1.0.68

package/lib/apps/create-app/create.js

@@ -17,7 +17,7 @@ function parseArgumentsIntoOptions(rawArgs) {
     };
 }
 async function promptForMissingOptions(options) {
-    const defaultTemplate = 'JavaScript';
+    const defaultTemplate = 'TypeScript';
     const questions = [];
     if (!options.appName) {
         questions.push({
@@ -32,7 +32,7 @@ async function promptForMissingOptions(options) {
             type: 'list',
             name: 'template',
             message: 'Which project template would you like to use?',
-            choices: ['JavaScript', 'TypeScript'],
+            choices: ['TypeScript', 'JavaScript'],
             default: defaultTemplate,
         });
     }

package/lib/cli.js

@@ -3,7 +3,7 @@ import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getAll } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
-import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
+import { ParseOptionSetsLocalFiles, ParseOptionSetsToFolderStructure } from './types/option-set-parser';
 import { ParseOptionSetsHierarchyLocalFile, UploadOptionSetsHierarchyLocalFile } from './types/option-set-hierarchy-parser';
 import { ExportOptionSetsHierarchies } from './types/option-set-hierarchy-exporter';
 import { MergeOptionSets } from './types/option-set-merger';
@@ -23,6 +23,8 @@ import { uploadRuleSets } from './types/rule-set-uploader';
 import { UploadOptionSetHierarchies } from './types/option-set-hierarchy-uploader';
 import { uploadTypePropertyPolicies } from './types/type-property-policy-uploader';
 import { uploadAll } from './types/allUploader';
+import { ExportUsers } from './users/user-exporter';
+import { UploadUsers } from './users/user-uploader';
 const cliUsage = require('command-line-usage');
 /**
  *  Built using documentation here:
@@ -103,6 +105,10 @@ export async function cli(args) {
                     ParseOptionSetsLocalFiles(args);
                     break;
                 }
+                case 'parseOptionSetsToFolderStructure': {
+                    ParseOptionSetsToFolderStructure(args);
+                    break;
+                }
                 case 'parseOptionSetsHierarchyLocalFile': {
                     ParseOptionSetsHierarchyLocalFile(args);
                     break;
@@ -213,6 +219,22 @@ export async function cli(args) {
             }
             break;
         }
+        case 'users': {
+            switch (command) {
+                case 'export': {
+                    await ExportUsers();
+                    break;
+                }
+                case 'import': {
+                    await UploadUsers();
+                    break;
+                }
+                default: {
+                    printIllegalCommand();
+                }
+            }
+            break;
+        }
         case 'workflow-templates': {
             switch (command) {
                 case 'load': {
@@ -372,6 +394,19 @@ const helpSections = [
             }
         ],
     },
+    {
+        header: 'Users Commands - Domain: users',
+        content: [
+            {
+                name: 'export',
+                summary: 'Export all users in the org.'
+            },
+            {
+                name: 'import',
+                summary: 'Import all users in the users.yml file.'
+            }
+        ],
+    },
     {
         header: 'Workflow Template Commands - Domain: workflow-templates',
         content: [
@@ -414,11 +449,15 @@ const helpSections = [
             },
             {
                 name: 'uploadOptionSets',
-                summary: 'Upload OptionSets for your Org. OptionSets are loaded from option_sets.yml\n'
+                summary: 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.\n'
+            },
+            {
+                name: 'parseOptionSetsLocalFiles <File Paths> <style>',
+                summary: 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for name and label, use "NameAndLabel". If the file has one column for each option set with the rows being the label value use "LabelsInColumn"\n'
             },
             {
-                name: 'parseOptionSetsLocalFiles <File Paths>',
-                summary: 'Parse CSV files into OptionSets.\n'
+                name: 'parseOptionSetsToFolderStructure <File Path>',
+                summary: 'Parse single yml file into a folder with separate files per option set.\n'
             },
             {
                 name: 'parseOptionSetsHierarchyLocalFile <File Path>',
@@ -476,6 +515,10 @@ const helpSections = [
                 name: 'mergeTypeProperties <File Path> <TypePaths>',
                 summary: 'Merge the TypeProperties from an existing org and the TypeProperties passed in. Add to Types via TypePath File must be .yml\n'
             },
+            {
+                name: 'mergeOptionSets <File Path>',
+                summary: 'Merge the OptionSets from an existing org and the OptionSets passed in. OptionSets File must be .yml.',
+            },
         ],
     },
 ];

package/lib/types/option-set-merger.js

@@ -28,7 +28,7 @@ function loadOptionSets(fileLocation) {
         const fullPath = TARGET_DIR + separator + fileLocation;
         console.log('Getting file from path: ', fullPath);
         const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
-        return doc.optionSets;
+        return doc;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -76,20 +76,23 @@ async function mergeOptionSets(fileLocation) {
             mergedOptionSets.push(currentOptionSet);
         }
     }
-    saveData({ optionSets: mergedOptionSets });
+    saveData(mergedOptionSets);
 }
 function mergeOptionSet(existingOptionSet, uploadedOptionSet) {
+    var _a;
     const merged = {
         name: uploadedOptionSet.name,
         optionSet: uploadedOptionSet.optionSet,
         isArchived: uploadedOptionSet.isArchived,
     };
-    for (const keyVal of existingOptionSet.optionSet) {
-        const value = keyVal.value;
-        const display = keyVal.display;
-        const found = merged.optionSet.find(keyVal => keyVal.value === value);
-        if (!found) {
-            merged.optionSet.push({ value, display });
+    if (((_a = existingOptionSet === null || existingOptionSet === void 0 ? void 0 : existingOptionSet.optionSet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        for (const keyVal of existingOptionSet.optionSet) {
+            const value = keyVal.value;
+            const display = keyVal.display;
+            const found = merged.optionSet.find(keyVal => keyVal.value === value);
+            if (!found) {
+                merged.optionSet.push({ value, display });
+            }
         }
     }
     return merged;

package/lib/types/option-set-parser.d.ts

@@ -1 +1,3 @@
 export declare function ParseOptionSetsLocalFiles(args: any): Promise<void>;
+export declare function ParseOptionSetsToFolderStructure(args: any): Promise<void>;
+export declare function parseLabelsInColumn(uploadedOptionData: any): any[];

package/lib/types/option-set-parser.js

@@ -1,9 +1,11 @@
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
 import { parseOptionSets } from '@contrail/types';
+import { StringUtil } from '@contrail/util';
 import chalk from 'chalk';
 const csv = require('csvtojson');
 const yaml = require('js-yaml');
+import * as path from 'path';
 export async function ParseOptionSetsLocalFiles(args) {
     try {
         if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
@@ -11,8 +13,26 @@ export async function ParseOptionSetsLocalFiles(args) {
         }
         console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
         const fileLocation = args[3];
+        const csvStyle = args[4];
         console.log('Using File: ', fileLocation);
-        await parseOptionSetsLocalFiles(fileLocation);
+        await parseOptionSetsLocalFiles(fileLocation, csvStyle);
+        console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
+    }
+    catch (e) {
+        console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+export async function ParseOptionSetsToFolderStructure(args) {
+    try {
+        if ((args === null || args === void 0 ? void 0 : args.length) < 4) {
+            throw new Error('File name must be included.');
+        }
+        console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
+        const fileLocation = args[3];
+        console.log('Using File: ', fileLocation);
+        await parseOptionSetsToFolderStructure(fileLocation);
         console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
     }
     catch (e) {
@@ -33,14 +53,33 @@ async function loadOptionSetCSV(fileLocation) {
         throw new Error(`ERROR PARSING CSV: ${e}`);
     }
 }
-async function parseOptionSetsLocalFiles(fileLocation) {
+function loadOptionSets(fileLocation) {
+    const TARGET_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = TARGET_DIR + separator + fileLocation;
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+        return doc;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function parseOptionSetsLocalFiles(fileLocation, csvStyle) {
     const uploadedOptionData = await loadOptionSetCSV(fileLocation);
-    // const newData = [];
-    // for (const row of uploadedOptionData) {
-    //   newData.push({[row.optionSetName]: row.displayName});
-    // }
-    const parsedOptionSets = parseOptionSets(uploadedOptionData);
-    saveData({ optionSets: parsedOptionSets });
+    if (csvStyle === 'NameAndLabel') {
+        const parsedOptionSets = parseOptionSets(uploadedOptionData);
+        saveData(parsedOptionSets);
+    }
+    if (csvStyle === 'LabelsInColumn') {
+        const parsedOptionSets = parseLabelsInColumn(uploadedOptionData);
+        saveData(parsedOptionSets);
+    }
+}
+async function parseOptionSetsToFolderStructure(fileLocation) {
+    const uploadedOptionData = await loadOptionSets(fileLocation);
+    saveDataInFolders(uploadedOptionData);
 }
 function saveData(data) {
     const yamlStr = yaml.dump(data);
@@ -48,3 +87,54 @@ function saveData(data) {
     const separator = getSeparatorByPlatform();
     fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSets.yml', yamlStr, 'utf8');
 }
+function saveDataInFolders(data) {
+    const folder = { filename: 'option-sets', split: true, fileLabel: 'name' };
+    const dir = 'merged_option_sets';
+    const CURRENT_DIR = process.cwd();
+    const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+    if (!fs.existsSync(subDir)) {
+        fs.mkdirSync(subDir, { recursive: true });
+    }
+    for (const item of data) {
+        const yamlStr = yaml.dump(item);
+        const fileLabel = item[folder.fileLabel];
+        if (!fileLabel) {
+            console.warn('skipping bad data:', item);
+        }
+        fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+    }
+}
+function removeSlash(string) {
+    const re = /\//gi;
+    return string.replace(re, '-');
+}
+export function parseLabelsInColumn(uploadedOptionData) {
+    const optionSets = [];
+    const optionSetNames = Object.keys(uploadedOptionData[0]);
+    for (const optionSetName of optionSetNames) {
+        const uniqueOptionSetValues = new Set();
+        for (const data of uploadedOptionData) {
+            const label = data[optionSetName];
+            uniqueOptionSetValues.add(label);
+        }
+        const optionSet = [];
+        if (uniqueOptionSetValues) {
+            for (const entry of uniqueOptionSetValues.values()) {
+                if (entry === '') {
+                    continue;
+                }
+                optionSet.push({
+                    value: StringUtil.convertToCamelCase(entry),
+                    display: entry,
+                });
+            }
+        }
+        const reducedOptionSet = {
+            name: optionSetName,
+            isArchived: false,
+            optionSet,
+        };
+        optionSets.push(reducedOptionSet);
+    }
+    return optionSets;
+}

package/lib/types/parse-types.js

@@ -110,7 +110,7 @@ async function parseTypesFromLocalFiles(fileLocations) {
     }
     console.log(`CSV imports were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
     const suggestions = GetSuggestedTypes(csvJSONData);
-    saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
 async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFileLocation) {
@@ -129,7 +129,7 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation, dataFi
         throw e;
     }
     const types = GetTypesFromTemplate(templateCSVData, dataCSVData);
-    saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
+    saveData(types.OptionSets, 'parsed_optionSets.yml');
     saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
 }
 async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation, dataFileLocations) {
@@ -157,7 +157,7 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation,
         }
     }
     const types = GetTypesFromTemplateWithOptionSetsFromData(templateCSVData, dataCSVData);
-    saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
+    saveData(types.OptionSets, 'parsed_optionSets.yml');
     saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
 }
 async function parseTypesFromFiles(fileIds) {
@@ -178,7 +178,7 @@ async function parseTypesFromFiles(fileIds) {
     }
     console.log(`CSV downloads were successful. ${csvJSONData === null || csvJSONData === void 0 ? void 0 : csvJSONData.length} total rows found.`);
     const suggestions = GetSuggestedTypes(csvJSONData);
-    saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+    saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
     saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
 function saveData(data, name) {

package/lib/users/user-exporter.d.ts

@@ -0,0 +1 @@
+export declare function ExportUsers(): Promise<void>;

package/lib/users/user-exporter.js

@@ -0,0 +1,41 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+import yaml from 'js-yaml';
+export async function ExportUsers() {
+    try {
+        await authUser();
+        console.log('%s Getting Users.', chalk.blue.bold('START'));
+        await exportUsers();
+        console.log('%s Done', chalk.yellow.bold('USERS'));
+    }
+    catch (e) {
+        console.log(`%s Users download Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Users download Complete.', chalk.green.bold('COMPLETE'));
+}
+async function exportUsers() {
+    const allUsersInOrg = await new Entities().get({
+        entityName: 'user-org',
+    });
+    const users = [];
+    for (const userInOrg of allUsersInOrg) {
+        delete userInOrg.user.id;
+        delete userInOrg.user.updatedBy;
+        delete userInOrg.user.createdBy;
+        if (userInOrg.user.email.includes('@vibeappuser.com')) {
+            continue;
+        }
+        users.push(Object.assign({ role: userInOrg.role }, userInOrg.user));
+    }
+    saveData({ users: users }, 'users');
+}
+function saveData(data, name) {
+    const yamlStr = yaml.dump(data);
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    fs.writeFileSync(CURRENT_DIR + separator + name + '-export.yml', yamlStr, 'utf8');
+}

package/lib/users/user-uploader.d.ts

@@ -0,0 +1 @@
+export declare function UploadUsers(): Promise<void>;

package/lib/users/user-uploader.js

@@ -0,0 +1,45 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import * as path from 'path';
+import yaml from 'js-yaml';
+export async function UploadUsers() {
+    try {
+        await authUser();
+        console.log('%s Uploading Users.', chalk.blue.bold('START'));
+        console.log('%s Uploading', chalk.yellow.bold('USER'));
+        await uploadUsers();
+        console.log('%s Uploaded', chalk.yellow.bold('USER'));
+    }
+    catch (e) {
+        console.log(`%s User Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s User Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+function getUsersFile() {
+    const CURRENT_DIR = process.cwd();
+    try {
+        const fullPath = path.join(CURRENT_DIR, 'users.yml');
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(fullPath, 'utf8'));
+        return doc.users;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadUsers() {
+    const users = getUsersFile();
+    for (const user of users) {
+        const role = user.role;
+        const email = user.email;
+        delete user.role;
+        delete user.email;
+        await new Entities().create({
+            entityName: 'user-org',
+            object: Object.assign({ role: role, userEmail: email }, user)
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.66",
+  "version": "1.0.68",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/apps/create-app/create.ts

@@ -21,7 +21,7 @@ function parseArgumentsIntoOptions(rawArgs) {
   };
 }
 async function promptForMissingOptions(options) {
-  const defaultTemplate = 'JavaScript';
+  const defaultTemplate = 'TypeScript';
 
   const questions = [];
   if (!options.appName) {
@@ -38,7 +38,7 @@ async function promptForMissingOptions(options) {
       type: 'list',
       name: 'template',
       message: 'Which project template would you like to use?',
-      choices: ['JavaScript', 'TypeScript'],
+      choices: ['TypeScript', 'JavaScript'],
       default: defaultTemplate,
     });
   }

package/src/cli.ts

@@ -4,7 +4,7 @@ import { deployApp, removeApp } from './apps/deploy-app/deploy';
 import { getAll } from './types/types-extractor';
 import { uploadTypes } from './types/types-uploader';
 import { UploadOptionSets } from './types/option-set-uploader';
-import { ParseOptionSetsLocalFiles } from './types/option-set-parser';
+import { ParseOptionSetsLocalFiles, ParseOptionSetsToFolderStructure } from './types/option-set-parser';
 import { ParseOptionSetsHierarchyLocalFile, UploadOptionSetsHierarchyLocalFile } from './types/option-set-hierarchy-parser';
 import { ExportOptionSetsHierarchies } from './types/option-set-hierarchy-exporter';
 import { MergeOptionSets } from './types/option-set-merger';
@@ -24,6 +24,8 @@ import { uploadRuleSets } from './types/rule-set-uploader';
 import { UploadOptionSetHierarchies } from './types/option-set-hierarchy-uploader';
 import { uploadTypePropertyPolicies } from './types/type-property-policy-uploader';
 import { uploadAll } from './types/allUploader';
+import { ExportUsers } from './users/user-exporter';
+import { UploadUsers } from './users/user-uploader';
 
 const cliUsage = require('command-line-usage');
 
@@ -113,6 +115,10 @@ export async function cli(args) {
       ParseOptionSetsLocalFiles(args);
       break;
     }
+    case 'parseOptionSetsToFolderStructure': {
+      ParseOptionSetsToFolderStructure(args);
+      break;
+    }
     case 'parseOptionSetsHierarchyLocalFile': {
       ParseOptionSetsHierarchyLocalFile(args);
       break;
@@ -223,6 +229,23 @@ export async function cli(args) {
     }
     break;
   }
+  case 'users': {
+    switch (command) {
+    case 'export': {
+      await ExportUsers();
+      break;
+    }
+    case 'import': {
+      await UploadUsers();
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
+
   case 'workflow-templates': {
     switch (command) {
     case 'load': {
@@ -387,6 +410,19 @@ const helpSections = [
     }
     ],
   },
+  {
+    header: 'Users Commands - Domain: users',
+    content: [
+      {
+        name: 'export',
+        summary: 'Export all users in the org.'
+      },
+      {
+        name: 'import',
+        summary: 'Import all users in the users.yml file.'
+      }
+    ],
+  },
   {
     header: 'Workflow Template Commands - Domain: workflow-templates',
     content: [
@@ -429,11 +465,15 @@ const helpSections = [
       },
       {
         name: 'uploadOptionSets',
-        summary: 'Upload OptionSets for your Org. OptionSets are loaded from option_sets.yml\n'
+        summary: 'Upload OptionSets for your Org. OptionSets are loaded from .yml files in the option-sets directory.\n'
+      },
+      {
+        name: 'parseOptionSetsLocalFiles <File Paths> <style>',
+        summary: 'Parse CSV files into OptionSets. Style denotes the format the csv is in. If the csv file has a column for name and label, use "NameAndLabel". If the file has one column for each option set with the rows being the label value use "LabelsInColumn"\n'
       },
       {
-        name: 'parseOptionSetsLocalFiles <File Paths>',
-        summary: 'Parse CSV files into OptionSets.\n'
+        name: 'parseOptionSetsToFolderStructure <File Path>',
+        summary: 'Parse single yml file into a folder with separate files per option set.\n'
       },
       {
         name: 'parseOptionSetsHierarchyLocalFile <File Path>',
@@ -491,6 +531,10 @@ const helpSections = [
         name: 'mergeTypeProperties <File Path> <TypePaths>',
         summary: 'Merge the TypeProperties from an existing org and the TypeProperties passed in. Add to Types via TypePath File must be .yml\n'
       },
+      {
+        name: 'mergeOptionSets <File Path>',
+        summary: 'Merge the OptionSets from an existing org and the OptionSets passed in. OptionSets File must be .yml.',
+      },
     ],
   },
 ];

package/src/types/option-set-merger.ts

@@ -35,7 +35,7 @@ function loadOptionSets(fileLocation) {
     console.log('Getting file from path: ', fullPath);
 
     const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
-    return doc.optionSets;
+    return doc;
   } catch (e) {
     throw new Error(`ERROR PARSING YAML: ${e}`);
   }
@@ -91,7 +91,7 @@ async function mergeOptionSets(fileLocation) {
     }
   }
 
-  saveData({optionSets: mergedOptionSets});
+  saveData(mergedOptionSets);
 }
 
 function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet: ReducedOptionSet) {
@@ -101,15 +101,16 @@ function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet:
     isArchived: uploadedOptionSet.isArchived,
   };
 
-  for (const keyVal of existingOptionSet.optionSet) {
-    const value = keyVal.value;
-    const display = keyVal.display;
+  if (existingOptionSet?.optionSet?.length > 0) {
+    for (const keyVal of existingOptionSet.optionSet) {
+      const value = keyVal.value;
+      const display = keyVal.display;
 
-    const found = merged.optionSet.find(keyVal => keyVal.value === value);
-    if (!found) {
-      merged.optionSet.push({value, display});
+      const found = merged.optionSet.find(keyVal => keyVal.value === value);
+      if (!found) {
+        merged.optionSet.push({value, display});
+      }
     }
-
   }
 
   return merged;

package/src/types/option-set-parser.ts

@@ -1,9 +1,11 @@
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
 import { parseOptionSets } from '@contrail/types';
+import { StringUtil } from '@contrail/util';
 import chalk from 'chalk';
 const csv = require('csvtojson');
 const yaml = require('js-yaml');
+import * as path from 'path';
 
 export async function ParseOptionSetsLocalFiles(args) {
   try {
@@ -12,9 +14,31 @@ export async function ParseOptionSetsLocalFiles(args) {
     }
     console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
     const fileLocation = args[3];
+    const csvStyle = args[4];
     console.log('Using File: ', fileLocation);
 
-    await parseOptionSetsLocalFiles(fileLocation);
+    await parseOptionSetsLocalFiles(fileLocation, csvStyle);
+    console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
+
+  }
+  catch (e) {
+    console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+
+export async function ParseOptionSetsToFolderStructure(args) {
+  try {
+    if (args?.length < 4) {
+      throw new Error('File name must be included.');
+    }
+    console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
+    const fileLocation = args[3];
+    console.log('Using File: ', fileLocation);
+
+    await parseOptionSetsToFolderStructure(fileLocation);
     console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
 
   }
@@ -40,16 +64,38 @@ async function loadOptionSetCSV(fileLocation) {
   }
 }
 
-async function parseOptionSetsLocalFiles(fileLocation) {
+function loadOptionSets(fileLocation) {
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const fullPath = TARGET_DIR + separator + fileLocation;
+    console.log('Getting file from path: ', fullPath);
+
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+    return doc;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function parseOptionSetsLocalFiles(fileLocation, csvStyle) {
   const uploadedOptionData = await loadOptionSetCSV(fileLocation);
 
-  // const newData = [];
-  // for (const row of uploadedOptionData) {
-  //   newData.push({[row.optionSetName]: row.displayName});
-  // }
+  if (csvStyle === 'NameAndLabel') {
+    const parsedOptionSets = parseOptionSets(uploadedOptionData);
+    saveData(parsedOptionSets);
+  }
+
+  if (csvStyle === 'LabelsInColumn') {
+    const parsedOptionSets = parseLabelsInColumn(uploadedOptionData);
+    saveData(parsedOptionSets);
+  }
+}
 
-  const parsedOptionSets = parseOptionSets(uploadedOptionData);
-  saveData({optionSets: parsedOptionSets});
+async function parseOptionSetsToFolderStructure(fileLocation) {
+  const uploadedOptionData = await loadOptionSets(fileLocation);
+  saveDataInFolders(uploadedOptionData);
 }
 
 function saveData(data) {
@@ -57,4 +103,64 @@ function saveData(data) {
   const CURRENT_DIR = process.cwd();
   const separator = getSeparatorByPlatform();
   fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSets.yml', yamlStr, 'utf8');
+}
+
+function saveDataInFolders(data) {
+  const folder = { filename: 'option-sets', split: true, fileLabel: 'name' };
+  const dir = 'merged_option_sets';
+
+  const CURRENT_DIR = process.cwd();
+
+  const subDir = path.join(CURRENT_DIR, dir, folder.filename);
+  if(!fs.existsSync(subDir)) {
+    fs.mkdirSync(subDir, { recursive: true });
+  }
+  for(const item of data) {
+    const yamlStr = yaml.dump(item);
+    const fileLabel = item[folder.fileLabel];
+    if(!fileLabel) {
+      console.warn('skipping bad data:', item);
+    }
+    fs.writeFileSync(path.join(subDir, `${removeSlash(fileLabel)}.yml`), yamlStr, 'utf8');
+  }
+}
+
+function removeSlash(string) {
+  const re = /\//gi;
+  return string.replace(re, '-');
+}
+
+export function parseLabelsInColumn(uploadedOptionData) {
+  const optionSets = [];
+  const optionSetNames = Object.keys(uploadedOptionData[0]);
+  for (const optionSetName of optionSetNames) {
+    const uniqueOptionSetValues = new Set<string>();
+    for (const data of uploadedOptionData) {
+      const label = data[optionSetName];
+      uniqueOptionSetValues.add(label);
+    }
+
+    const optionSet: any[] = [];
+    if (uniqueOptionSetValues) {
+      for (const entry of uniqueOptionSetValues.values()) {
+        if (entry === '') {
+          continue;
+        }
+        optionSet.push({
+          value: StringUtil.convertToCamelCase(entry),
+          display: entry,
+        });
+      }
+    }
+
+    const reducedOptionSet = {
+      name: optionSetName,
+      isArchived: false,
+      optionSet,
+    };
+
+    optionSets.push(reducedOptionSet);
+  }
+
+  return optionSets;
 }

package/src/types/parse-types.ts

@@ -134,7 +134,7 @@ async function parseTypesFromLocalFiles(fileLocations: string[]) {
 
   console.log(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
   const suggestions = GetSuggestedTypes(csvJSONData);
-  saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+  saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
   saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
 
@@ -157,7 +157,7 @@ async function parseTypesFromTemplateFromLocalFiles(templateFileLocation: string
   }
 
   const types = GetTypesFromTemplate(templateCSVData, dataCSVData);
-  saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
+  saveData(types.OptionSets, 'parsed_optionSets.yml');
   saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
 }
 
@@ -190,7 +190,7 @@ async function parseTypesFromTemplateAndDataFromLocalFiles(templateFileLocation:
   }
 
   const types = GetTypesFromTemplateWithOptionSetsFromData(templateCSVData, dataCSVData);
-  saveData({ optionSets: types.OptionSets }, 'parsed_optionSets.yml');
+  saveData(types.OptionSets, 'parsed_optionSets.yml');
   saveData({ TypePropertiesByEntity: types.TypePropertiesByEntity }, 'parsed_TypePropertiesByEntity.yml');
 }
 
@@ -215,7 +215,7 @@ async function parseTypesFromFiles(fileIds: string[]) {
   console.log(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
   const suggestions = GetSuggestedTypes(csvJSONData);
 
-  saveData({ optionSets: suggestions.OptionSets }, 'parsed_optionSets.yml');
+  saveData(suggestions.OptionSets, 'parsed_optionSets.yml');
   saveData({ typeProperties: suggestions.TypeProperties }, 'parsed_typeProperties.yml');
 }
 

package/src/users/user-exporter.ts

@@ -0,0 +1,52 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+import yaml from 'js-yaml';
+
+export async function ExportUsers() {
+  try {
+    await authUser();
+    console.log('%s Getting Users.', chalk.blue.bold('START'));
+
+    await exportUsers();
+    console.log('%s Done', chalk.yellow.bold('USERS'));
+
+  }
+  catch (e) {
+    console.log(`%s Users download Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Users download Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function exportUsers() {
+  const allUsersInOrg = await new Entities().get({
+    entityName: 'user-org',
+  });
+
+  const users = [];
+  for (const userInOrg of allUsersInOrg) {
+    delete userInOrg.user.id;
+    delete userInOrg.user.updatedBy;
+    delete userInOrg.user.createdBy;
+    if (userInOrg.user.email.includes('@vibeappuser.com')) {
+      continue;
+    }
+    users.push({
+      role: userInOrg.role,
+      ...userInOrg.user
+    });
+  }
+
+  saveData({users: users}, 'users');
+}
+
+function saveData(data, name) {
+  const yamlStr = yaml.dump(data);
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + name + '-export.yml', yamlStr, 'utf8');
+}

package/src/users/user-uploader.ts

@@ -0,0 +1,58 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import * as path from 'path';
+
+import yaml from 'js-yaml';
+
+export async function UploadUsers() {
+  try {
+    await authUser();
+    console.log('%s Uploading Users.', chalk.blue.bold('START'));
+
+    console.log('%s Uploading', chalk.yellow.bold('USER'));
+    await uploadUsers();
+    console.log('%s Uploaded', chalk.yellow.bold('USER'));
+
+  }
+  catch (e) {
+    console.log(`%s User Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s User Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+
+function getUsersFile(){
+  const CURRENT_DIR = process.cwd();
+  try {
+    const fullPath = path.join(CURRENT_DIR, 'users.yml');
+    console.log('Getting file from path: ', fullPath);
+
+    const doc = yaml.load(fs.readFileSync(fullPath, 'utf8'));
+    return doc.users;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function uploadUsers() {
+  const users = getUsersFile();
+
+  for (const user of users) {
+    const role = user.role;
+    const email = user.email;
+    delete user.role;
+    delete user.email;
+
+    await new Entities().create({
+      entityName: 'user-org',
+      object: {
+        role: role,
+        userEmail: email,
+        ...user
+      }
+    });
+  }
+}

package/templates/typescript/actions/handler.ts

@@ -22,7 +22,7 @@ export async function execute(data) {
   }
 
   try {
-    login({ apiKey: data.apiKey, orgSlug: data.orgSlug });
+    await login({ apiKey: data.apiKey, orgSlug: data.orgSlug });
     const results = {};
 
     logger.log('Sending message: ', event);

package/templates/typescript/actions/mock-server.ts

@@ -0,0 +1,24 @@
+import { execute } from './handler';
+const express = require('express');
+const bodyParser = require('body-parser');
+const app = express();
+const port = 5050;
+
+// parse application/x-www-form-urlencoded
+app.use(bodyParser.urlencoded({ extended: false }));
+// parse application/json
+app.use(bodyParser.json());
+
+app.get('/health_check', (req, res) => {
+  res.send('Hello World!');
+});
+
+// DO NOT CHANGE THIS IMPLEMENTATION
+app.post('/', async (req, res) => {
+  const result = await execute(req.body);
+  res.send(result);
+});
+
+app.listen(port, () => {
+  console.log(`Mock server listening on port ${port}`);
+});

package/templates/typescript/actions/utils/logger.ts

@@ -1,15 +1,15 @@
 export class Logger {
   allEntries = [];
   public log(...args){
-    console.log(args);
+    console.log(...args);
     this.allEntries.push(args);
   }
 
   public getEntries(){
-    return this.allEntries;
+    return this.allEntries.join('\n');
   }
 
   public clearEntries(){
     this.allEntries = [];
   }
-}
+}

package/templates/typescript/package.json

@@ -15,6 +15,8 @@
   },
   "scripts": {
     "build": "tsc",
+    "start": "nodemon --watch 'actions/**/*.ts' --exec ts-node actions/mock-server.ts",
+    "debug": "nodemon -r ts-node/register --inspect=127.0.0.1:60002 --watch 'actions/**/*.ts' --exec node actions/mock-server.ts",
     "lint": "eslint . --fix",
     "test": "jest",
     "test-watch": "jest --watch",
@@ -39,8 +41,12 @@
     "chalk": "^4.0.0"
   },
   "devDependencies": {
+    "body-parser": "^1.20.2",
+    "express": "^4.18.2",
+    "nodemon": "^1.19.4",
     "jest": "^29.2.2",
     "ts-jest": "^29.0.3",
+    "ts-node": "^7.0.1",
     "typescript": "^4.7.4"
   }
 }

package/templates/typescript/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2017",
+    "target": "ES2020",
     "module": "commonjs",
     "declaration": true,
     "esModuleInterop": true,
@@ -17,15 +17,11 @@
       "ES2015",
       "ES2016",
       "ES2017",
+      "ES2020",
       "dom",
       "esnext.asynciterable"
-    ],
+    ]
   },
-  "include": [
-    "actions"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/__tests__/*"
-  ]
-}
+  "include": ["actions"],
+  "exclude": ["node_modules", "**/__tests__/*"]
+}