@contrail/cli 1.0.67 → 1.0.69

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

@@ -1,105 +1,105 @@
-import { Entities } from '@contrail/sdk';
-import chalk from 'chalk';
-import { Auth } from '../../auth/auth';
-import { ActionsDeployer, getActionsForApp, deleteAction } from './actions-deployer';
-import { App, AppDeclaration } from '../../interfaces';
-import { TriggerKeyDefinitionParser, ConfigPropertiesParser } from './app-template-parsers';
-import { WorkflowTemplateDefinitionDeployer } from '../../workflow-template-definitions/workflow-template-definition-deployer';
-import { getAllAvailableApps } from '../../api/apps';
-
-export class AppDeployer {
-  public async deploy(appDeclaration: AppDeclaration) {
-    let app = await this.getExistingApp(appDeclaration);
-    if (!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'));
-      app = await this.updateExistingApp(appDeclaration, app);
-    }
-    await new ActionsDeployer().deployActions(appDeclaration, app);
-    await new WorkflowTemplateDefinitionDeployer().deployWorkflowTemplateDefinitions(appDeclaration, app);
-  }
-
-  public async getExistingApp(appDeclaration: AppDeclaration): Promise<App> {
-    const orgId = Auth.config.orgId;
-    const apps = await getAllAvailableApps({orgId});
-    return apps.find(app => app.identifier === appDeclaration.appIdentifier);
-  }
-
-  private async createNewApp(appDeclaration: AppDeclaration) {
-
-    let configProperties;
-    if (appDeclaration?.appConfiguration) {
-      configProperties = ConfigPropertiesParser.getConfigProperties(appDeclaration.appConfiguration);
-    }
-
-    let triggerKeyDefinitions;
-    if (appDeclaration?.triggers) {
-      triggerKeyDefinitions = TriggerKeyDefinitionParser.buildTriggersArray(appDeclaration);
-    }
-
-    const newApp = {
-      identifier: appDeclaration.appIdentifier,
-      name: appDeclaration.appName,
-      public: appDeclaration.visibility === 'public',
-      description: appDeclaration.appDescription,
-      publisher: appDeclaration.publisher,
-      thumbnail: appDeclaration.thumbnail,
-      eventWorkflowTriggerKeyMapping: appDeclaration.eventWorkflowTriggerKeyMapping,
-      keywords: appDeclaration.keywords,
-      configProperties,
-      triggerKeyDefinitions,
-      dockerImageRef: appDeclaration.dockerImageRef,
-    };
-    const app = await new Entities().create({ entityName: 'app', object: newApp });
-    console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
-    return app;
-  }
-
-  public async updateExistingApp(appDeclaration: AppDeclaration, existingApp) {
-
-    let configProperties;
-    if (appDeclaration?.appConfiguration) {
-      configProperties = ConfigPropertiesParser.getConfigProperties(appDeclaration.appConfiguration);
-    }
-
-    let triggerKeyDefinitions;
-    if (appDeclaration?.triggers) {
-      triggerKeyDefinitions = TriggerKeyDefinitionParser.buildTriggersArray(appDeclaration);
-    }
-
-    const updates = {
-      name: appDeclaration.appName,
-      public: appDeclaration.visibility === 'public',
-      description: appDeclaration.appDescription,
-      publisher: appDeclaration.publisher,
-      thumbnail: appDeclaration.thumbnail,
-      eventWorkflowTriggerKeyMapping: appDeclaration.eventWorkflowTriggerKeyMapping,
-      keywords: appDeclaration.keywords,
-      configProperties,
-      triggerKeyDefinitions,
-      dockerImageRef: appDeclaration.dockerImageRef,
-    };
-    const app = await new Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
-    console.log(`%s      Updated app: ${app.name}`, chalk.yellow.bold('APP'));
-    return app;
-  }
-
-  public async remove(appDeclaration: AppDeclaration) {
-    let app = await this.getExistingApp(appDeclaration);
-    if (app) {
-      const actions = await getActionsForApp(app);
-      for(const action of actions)
-      {
-        console.log(`%s      Deleting action: ${action.identifier}`, chalk.yellow.bold('APP'));
-        await deleteAction(action.id);
-      }
-      app = await new Entities().delete({ entityName: 'app', id: app.id });
-      console.log(`%s      Deleted app: ${app.name}`, chalk.yellow.bold('APP'));
-    } else {
-      throw new Error('App not found.');
-    }
-  }
-
-}
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { Auth } from '../../auth/auth';
+import { ActionsDeployer, getActionsForApp, deleteAction } from './actions-deployer';
+import { App, AppDeclaration } from '../../interfaces';
+import { TriggerKeyDefinitionParser, ConfigPropertiesParser } from './app-template-parsers';
+import { WorkflowTemplateDefinitionDeployer } from '../../workflow-template-definitions/workflow-template-definition-deployer';
+import { getAllAvailableApps } from '../../api/apps';
+
+export class AppDeployer {
+  public async deploy(appDeclaration: AppDeclaration) {
+    let app = await this.getExistingApp(appDeclaration);
+    if (!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'));
+      app = await this.updateExistingApp(appDeclaration, app);
+    }
+    await new ActionsDeployer().deployActions(appDeclaration, app);
+    await new WorkflowTemplateDefinitionDeployer().deployWorkflowTemplateDefinitions(appDeclaration, app);
+  }
+
+  public async getExistingApp(appDeclaration: AppDeclaration): Promise<App> {
+    const orgId = Auth.config.orgId;
+    const apps = await getAllAvailableApps({orgId});
+    return apps.find(app => app.identifier === appDeclaration.appIdentifier);
+  }
+
+  private async createNewApp(appDeclaration: AppDeclaration) {
+
+    let configProperties;
+    if (appDeclaration?.appConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(appDeclaration.appConfiguration);
+    }
+
+    let triggerKeyDefinitions;
+    if (appDeclaration?.triggers) {
+      triggerKeyDefinitions = TriggerKeyDefinitionParser.buildTriggersArray(appDeclaration);
+    }
+
+    const newApp = {
+      identifier: appDeclaration.appIdentifier,
+      name: appDeclaration.appName,
+      public: appDeclaration.visibility === 'public',
+      description: appDeclaration.appDescription,
+      publisher: appDeclaration.publisher,
+      thumbnail: appDeclaration.thumbnail,
+      eventWorkflowTriggerKeyMapping: appDeclaration.eventWorkflowTriggerKeyMapping,
+      keywords: appDeclaration.keywords,
+      configProperties,
+      triggerKeyDefinitions,
+      dockerImageRef: appDeclaration.dockerImageRef,
+    };
+    const app = await new Entities().create({ entityName: 'app', object: newApp });
+    console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
+    return app;
+  }
+
+  public async updateExistingApp(appDeclaration: AppDeclaration, existingApp) {
+
+    let configProperties;
+    if (appDeclaration?.appConfiguration) {
+      configProperties = ConfigPropertiesParser.getConfigProperties(appDeclaration.appConfiguration);
+    }
+
+    let triggerKeyDefinitions;
+    if (appDeclaration?.triggers) {
+      triggerKeyDefinitions = TriggerKeyDefinitionParser.buildTriggersArray(appDeclaration);
+    }
+
+    const updates = {
+      name: appDeclaration.appName,
+      public: appDeclaration.visibility === 'public',
+      description: appDeclaration.appDescription,
+      publisher: appDeclaration.publisher,
+      thumbnail: appDeclaration.thumbnail,
+      eventWorkflowTriggerKeyMapping: appDeclaration.eventWorkflowTriggerKeyMapping,
+      keywords: appDeclaration.keywords,
+      configProperties,
+      triggerKeyDefinitions,
+      dockerImageRef: appDeclaration.dockerImageRef,
+    };
+    const app = await new Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
+    console.log(`%s      Updated app: ${app.name}`, chalk.yellow.bold('APP'));
+    return app;
+  }
+
+  public async remove(appDeclaration: AppDeclaration) {
+    let app = await this.getExistingApp(appDeclaration);
+    if (app) {
+      const actions = await getActionsForApp(app);
+      for(const action of actions)
+      {
+        console.log(`%s      Deleting action: ${action.identifier}`, chalk.yellow.bold('APP'));
+        await deleteAction(action.id);
+      }
+      app = await new Entities().delete({ entityName: 'app', id: app.id });
+      console.log(`%s      Deleted app: ${app.name}`, chalk.yellow.bold('APP'));
+    } else {
+      throw new Error('App not found.');
+    }
+  }
+
+}

