@contrail/cli 1.0.67 → 1.0.69

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

@@ -1,73 +1,74 @@
-import arg from 'arg';
-import inquirer from 'inquirer';
-import chalk from 'chalk';
-import { setUpTemplate } from './setup-template';
-
-function parseArgumentsIntoOptions(rawArgs) {
-  const args = arg(
-    {
-      '--app-name': String,
-      '--template': String,
-      '-n': '--app-name',
-      '-t': '--template',
-    },
-    {
-      argv: rawArgs.slice(3),
-    },
-  );
-  return {
-    appName: args['--app-name'],
-    template: args['--template'],
-  };
-}
-async function promptForMissingOptions(options) {
-  const defaultTemplate = 'TypeScript';
-
-  const questions = [];
-  if (!options.appName) {
-    questions.push({
-      type: 'input',
-      name: 'appName',
-      validate: (val) => !!val,
-      message: 'What is the name of your app?',
-    });
-  }
-
-  if (!options.template) {
-    questions.push({
-      type: 'list',
-      name: 'template',
-      message: 'Which project template would you like to use?',
-      choices: ['TypeScript', 'JavaScript'],
-      default: defaultTemplate,
-    });
-  }
-
-  const answers = await inquirer.prompt(questions);
-  return {
-    ...options,
-    appName: options.appName || answers.appName,
-    template: options.template || answers.template,
-  };
-}
-
-export async function create(args) {
-
-  let options = parseArgumentsIntoOptions(args);
-  options = await promptForMissingOptions(options);
-  console.log('%s Setting up new new contrail application.', chalk.blue.bold('START'));
-
-  let error;
-  try {
-    await setUpTemplate(options);
-  }
-  catch (e) {
-    error = e;
-  }
-
-  if (error) {
-    console.log('%s Application initialization failed.', chalk.red.bold('FAIL'));
-  } else {
-    console.log('%s Application initialized successfully.', chalk.green.bold('COMPLETE'));
-  }
-}
+import arg from 'arg';
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+import { setUpTemplate } from './setup-template';
+
+function parseArgumentsIntoOptions(rawArgs) {
+  const args = arg(
+    {
+      '--app-name': String,
+      '--template': String,
+      '-n': '--app-name',
+      '-t': '--template',
+    },
+    {
+      argv: rawArgs.slice(3),
+    },
+  );
+  return {
+    appName: args['--app-name'],
+    template: args['--template'],
+  };
+}
+async function promptForMissingOptions(options) {
+  const defaultTemplate = 'TypeScript';
+  options.template = defaultTemplate; // Skip javascript option
+
+  const questions = [];
+  if (!options.appName) {
+    questions.push({
+      type: 'input',
+      name: 'appName',
+      validate: (val) => !!val,
+      message: 'What is the name of your app?',
+    });
+  }
+
+  if (!options.template) {
+    questions.push({
+      type: 'list',
+      name: 'template',
+      message: 'Which project template would you like to use?',
+      choices: ['TypeScript', 'JavaScript'],
+      default: defaultTemplate,
+    });
+  }
+
+  const answers = await inquirer.prompt(questions);
+  return {
+    ...options,
+    appName: options.appName || answers.appName,
+    template: options.template || answers.template,
+  };
+}
+
+export async function create(args) {
+
+  let options = parseArgumentsIntoOptions(args);
+  options = await promptForMissingOptions(options);
+  console.log('%s Setting up new new contrail application.', chalk.blue.bold('START'));
+
+  let error;
+  try {
+    await setUpTemplate(options);
+  }
+  catch (e) {
+    error = e;
+  }
+
+  if (error) {
+    console.log('%s Application initialization failed.', chalk.red.bold('FAIL'));
+  } else {
+    console.log('%s Application initialized successfully.', chalk.green.bold('COMPLETE'));
+  }
+}

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

