@contrail/cli 1.0.31 → 1.0.32

package/.eslintrc.js

@@ -0,0 +1,53 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+    node: true
+
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module'
+  },
+  plugins: [
+    '@typescript-eslint',
+    'unused-imports'
+  ],
+  rules: {
+    indent: [
+      'error',
+      2
+    ],
+    'linebreak-style': [
+      'error',
+      'unix'
+    ],
+    'quote-props': ['error', 'as-needed'],
+    quotes: [
+      'error',
+      'single'
+    ],
+    semi: [
+      'error',
+      'always'
+    ],
+    'no-multiple-empty-lines': ['error', { max: 1, maxEOF: 0 }],
+    'no-trailing-spaces': 'error',
+    'no-mixed-spaces-and-tabs': ['error', 'smart-tabs'],
+    '@typescript-eslint/no-empty-function': ['error', { allow: ['arrowFunctions'] }],
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/no-var-requires': 'warn',
+    'no-unused-vars': 'off',
+    'unused-imports/no-unused-imports': 'error',
+    'unused-imports/no-unused-vars': [
+      'warn',
+      { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' }
+    ]
+  }
+};

package/lib/apps/deploy-app/actions-deployer.js

@@ -21,14 +21,21 @@ export class ActionsDeployer {
         const existingActions = await getActionsForApp(app);
         // UPSERT / DELETE BASED ON ACTION IDENTIFIER
         console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
+        let appActionIdentifiers = [];
         if (appDeclaration.actions) {
-            const localActions = Object.keys(appDeclaration.actions);
-            if ((localActions === null || localActions === void 0 ? void 0 : localActions.length) > 0) {
-                for (const actionKey of localActions) {
+            const localActionKeys = Object.keys(appDeclaration.actions);
+            appActionIdentifiers = localActionKeys.map(x => getActionDeclarationIdentifier(x, app));
+            if ((localActionKeys === null || localActionKeys === void 0 ? void 0 : localActionKeys.length) > 0) {
+                for (const actionKey of localActionKeys) {
                     await this.deployAction(actionKey, appDeclaration.actions[actionKey], app, existingActions);
                 }
             }
         }
+        const toDelete = existingActions.filter(x => !appActionIdentifiers.includes(x.identifier));
+        for (const action of toDelete) {
+            console.log(`%s \tDeleting action: ${action.identifier}`, chalk.yellow.bold('ACTION'));
+            await deleteAction(action.id);
+        }
     }
     async deployAction(actionKey, actionDeclaration, app, existingActions) {
         console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
@@ -52,6 +59,7 @@ export class ActionsDeployer {
             ownerKey: `app:${app.id}`,
             public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
             configProperties,
+            async: actionDeclaration.async,
         };
         const functionString = await this.getFunction(actionDeclaration);
         if (functionString) {
@@ -76,6 +84,7 @@ export class ActionsDeployer {
             name: actionDeclaration.name,
             public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
             configProperties,
+            async: actionDeclaration.async,
         };
         const functionString = await this.getFunction(actionDeclaration);
         if (functionString) {

package/lib/apps/deploy-app/app-deployer.js

@@ -8,11 +8,11 @@ export class AppDeployer {
     async deploy(appDeclaration) {
         let app = await this.getExistingApp(appDeclaration);
         if (!app) {
-            console.log(`%s      Creating new app.`, chalk.yellow.bold('APP'));
+            console.log('%s      Creating new app.', chalk.yellow.bold('APP'));
             app = await this.createNewApp(appDeclaration);
         }
         else {
-            console.log(`%s      Updating existing app.`, chalk.yellow.bold('APP'));
+            console.log('%s      Updating existing app.', chalk.yellow.bold('APP'));
             app = await this.updateExistingApp(appDeclaration, app);
         }
         await new ActionsDeployer().deployActions(appDeclaration, app);
@@ -57,7 +57,6 @@ export class AppDeployer {
             keywords: appDeclaration.keywords,
             configProperties,
             triggerKeyDefinitions,
-            isDockerBased: appDeclaration.isDockerBased,
             dockerImageRef: appDeclaration.dockerImageRef,
         };
         const app = await new Entities().create({ entityName: 'app', object: newApp });

package/lib/apps/deploy-app/app-template-parsers.js

@@ -25,7 +25,7 @@ export class ConfigPropertiesParser {
             const config = {
                 label: declaration.label,
                 slug: configKey,
-                propertyType: declaration.propertyType,
+                propertyType: declaration.propertyType, // TODO should support options
             };
             if (declaration.options) {
                 config.options = declaration.options;

package/lib/apps/deploy-app/docker-action-builder.d.ts

@@ -0,0 +1,10 @@
+import { App, AppDeclaration, AppActionDeclaration } from '../../interfaces';
+export declare class ActionsDeployer {
+  deployActions(appDeclaration: AppDeclaration, app: App): Promise<void>;
+  getActionsForApp(app: App): Promise<any>;
+  deployAction(actionKey: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>): Promise<void>;
+  private createNewActionDefinition;
+  private updateActionDefinition;
+  getActionDeclarationIdentifier(actionKey: any, app: App): string;
+  getFunction(actionDeclaration: AppActionDeclaration): Promise<string>;
+}

package/lib/apps/deploy-app/docker-action-builder.js

@@ -0,0 +1,97 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { ConfigPropertiesParser } from './app-template-parsers';
+import { getSeparatorByPlatform } from '../../common';
+import fs from 'fs';
+export class ActionsDeployer {
+  async deployActions(appDeclaration, app) {
+    // FETCH ALL ACTIONS FROM THE API.
+    const existingActions = await this.getActionsForApp(app);
+    // UPSERT / DELETE BASED ON ACTION IDENTIFIER
+    console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
+    for (const actionKey of Object.keys(appDeclaration.actions)) {
+      await this.deployAction(actionKey, appDeclaration.actions[actionKey], app, existingActions);
+    }
+  }
+  async getActionsForApp(app) {
+    return await new Entities().get({
+      entityName: 'event-workflow-action-definition',
+      criteria: { ownerKey: `app:${app.id}` },
+    });
+  }
+  async deployAction(actionKey, actionDeclaration, app, existingActions) {
+    console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
+    const identifier = this.getActionDeclarationIdentifier(actionKey, app);
+    const existingDefinition = existingActions.find(ad => ad.identifier === identifier);
+    if (!existingDefinition) {
+      await this.createNewActionDefinition(actionKey, actionDeclaration, app);
+    }
+    else {
+      await this.updateActionDefinition(existingDefinition, actionDeclaration);
+    }
+  }
+  async createNewActionDefinition(actionKey, actionDeclaration, app) {
+    let configProperties;
+    if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+    }
+    const newObject = {
+      identifier: this.getActionDeclarationIdentifier(actionKey, app),
+      name: actionDeclaration.name,
+      ownerKey: `app:${app.id}`,
+      public: app.public,
+      configProperties,
+    };
+    const functionString = await this.getFunction(actionDeclaration);
+    if (functionString) {
+      newObject.executeFunctionString = functionString;
+    }
+    const actionDefinition = await new Entities().create({
+      entityName: 'event-workflow-action-definition',
+      object: newObject,
+    });
+    console.log(`%s      Created new action definition: ${actionKey}`, chalk.yellow.bold('APP'));
+    return actionDefinition;
+  }
+  async updateActionDefinition(existingActionDefinition, actionDeclaration) {
+    let configProperties;
+    if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+    }
+    else if (!(actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) && existingActionDefinition.configProperties) {
+      configProperties = null;
+    }
+    const updates = {
+      name: actionDeclaration.name,
+      // public: actionDeclaration.public, // TODO - an actions visibility is allowed to change
+      configProperties,
+    };
+    const functionString = await this.getFunction(actionDeclaration);
+    if (functionString) {
+      updates.executeFunctionString = functionString;
+    }
+    const actionDefinition = await new Entities().update({
+      entityName: 'event-workflow-action-definition',
+      id: existingActionDefinition.id,
+      object: updates,
+    });
+    console.log(`%s      Updated existing action definition: ${actionDefinition.identifier}`, chalk.yellow.bold('APP'));
+    return actionDefinition;
+  }
+  getActionDeclarationIdentifier(actionKey, app) {
+    return app.identifier + ':' + actionKey;
+  }
+  async getFunction(actionDeclaration) {
+    if (!actionDeclaration.handler) {
+      return;
+    }
+    if (!actionDeclaration.handler.endsWith('.js')) {
+      throw new Error('Action handler must be a .js file.');
+    }
+    const CURRENT_DIR = process.cwd();
+    const separator = getSeparatorByPlatform();
+    const functionLocation = CURRENT_DIR + separator + actionDeclaration.handler;
+    const content = fs.readFileSync(functionLocation);
+    return content.toString();
+  }
+}

package/lib/apps/deploy-app/interfaces.d.ts

@@ -0,0 +1,76 @@
+/** Describes the derivative JSON / object represented
+ * in app.yml file.
+ */
+export interface AppDeclaration {
+    appIdentifier: string;
+    appName: string;
+    appDescription?: string;
+    visibility: 'private' | 'public';
+    publisher: string;
+    version: string;
+    eventWorkflowTriggerKeyMapping: string;
+    thumbnail?: string;
+    keywords?: Array<string>;
+    actions?: {
+        [key: string]: AppActionDeclaration;
+    };
+    appConfiguration: ConfigPropertyElements;
+    triggers: {
+        [key: string]: AppTriggerDeclaration;
+    };
+    isDockerBased?: boolean;
+}
+export interface ConfigPropertyElements {
+    [key: string]: ConfigPropertyElement;
+}
+export interface ConfigPropertyElement {
+    propertyType: string;
+    options?: any[];
+    label: string;
+}
+export interface AppActionDeclaration {
+    handler: string;
+    name: string;
+    description?: string;
+    actionConfiguration?: ConfigPropertyElements;
+}
+export interface AppTriggerDeclaration {
+    key: string;
+    name: string;
+    external?: boolean;
+    description?: string;
+}
+export interface App {
+    id: string;
+    identifier: string;
+    name: string;
+    public: boolean;
+    description?: string;
+    publisher: string;
+    thumbnail: string;
+    eventWorkflowTriggerKeyMapping: string;
+    configProperties?: ConfigProperty[];
+    triggerKeyDefinitions?: TriggerKeyDefinition[];
+}
+export declare class ConfigProperty {
+  slug: string;
+  propertyType: string;
+  options?: any[];
+  label: string;
+}
+export interface EventWorkflowActionDefinition {
+    id?: string;
+    identifier?: string;
+    name?: string;
+    executeFunctionString?: string;
+    ownerKey?: string;
+    public?: boolean;
+    configProperties?: ConfigProperty[];
+    isDockerBased?: boolean;
+}
+export declare class TriggerKeyDefinition {
+  name: string;
+  description?: string;
+  triggerKey: string;
+  external?: boolean;
+}

package/lib/apps/deploy-app/interfaces.js

@@ -0,0 +1,4 @@
+export class ConfigProperty {
+}
+export class TriggerKeyDefinition {
+}

package/lib/apps/deploy-app/workflow-definition-deployer.js

@@ -53,7 +53,7 @@ export class WorkflowDefinitionDeployer {
     }
     async populateActionIds(workflowDefinition, app) {
         var _a;
-        let availableAppActions = await getActionsForApp(app);
+        const availableAppActions = await getActionsForApp(app);
         if (!((_a = workflowDefinition.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
             return;
         }

package/lib/apps/deploy-app/workflow-deployer.d.ts

@@ -0,0 +1,10 @@
+import { App, AppDeclaration, WorkflowTemplateDeclaration } from './interfaces';
+export declare class WorkflowDeployer {
+  deployWorkflows(appDeclaration: AppDeclaration, app: App): Promise<void>;
+  getWorkflowsForApp(app: App): Promise<any>;
+  deployWorkflow(workflowKey: string, workflow: WorkflowTemplateDeclaration, app: App, existingWorkflows: Array<any>, appDeclaration: AppDeclaration): Promise<any>;
+  private createNewWorkflowDefinition;
+  private populateActionIds;
+  private updateWorkflowDefinition;
+  getWorkflowDeclarationIdentifier(actionKey: any, app: App): string;
+}

package/lib/apps/deploy-app/workflow-deployer.js

@@ -0,0 +1,87 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { getActionDeclarationIdentifier, getActionsForApp } from './actions-deployer';
+export class WorkflowDeployer {
+  async deployWorkflows(appDeclaration, app) {
+    // FETCH ALL WORKFLOWS FROM THE API.
+    const existingWorkflows = await this.getWorkflowsForApp(app);
+    // UPSERT / DELETE BASED ON WORKFLOW IDENTIFIER
+    console.log('%s \tDeploying workflows.', chalk.yellow.bold('WORKFLOW'));
+    for (const workflowKey of Object.keys(appDeclaration.workflows)) {
+      await this.deployWorkflow(workflowKey, appDeclaration.workflows[workflowKey], app, existingWorkflows, appDeclaration);
+    }
+  }
+  async getWorkflowsForApp(app) {
+    return await new Entities().get({
+      entityName: 'event-workflow-template',
+      criteria: { ownerKey: `app:${app.id}` },
+    });
+  }
+  async deployWorkflow(workflowKey, workflow, app, existingWorkflows, appDeclaration) {
+    console.log(`%s \tDeploying workflow: ${workflowKey}`, chalk.yellow.bold('WORKFLOW'));
+    const identifier = this.getWorkflowDeclarationIdentifier(workflowKey, app);
+    const existingDefinition = existingWorkflows.find(ad => ad.identifier === identifier);
+    if (existingDefinition) {
+      return await this.updateWorkflowDefinition(existingDefinition, workflow, app, appDeclaration);
+    }
+    return await this.createNewWorkflowDefinition(workflowKey, workflow, app, appDeclaration);
+  }
+  async createNewWorkflowDefinition(workflowKey, workflowDeclaration, app, appDeclaration) {
+    await this.populateActionIds(workflowDeclaration, appDeclaration, app);
+    const newObject = {
+      identifier: this.getWorkflowDeclarationIdentifier(workflowKey, app),
+      name: workflowDeclaration.name,
+      ownerKey: `app:${app.id}`,
+      triggerKey: workflowDeclaration.triggerKey,
+      workflowDefinition: workflowDeclaration.workflowDefinition,
+      isActive: workflowDeclaration.isActive,
+      supportingAppId: workflowDeclaration.supportingAppId,
+      messageGroupId: workflowDeclaration.messageGroupId,
+      parallelWorkerCount: workflowDeclaration.parallelWorkerCount,
+    };
+    const workflowTemplate = await new Entities().create({
+      entityName: 'event-workflow-template',
+      object: newObject,
+    });
+    console.log(`%s      Created new workflow definition: ${workflowKey}`, chalk.yellow.bold('WORKFLOW'));
+    return workflowTemplate;
+  }
+  async populateActionIds(workflowDeclaration, appDeclaration, app) {
+    var _a;
+    let availableAppActions = await getActionsForApp(app);
+    if (!((_a = workflowDeclaration.workflowDefinition) === null || _a === void 0 ? void 0 : _a.paths)) {
+      return;
+    }
+    for (const path of workflowDeclaration.workflowDefinition.paths) {
+      if (!(path === null || path === void 0 ? void 0 : path.actionDefinitionConfigs)) {
+        continue;
+      }
+      for (const actionConfiguration of path.actionDefinitionConfigs) {
+        const actionKey = actionConfiguration.action;
+        const action = availableAppActions.find(action => action.identifier === getActionDeclarationIdentifier(actionKey, app));
+        if (!action) {
+          throw new Error(`Could not find action ${actionKey} declared in ${workflowDeclaration.name}`);
+        }
+        actionConfiguration.id = action.id;
+      }
+    }
+  }
+  async updateWorkflowDefinition(existingWorkflowDefinition, workflowDeclaration, app, appDeclaration) {
+    await this.populateActionIds(workflowDeclaration, appDeclaration, app);
+    const updates = Object.assign(new Object(), {
+      name: workflowDeclaration.name,
+      triggerKey: workflowDeclaration.triggerKey,
+      workflowDefinition: workflowDeclaration.workflowDefinition
+    });
+    const updatedWorkflowDefinition = await new Entities().update({
+      entityName: 'event-workflow-template',
+      id: existingWorkflowDefinition.id,
+      object: updates,
+    });
+    console.log(`%s      Updated existing workflow definition: ${updatedWorkflowDefinition.identifier}`, chalk.yellow.bold('WORKFLOW'));
+    return updatedWorkflowDefinition;
+  }
+  getWorkflowDeclarationIdentifier(actionKey, app) {
+    return app.identifier + ':' + actionKey;
+  }
+}

package/lib/auth/login.js

@@ -8,13 +8,13 @@ const CONFIGURATION = {
     clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
 };
 export async function authUser() {
-    console.debug("authorizing user");
+    console.debug('authorizing user');
     const config = await getConfig();
     if (config &&
         config.apiUserToken &&
         config.apiGateway &&
         config.orgSlug) {
-        console.debug("populating auth config from fs config");
+        console.debug('populating auth config from fs config');
         Auth.config = {
             apiUserToken: config.apiUserToken,
             apiGateway: config.apiGateway,
@@ -25,7 +25,7 @@ export async function authUser() {
             return await refreshCurrentUserOrg();
         }
         catch (e) {
-            console.log("Token expired. Requesting auth credentials...");
+            console.log('Token expired. Requesting auth credentials...');
         }
     }
     const questions = [];
@@ -120,11 +120,11 @@ async function setAuthContext(user, params) {
     return refreshCurrentUserOrg();
 }
 async function refreshCurrentUserOrg() {
-    console.debug("refreshing current user org");
+    console.debug('refreshing current user org');
     const currentUser = await Request.request('/users/current', {
         method: 'GET',
         headers: {
-            'Accept': 'application/json',
+            Accept: 'application/json',
             'Content-Type': 'application/json',
         },
     });

package/lib/cli.js

@@ -62,7 +62,7 @@ export async function cli(args) {
                     break;
                 }
                 case 'uploadTypes': {
-                    uploadTypes(args);
+                    uploadTypes();
                     break;
                 }
                 case 'uploadOptionSets': {
@@ -204,6 +204,7 @@ const helpSections = [
         content: [
             'load                         Load colors from a CSV. Headers (name, hex, red,',
             '.                            green, blue) are required.',
+            // 'delete                       Delete all colors.',
         ],
     },
     {

package/lib/colors/color-loader.js

@@ -7,7 +7,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);
         }
@@ -21,10 +21,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) {
         console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
@@ -33,7 +33,7 @@ export async function loadColors() {
     console.log('%s Loading Colors Complete.', chalk.green.bold('COMPLETE'));
 }
 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();
@@ -45,10 +45,10 @@ async function getLocalColors() {
     }
 }
 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) {
@@ -69,7 +69,7 @@ async function uploadColors() {
     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] === '#') {

package/lib/config/config.js

@@ -9,7 +9,7 @@ export async function initializeVibeIQConfig() {
         await fsPromises.mkdir(configDirectoryLocation, { recursive: true });
     }
     catch (e) {
-        console.error("could not initialize vibeiq directory");
+        console.error('could not initialize vibeiq directory');
         throw e;
     }
     try {
@@ -48,7 +48,7 @@ export async function writeVibeIQConfig(config) {
     }
 }
 export async function getConfig() {
-    console.debug("getting config from file system");
+    console.debug('getting config from file system');
     return await readVibeIQConfig();
 }
 export async function deleteConfigs(configNames) {

package/lib/interfaces.d.ts

@@ -21,7 +21,6 @@ export interface AppDeclaration {
     workflows?: {
         [key: string]: WorkflowDefinition | WorkflowTemplateDeclaration;
     };
-    isDockerBased?: boolean;
     dockerImageRef?: string;
 }
 export interface ConfigPropertyElements {
@@ -38,6 +37,7 @@ export interface AppActionDeclaration {
     name: string;
     description?: string;
     actionConfiguration?: ConfigPropertyElements;
+    async?: boolean;
 }
 export interface AppTriggerDeclaration {
     key: string;
@@ -116,7 +116,7 @@ export interface EventWorkflowActionDefinition {
     ownerKey?: string;
     public?: boolean;
     configProperties?: ConfigProperty[];
-    isDockerBased?: boolean;
+    async?: boolean;
 }
 export declare class TriggerKeyDefinition {
     name: string;

package/lib/types/interfaces.js

@@ -0,0 +1 @@
+export {};

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

@@ -9,11 +9,11 @@ export async function MergeOptionSets(args) {
         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 MERGE'));
+        console.log('%s Importing local file', chalk.yellow.bold('OPTION SET MERGE'));
         const fileLocation = args[3];
         console.log('Using File: ', fileLocation);
         await mergeOptionSets(fileLocation);
-        console.log(`%s Merged`, chalk.yellow.bold('OPTION SET MERGE'));
+        console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
     }
     catch (e) {
         console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));

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

@@ -9,11 +9,11 @@ export async function ParseOptionSetsLocalFiles(args) {
         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'));
+        console.log('%s Importing local file', chalk.yellow.bold('OPTION SET PARSE'));
         const fileLocation = args[3];
         console.log('Using File: ', fileLocation);
         await parseOptionSetsLocalFiles(fileLocation);
-        console.log(`%s Parsed`, chalk.yellow.bold('OPTION SET PARSE'));
+        console.log('%s Parsed', chalk.yellow.bold('OPTION SET PARSE'));
     }
     catch (e) {
         console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));

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

@@ -8,9 +8,9 @@ export async function UploadOptionSets(args) {
     try {
         const userConfig = await authUser();
         console.log(`%s Getting all types for orgId: ${userConfig.orgId}`, chalk.blue.bold('START'));
-        console.log(`%s Uploading`, chalk.yellow.bold('OPTION SETS'));
+        console.log('%s Uploading', chalk.yellow.bold('OPTION SETS'));
         await uploadOptionSets();
-        console.log(`%s Uploaded`, chalk.yellow.bold('OPTION SETS'));
+        console.log('%s Uploaded', chalk.yellow.bold('OPTION SETS'));
     }
     catch (e) {
         console.log(`%s Types Upload Failed. ${e}`, chalk.red.bold('FAIL'));