package/src/apps/deploy-app/app-template-parsers.ts

@@ -1,44 +1,44 @@
-import { AppDeclaration, TriggerKeyDefinition, ConfigPropertyElements } from '../../interfaces';
-
-export class TriggerKeyDefinitionParser {
-  public static buildTriggersArray(appDeclaration: AppDeclaration): Array<TriggerKeyDefinition> {
-    const triggers: Array<TriggerKeyDefinition> = [];
-
-    for (const triggerName of Object.keys(appDeclaration.triggers)) {
-      const triggerDeclaration = appDeclaration.triggers[triggerName];
-
-      const triggerDefinition = {
-        triggerKey: triggerDeclaration.external ? `${appDeclaration.appIdentifier}:${triggerDeclaration.key}` : triggerDeclaration.key,
-        name: triggerDeclaration.name,
-        external: triggerDeclaration.external,
-        description: triggerDeclaration.description,
-      };
-      if (!triggerDefinition.triggerKey || !triggerDefinition.name) {
-        throw new Error('Illegal trigger declaration: must have key and name');
-      }
-      triggers.push(triggerDefinition);
-
-    }
-    return triggers;
-  }
-}
-
-export class ConfigPropertiesParser {
-  public static getConfigProperties(configPropertyElements: ConfigPropertyElements) {
-    const appConfiguration = [];
-    for (const configKey of Object.keys(configPropertyElements)) {
-      const declaration = configPropertyElements[configKey];
-      const config: any = {
-        label: declaration.label,
-        slug: configKey,
-        propertyType: declaration.propertyType, // TODO should support options
-        dynamic: declaration?.dynamic || false,
-      };
-      if (declaration.options) {
-        config.options = declaration.options;
-      }
-      appConfiguration.push(config);
-    }
-    return appConfiguration;
-  }
+import { AppDeclaration, TriggerKeyDefinition, ConfigPropertyElements } from '../../interfaces';
+
+export class TriggerKeyDefinitionParser {
+  public static buildTriggersArray(appDeclaration: AppDeclaration): Array<TriggerKeyDefinition> {
+    const triggers: Array<TriggerKeyDefinition> = [];
+
+    for (const triggerName of Object.keys(appDeclaration.triggers)) {
+      const triggerDeclaration = appDeclaration.triggers[triggerName];
+
+      const triggerDefinition = {
+        triggerKey: triggerDeclaration.external ? `${appDeclaration.appIdentifier}:${triggerDeclaration.key}` : triggerDeclaration.key,
+        name: triggerDeclaration.name,
+        external: triggerDeclaration.external,
+        description: triggerDeclaration.description,
+      };
+      if (!triggerDefinition.triggerKey || !triggerDefinition.name) {
+        throw new Error('Illegal trigger declaration: must have key and name');
+      }
+      triggers.push(triggerDefinition);
+
+    }
+    return triggers;
+  }
+}
+
+export class ConfigPropertiesParser {
+  public static getConfigProperties(configPropertyElements: ConfigPropertyElements) {
+    const appConfiguration = [];
+    for (const configKey of Object.keys(configPropertyElements)) {
+      const declaration = configPropertyElements[configKey];
+      const config: any = {
+        label: declaration.label,
+        slug: configKey,
+        propertyType: declaration.propertyType, // TODO should support options
+        dynamic: declaration?.dynamic || false,
+      };
+      if (declaration.options) {
+        config.options = declaration.options;
+      }
+      appConfiguration.push(config);
+    }
+    return appConfiguration;
+  }
 }

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

@@ -1,66 +1,66 @@
-import chalk from 'chalk';
-import fs from 'fs';
-import { authUser } from '../../auth/login';
-import { AppDeployer } from './app-deployer';
-import { AppDeclaration } from '../../interfaces';
-import { getSeparatorByPlatform } from '../../common';
-const yaml = require('js-yaml');
-
-function loadAppConfig(){
-  const TARGET_DIR = process.cwd();
-  try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'app.yml', 'utf8'));
-    console.log(doc);
-    return doc;
-  } catch (e) {
-    throw new Error(`ERROR PARSING YAML: ${e}`);
-  }
-}
-
-export async function deployApp(args) {
-  let appDeclaration: AppDeclaration;
-  try {
-    appDeclaration = loadAppConfig();
-  }
-  catch (e) {
-    console.log(`%s Application Deployment Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log(`%s Deploying Application. ${appDeclaration.appIdentifier}`, chalk.blue.bold('START'));
-  try {
-    await authUser();
-    await new AppDeployer().deploy(appDeclaration);
-  }
-  catch (e) {
-    console.log(`%s Application Deployment Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Deployment Complete.', chalk.green.bold('COMPLETE'));
-}
-
-export async function removeApp(args) {
-  let appDeclaration: AppDeclaration;
-  try {
-    appDeclaration = loadAppConfig();
-  }
-  catch (e) {
-    console.log(`%s Application Removal Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log(`%s Removing Application. ${appDeclaration.appIdentifier}`, chalk.blue.bold('START'));
-
-  try {
-    await authUser();
-    await new AppDeployer().remove(appDeclaration);
-  }
-  catch (e) {
-    console.log(`%s Application Removal Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Application Removal Complete.', chalk.green.bold('COMPLETE'));
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../../auth/login';
+import { AppDeployer } from './app-deployer';
+import { AppDeclaration } from '../../interfaces';
+import { getSeparatorByPlatform } from '../../common';
+const yaml = require('js-yaml');
+
+function loadAppConfig(){
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'app.yml', 'utf8'));
+    console.log(doc);
+    return doc;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+export async function deployApp(args) {
+  let appDeclaration: AppDeclaration;
+  try {
+    appDeclaration = loadAppConfig();
+  }
+  catch (e) {
+    console.log(`%s Application Deployment Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log(`%s Deploying Application. ${appDeclaration.appIdentifier}`, chalk.blue.bold('START'));
+  try {
+    await authUser();
+    await new AppDeployer().deploy(appDeclaration);
+  }
+  catch (e) {
+    console.log(`%s Application Deployment Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Deployment Complete.', chalk.green.bold('COMPLETE'));
+}
+
+export async function removeApp(args) {
+  let appDeclaration: AppDeclaration;
+  try {
+    appDeclaration = loadAppConfig();
+  }
+  catch (e) {
+    console.log(`%s Application Removal Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log(`%s Removing Application. ${appDeclaration.appIdentifier}`, chalk.blue.bold('START'));
+
+  try {
+    await authUser();
+    await new AppDeployer().remove(appDeclaration);
+  }
+  catch (e) {
+    console.log(`%s Application Removal Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Application Removal Complete.', chalk.green.bold('COMPLETE'));
 }