@@ -1,38 +1,38 @@
-
-import ncp from 'ncp';
-import path from 'path';
-import { promisify } from 'util';
-const Listr = require('listr');
-import { projectInstall } from 'pkg-install';
-const copy = promisify(ncp);
-
-const TARGET_DIR = process.cwd();
-const currentFileUrl = import .meta.url;
-
-function copyTemplate(templateDir){
-  return copy(templateDir, TARGET_DIR, {
-    clobber: false,
-  });
-}
-
-export async function setUpTemplate(options) {
-  const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
-  try {
-    const tasks = new Listr([
-      {
-        title: 'Copy template files',
-        task: () => copyTemplate(templateDir),
-      },
-      {
-        title: 'Install dependencies',
-        task: () =>
-          projectInstall({
-            cwd: TARGET_DIR,
-          }),
-      },
-    ]);
-    await tasks.run();
-  } catch (e) {
-    throw new Error(`Error copying template: ${e}`);
-  }
+
+import ncp from 'ncp';
+import path from 'path';
+import { promisify } from 'util';
+const Listr = require('listr');
+import { projectInstall } from 'pkg-install';
+const copy = promisify(ncp);
+
+const TARGET_DIR = process.cwd();
+const currentFileUrl = import .meta.url;
+
+function copyTemplate(templateDir){
+  return copy(templateDir, TARGET_DIR, {
+    clobber: false,
+  });
+}
+
+export async function setUpTemplate(options) {
+  const templateDir = path.resolve(new URL(currentFileUrl).pathname, `../../../../templates/${options.template.toLocaleLowerCase()}`).replace(/\\/g, '\\').replace(/(.):\\(.):/g, '').replace(/%20/g, ' ');
+  try {
+    const tasks = new Listr([
+      {
+        title: 'Copy template files',
+        task: () => copyTemplate(templateDir),
+      },
+      {
+        title: 'Install dependencies',
+        task: () =>
+          projectInstall({
+            cwd: TARGET_DIR,
+          }),
+      },
+    ]);
+    await tasks.run();
+  } catch (e) {
+    throw new Error(`Error copying template: ${e}`);
+  }
 }

package/src/apps/deploy-app/actions-deployer.ts

@@ -1,140 +1,140 @@
-import { Entities } from '@contrail/sdk';
-import chalk from 'chalk';
-import { App, AppDeclaration, AppActionDeclaration, EventWorkflowActionDefinition } from '../../interfaces';
-import { ConfigPropertiesParser } from './app-template-parsers';
-import { getSeparatorByPlatform } from '../../common';
-
-import fs from 'fs';
-
-export async function getActionsForApp(app: App) {
-  return await new Entities().get({
-    entityName: 'event-workflow-action-definition',
-    criteria: { ownerKey: `app:${app.id}` },
-  });
-}
-
-export function getActionDeclarationIdentifier(actionKey, app: App) {
-  return app.identifier + ':' + actionKey;
-}
-
-export async function deleteAction(actionId): Promise<any> {
-  return await new Entities().delete({ entityName: 'event-workflow-action-definition', id: actionId });
-}
-
-export class ActionsDeployer {
-
-  async deployActions(appDeclaration: AppDeclaration, app: App) {
-
-    // FETCH ALL ACTIONS FROM THE API.
-    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 localActionKeys = Object.keys(appDeclaration.actions);
-      appActionIdentifiers = localActionKeys.map(x => getActionDeclarationIdentifier(x, app));
-      if (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: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>) {
-    console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
-
-    const identifier = 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, app);
-    }
-  }
-
-  private async createNewActionDefinition(actionKey: string, actionDeclaration: AppActionDeclaration, app: App) {
-    let configProperties;
-    if (actionDeclaration?.actionConfiguration) {
-      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
-    }
-    const newObject: EventWorkflowActionDefinition = {
-      identifier: getActionDeclarationIdentifier(actionKey, app),
-      name: actionDeclaration.name,
-      ownerKey: `app:${app.id}`,
-      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
-      configProperties,
-      async: actionDeclaration.async,
-    };
-
-    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;
-  }
-
-  private async updateActionDefinition(existingActionDefinition: EventWorkflowActionDefinition, actionDeclaration: AppActionDeclaration, app: App) {
-
-    let configProperties;
-    if (actionDeclaration?.actionConfiguration) {
-      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
-    }
-    else if (!actionDeclaration?.actionConfiguration && existingActionDefinition.configProperties) {
-      configProperties = null;
-    }
-
-    const updates: EventWorkflowActionDefinition = {
-      name: actionDeclaration.name,
-      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
-      configProperties,
-      async: actionDeclaration.async,
-    };
-
-    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;
-  }
-
-  async getFunction(actionDeclaration: AppActionDeclaration): Promise<string> {
-    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();
-  }
-}
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { App, AppDeclaration, AppActionDeclaration, EventWorkflowActionDefinition } from '../../interfaces';
+import { ConfigPropertiesParser } from './app-template-parsers';
+import { getSeparatorByPlatform } from '../../common';
+
+import fs from 'fs';
+
+export async function getActionsForApp(app: App) {
+  return await new Entities().get({
+    entityName: 'event-workflow-action-definition',
+    criteria: { ownerKey: `app:${app.id}` },
+  });
+}
+
+export function getActionDeclarationIdentifier(actionKey, app: App) {
+  return app.identifier + ':' + actionKey;
+}
+
+export async function deleteAction(actionId): Promise<any> {
+  return await new Entities().delete({ entityName: 'event-workflow-action-definition', id: actionId });
+}
+
+export class ActionsDeployer {
+
+  async deployActions(appDeclaration: AppDeclaration, app: App) {
+
+    // FETCH ALL ACTIONS FROM THE API.
+    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 localActionKeys = Object.keys(appDeclaration.actions);
+      appActionIdentifiers = localActionKeys.map(x => getActionDeclarationIdentifier(x, app));
+      if (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: string, actionDeclaration: AppActionDeclaration, app: App, existingActions: Array<any>) {
+    console.log(`%s \tDeploying action: ${actionKey}`, chalk.yellow.bold('ACTION'));
+
+    const identifier = 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, app);
+    }
+  }
+
+  private async createNewActionDefinition(actionKey: string, actionDeclaration: AppActionDeclaration, app: App) {
+    let configProperties;
+    if (actionDeclaration?.actionConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+    }
+    const newObject: EventWorkflowActionDefinition = {
+      identifier: getActionDeclarationIdentifier(actionKey, app),
+      name: actionDeclaration.name,
+      ownerKey: `app:${app.id}`,
+      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
+      configProperties,
+      async: actionDeclaration.async,
+    };
+
+    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;
+  }
+
+  private async updateActionDefinition(existingActionDefinition: EventWorkflowActionDefinition, actionDeclaration: AppActionDeclaration, app: App) {
+
+    let configProperties;
+    if (actionDeclaration?.actionConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
+    }
+    else if (!actionDeclaration?.actionConfiguration && existingActionDefinition.configProperties) {
+      configProperties = null;
+    }
+
+    const updates: EventWorkflowActionDefinition = {
+      name: actionDeclaration.name,
+      public: 'public' in actionDeclaration ? actionDeclaration.public : app.public,
+      configProperties,
+      async: actionDeclaration.async,
+    };
+
+    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;
+  }
+
+  async getFunction(actionDeclaration: AppActionDeclaration): Promise<string> {
+    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();
+  }
+}