@contrail/cli 2.0.19 → 2.1.2

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/2.0.19 darwin-arm64 node-v18.13.0
+@contrail/cli/2.1.2 darwin-arm64 node-v18.13.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -75,7 +75,6 @@ To get instructions on how to set up autocomplete for your shell, run `contrail
 * [`contrail types uploadOptionSets`](#contrail-types-uploadoptionsets)
 * [`contrail types uploadOptionSetsHierarchyLocalFile FILE NAME`](#contrail-types-uploadoptionsetshierarchylocalfile-file-name)
 * [`contrail types uploadRuleSets`](#contrail-types-uploadrulesets)
-* [`contrail types uploadTypePolicies`](#contrail-types-uploadtypepolicies)
 * [`contrail types uploadTypePropertyPolicies`](#contrail-types-uploadtypepropertypolicies)
 * [`contrail types uploadUsageInfo`](#contrail-types-uploadusageinfo)
 * [`contrail users export`](#contrail-users-export)
@@ -122,10 +121,10 @@ Get an api key for an app
 
 ```
 USAGE
-  $ contrail app getApiKey [--appIdentifier <value>]
+  $ contrail app getApiKey [-a <value>]
 
 FLAGS
-  --appIdentifier=<value>  The app identifier
+  -a, --appIdentifier=<value>  The app identifier
 
 DESCRIPTION
   Get an api key for an app
@@ -160,11 +159,12 @@ Publish the app
 
 ```
 USAGE
-  $ contrail app publish [-u] [-d]
+  $ contrail app publish [-u] [-v] [-d]
 
 FLAGS
-  -d, --debug    Debug the app deployment step and do not remove the intermediate build artifacts.
+  -d, --dryRun   Dry run the upgrade without actually updating the app.
   -u, --upgrade  In addition to deploying, upgrade the installed version of the app in this org to the latest one.
+  -v, --verbose  Debug the app deployment step and do not remove the intermediate build artifacts.
 
 DESCRIPTION
   Publish the app
@@ -1047,25 +1047,6 @@ EXAMPLES
   $ contrail types uploadRuleSets
 ```
 
-## `contrail types uploadTypePolicies`
-
-Upload type policies
-
-```
-USAGE
-  $ contrail types uploadTypePolicies [-d <value>]
-
-FLAGS
-  -d, --dir=<value>  [default: .] The directory from which to export the type policy data. Defaults to the current
-                     directory. The type policy data will be loaded from $dir/type-policies/*.yml
-
-DESCRIPTION
-  Upload type policies
-
-EXAMPLES
-  $ contrail types UploadTypePolicies
-```
-
 ## `contrail types uploadTypePropertyPolicies`
 
 Upload type property policies

package/dist/api/types.d.ts

@@ -5,5 +5,3 @@ export declare function getRuleSetLinks(): Promise<any>;
 export declare function getUsageInfo(): Promise<any>;
 export declare function getTypePropertyPolicies(): Promise<any>;
 export declare function getTypePropertyPolicyLinks(): Promise<any>;
-export declare function getTypePolicies(): Promise<any>;
-export declare function getTypePolicyLinks(): Promise<any>;

package/dist/api/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypePolicyLinks = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchies = exports.getOptionSets = void 0;
+exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchies = exports.getOptionSets = void 0;
 const sdk_1 = require("@contrail/sdk");
 async function getOptionSets() {
     return await new sdk_1.Entities().get({
@@ -50,17 +50,3 @@ async function getTypePropertyPolicyLinks() {
     });
 }
 exports.getTypePropertyPolicyLinks = getTypePropertyPolicyLinks;
-async function getTypePolicies() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-policy',
-    });
-}
-exports.getTypePolicies = getTypePolicies;
-async function getTypePolicyLinks() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-policy-link',
-    });
-}
-exports.getTypePolicyLinks = getTypePolicyLinks;

package/dist/commands/app/create.js

@@ -49,7 +49,8 @@ class CreateApp extends core_1.Command {
             publisher: answers.appPublisher,
             public: false,
             hidden: false,
-            description: answers.appDescription
+            description: answers.appDescription,
+            frameworkVersion: 2,
         };
         try {
             await new sdk_1.Entities().create({ entityName: 'app', object: newApp });

package/dist/commands/app/getApiKey.js

@@ -22,7 +22,7 @@ class GetAPIKeyApp extends core_1.Command {
                     })
                 }];
             const answers = await inquirer_1.default.prompt(questions);
-            console.log(`App API key: ${answers.appApiKey}`);
+            console.log(`App API key: (app:${answers.appApiKey})`);
         }
         else {
             const appFound = installedApps.find(x => x.app.identifier === flags.appIdentifier);
@@ -30,7 +30,7 @@ class GetAPIKeyApp extends core_1.Command {
                 console.log('You do not have such an app installed');
                 return;
             }
-            console.log(`App API key: ${appFound.apiKey.apiKey}`);
+            console.log(`App API key: (app:${appFound.apiKey.apiKey})`);
         }
     }
 }
@@ -41,5 +41,5 @@ GetAPIKeyApp.examples = [
 `,
 ];
 GetAPIKeyApp.flags = {
-    appIdentifier: core_1.Flags.string({ description: 'The app identifier', required: false })
+    appIdentifier: core_1.Flags.string({ char: 'a', description: 'The app identifier', required: false })
 };

package/dist/commands/app/publish.d.ts

@@ -5,7 +5,8 @@ export default class PublishApp extends Command {
     static strict: boolean;
     static flags: {
         upgrade: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        debug: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        dryRun: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/app/publish.js

@@ -22,7 +22,7 @@ class PublishApp extends core_1.Command {
         console.log(`%s Deploying Application. ${appDeclaration.appIdentifier}`, chalk_1.default.blue.bold('START'));
         try {
             await (0, login_1.authUser)();
-            const app = await new app_deployer_1.AppDeployer(flags.debug).deploy(appDeclaration);
+            const app = await new app_deployer_1.AppDeployer(flags.verbose, flags.dryRun).deploy(appDeclaration);
             if (flags.upgrade) {
                 const installedApps = await (0, apps_1.getInstalledApps)();
                 const installedAppOrg = installedApps.find(x => x.appId === app.id);
@@ -51,5 +51,6 @@ PublishApp.examples = [
 PublishApp.strict = true;
 PublishApp.flags = {
     upgrade: core_1.Flags.boolean({ char: 'u', description: 'In addition to deploying, upgrade the installed version of the app in this org to the latest one.', required: false }),
-    debug: core_1.Flags.boolean({ char: 'd', description: 'Debug the app deployment step and do not remove the intermediate build artifacts.', required: false }),
+    verbose: core_1.Flags.boolean({ char: 'v', description: 'Debug the app deployment step and do not remove the intermediate build artifacts.', required: false }),
+    dryRun: core_1.Flags.boolean({ char: 'd', description: 'Dry run the upgrade without actually updating the app.', required: false }),
 };

package/dist/commands/instance/import.js

@@ -7,7 +7,6 @@ const loadAll_1 = require("../types/loadAll");
 const upload_1 = require("../users/upload");
 const upload_2 = require("../groups/upload");
 const uploadTypePropertyPolicies_1 = require("../types/uploadTypePropertyPolicies");
-const uploadTypePolicies_1 = require("../types/uploadTypePolicies");
 class ImportInstance extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ImportInstance);
@@ -15,7 +14,6 @@ class ImportInstance extends core_1.Command {
         await (0, upload_1.uploadUsers)(path.join(flags.dir, 'users.yml'));
         await (0, upload_2.uploadGroups)(path.join(flags.dir, 'groups.yml'));
         await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(flags.dir);
-        await (0, uploadTypePolicies_1.uploadTypePolicies)(flags.dir);
     }
 }
 exports.default = ImportInstance;

package/dist/commands/types/getAll.d.ts

@@ -8,8 +8,6 @@ export interface DataHolder {
     usageInfo: any[];
     typePropertyPolicies: any[];
     typePropertyPolicyLinks: any[];
-    typePolicies: any[];
-    typePolicyLinks: any[];
 }
 export interface ReducedDataHolder {
     reducedTypes: any[];
@@ -20,8 +18,6 @@ export interface ReducedDataHolder {
     reducedUsageInfo: any[];
     reducedTypePropertyPolicies: any[];
     reducedTypePropertyPolicyLinks: any[];
-    reducedTypePolicies: any[];
-    reducedTypePolicyLinks: any[];
 }
 export default class GetAllTypes extends Command {
     static description: string;

package/dist/commands/types/getAll.js

@@ -45,8 +45,6 @@ async function getAll(outDir, overwrite) {
             usageInfo: await (0, types_1.getUsageInfo)(),
             typePropertyPolicies: await (0, types_1.getTypePropertyPolicies)(),
             typePropertyPolicyLinks: await (0, types_1.getTypePropertyPolicyLinks)(),
-            typePolicies: await (0, types_1.getTypePolicies)(),
-            typePolicyLinks: await (0, types_1.getTypePolicyLinks)(),
         };
         const reducedData = await reduceData(data);
         await saveData(reducedData, outDir, overwrite);
@@ -103,80 +101,11 @@ async function reduceTypePropertyPolicies(data) {
 function reduceTypePropertyPolicyLinks(data) {
     var _a, _b;
     const typeProperties = (_a = data === null || data === void 0 ? void 0 : data.types) === null || _a === void 0 ? void 0 : _a.map(x => x.typeProperties).reduce((x, y) => x.concat(y));
-    // make a map of all type properties to their type ids
-    const typePropertyIdToTypeSlugMap = data.types.reduce((map, obj) => {
-        for (const tp of obj.typeProperties) {
-            map[tp.id] = obj.slug;
-        }
-        return map;
-    }, {});
     return (_b = data === null || data === void 0 ? void 0 : data.typePropertyPolicyLinks) === null || _b === void 0 ? void 0 : _b.map(x => {
-        var _a, _b;
-        const typeSlug = typePropertyIdToTypeSlugMap[x.typePropertyId];
-        const typePropertySlug = (_a = typeProperties.find(y => y.id === x.typePropertyId)) === null || _a === void 0 ? void 0 : _a.slug;
-        const typePropertyPolicyLabel = (_b = data.typePropertyPolicies.find(y => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.label;
-        if (!typeSlug ||
-            !typePropertySlug ||
-            !typePropertyPolicyLabel) {
-            console.warn('Could not reduce bad type property policy link... skipping', x);
-            return null;
-        }
-        return {
-            typeSlug,
-            typePropertySlug,
-            typePropertyPolicyLabel,
-        };
-    }).filter(x => !!x);
-}
-async function reduceTypePolicies(data) {
-    var _a;
-    const orgUsers = await (0, users_1.getUserOrgs)();
-    const groups = await (0, users_1.getGroups)();
-    function reducePrincipal(statement) {
-        var _a, _b;
-        if (!(statement === null || statement === void 0 ? void 0 : statement.principal)) {
-            return statement;
-        }
-        const [type, id] = statement.principal.split(':');
-        if (!type || !id) {
-            return statement;
-        }
-        if (type === 'group') {
-            const groupName = (_a = groups.find(x => x.id === id)) === null || _a === void 0 ? void 0 : _a.name;
-            if (!groupName) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `group:${groupName}`;
-        }
-        else if (type === 'user') {
-            const userEmail = (_b = orgUsers.find(x => x.user.id === id)) === null || _b === void 0 ? void 0 : _b.email;
-            if (!userEmail) {
-                console.log(`Could not find group for statement. skipping invalid policy conversion ${id}`);
-                return statement;
-            }
-            statement.principal = `user:${userEmail}`;
-        }
-        return statement;
-    }
-    return (_a = data === null || data === void 0 ? void 0 : data.typePolicies) === null || _a === void 0 ? void 0 : _a.map(x => {
-        return {
-            label: x.label,
-            policy: {
-                version: x.policy.version,
-                statements: x.policy.statements.map(x => reducePrincipal(x)),
-            }
-        };
-    });
-}
-function reduceTypePolicyLinks(data) {
-    var _a;
-    const types = data === null || data === void 0 ? void 0 : data.types;
-    return (_a = data === null || data === void 0 ? void 0 : data.typePolicyLinks) === null || _a === void 0 ? void 0 : _a.map(x => {
         var _a, _b;
         return {
-            typeSlug: (_a = types.find(y => y.id === x.typeId)) === null || _a === void 0 ? void 0 : _a.slug,
-            typePolicyLabel: (_b = data.typePolicies.find(y => y.id === x.typePolicyId)) === null || _b === void 0 ? void 0 : _b.label,
+            typePropertySlug: (_a = typeProperties.find(y => y.id === x.typePropertyId)) === null || _a === void 0 ? void 0 : _a.slug,
+            typePropertyPolicyLabel: (_b = data.typePropertyPolicies.find(y => y.id === x.typePropertyPolicyId)) === null || _b === void 0 ? void 0 : _b.label,
         };
     });
 }
@@ -306,8 +235,6 @@ async function reduceData(data) {
         reducedUsageInfo: reduceUsageInfo(data),
         reducedTypePropertyPolicies: await reduceTypePropertyPolicies(data),
         reducedTypePropertyPolicyLinks: reduceTypePropertyPolicyLinks(data),
-        reducedTypePolicies: await reduceTypePolicies(data),
-        reducedTypePolicyLinks: reduceTypePolicyLinks(data),
     };
 }
 exports.reduceData = reduceData;
@@ -354,8 +281,6 @@ async function saveData(reducedData, dir, overwrite) {
         reducedUsageInfo: { filename: 'usage-info', split: false, fileLabel: '' },
         reducedTypePropertyPolicies: { filename: 'type-property-policies', split: true, fileLabel: 'label' },
         reducedTypePropertyPolicyLinks: { filename: 'type-property-policy-links', split: false, fileLabel: '' },
-        reducedTypePolicies: { filename: 'type-policies', split: true, fileLabel: 'label' },
-        reducedTypePolicyLinks: { filename: 'type-policy-links', split: false, fileLabel: '' },
     };
     for (const [key, folder] of Object.entries(propertyToFolderMap)) {
         const CURRENT_DIR = process.cwd();

package/dist/commands/types/loadAll.js

@@ -11,7 +11,6 @@ const uploadUsageInfo_1 = require("./uploadUsageInfo");
 const uploadRuleSets_1 = require("./uploadRuleSets");
 const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
 const type_uploader_1 = require("../../helpers/types/type-uploader");
-const uploadTypePolicies_1 = require("./uploadTypePolicies");
 class LoadAllTypes extends core_1.Command {
     async run() {
         const { flags } = await this.parse(LoadAllTypes);
@@ -37,7 +36,6 @@ async function loadAll(dir, skipPolicies = false) {
         await (0, uploadRuleSets_1.uploadRuleSets)(dir);
         if (!skipPolicies) {
             await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);
-            await (0, uploadTypePolicies_1.uploadTypePolicies)(dir);
         }
     }
     catch (e) {

package/dist/commands/types/mergeTypeProperties.js

@@ -63,8 +63,6 @@ async function mergeTypeProperties(fileLocation, typePaths) {
         usageInfo: [],
         typePropertyPolicies: [],
         typePropertyPolicyLinks: [],
-        typePolicies: [],
-        typePolicyLinks: [],
     };
     const reducedData = await (0, getAll_1.reduceData)(data);
     for (const typePath of typePaths) {

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -37,8 +37,6 @@ async function uploadTypePropertyPolicies(dir) {
     }
     catch (e) {
         console.log(`%s Type Property Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
-        //TODO make this only print if a debug flag is set
-        console.trace(e);
         return;
     }
     console.log('%s Type Property Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
@@ -149,16 +147,10 @@ async function uploadTPPolicyObjects(reducedTypePropertyPolicies) {
 }
 async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     const typesWithProperties = await (0, type_extractor_1.getTypes)();
-    const typeProperties = [];
-    typesWithProperties.forEach(type => {
-        if (type.typeProperties) {
-            for (const tp of type.typeProperties) {
-                tp.typeId = type.id;
-                tp.typeSlug = type.slug;
-                typeProperties.push(tp);
-            }
-        }
-    });
+    const typeProperties = typesWithProperties
+        .filter(t => !!t.typeProperties)
+        .map(t => t.typeProperties)
+        .reduce((a, b) => a.concat(b));
     const currentTPPs = await new sdk_1.Entities().get({
         entityName: 'type-property-policy',
     });
@@ -172,17 +164,17 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
         if (!foundTypeProperty || !foundTPP) {
             console.log('skipping unhashable, invalid policy link:', currentLink);
         }
-        const hash = `${foundTypeProperty.typeSlug}${foundTypeProperty.slug}|${foundTPP.label}`;
+        const hash = `${foundTypeProperty.slug}|${foundTPP.label}`;
         currentLinksHashes[hash] = currentLink;
     }
     const reducedLinksByHashes = {};
     for (const loadedLink of reducedTypePropertyPolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyLabel}`;
+        const hash = `${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyLabel}`;
         reducedLinksByHashes[hash] = loadedLink;
     }
     for (const loadedTPPLink of reducedTypePropertyPolicyLinks) {
         try {
-            const found = currentLinksHashes[`${loadedTPPLink.typeSlug}|${loadedTPPLink.typePropertySlug}|${loadedTPPLink.typePropertyPolicyLabel}`];
+            const found = currentLinksHashes[`${loadedTPPLink.typePropertySlug}|${loadedTPPLink.typePropertyPolicyLabel}`];
             if (!found) {
                 if (!transformReducedLink(loadedTPPLink, typeProperties, currentTPPs)) {
                     continue;
@@ -222,7 +214,7 @@ async function uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks) {
     }
 }
 function transformReducedLink(TPPLink, typeProperties, typePropertyPolicies) {
-    const foundTP = typeProperties.find(tp => tp.slug === TPPLink.typePropertySlug && tp.typeSlug === TPPLink.typeSlug);
+    const foundTP = typeProperties.find(tp => tp.slug === TPPLink.typePropertySlug);
     if (!foundTP) {
         console.error('Could not find type property with label', TPPLink.typePropertySlug);
         return false;

package/dist/helpers/app/app-deployer.d.ts

@@ -1,11 +1,12 @@
 import { App, AppCodePackage, AppDeclaration } from '../../interfaces';
 export declare class AppDeployer {
     private debug;
-    constructor(debug?: boolean);
+    private dryRun;
+    constructor(debug?: boolean, dryRun?: boolean);
     deploy(appDeclaration: AppDeclaration): Promise<App>;
     getExistingApp(appDeclaration: AppDeclaration): Promise<App>;
     private createNewApp;
     updateExistingApp(appDeclaration: AppDeclaration, existingApp: any): Promise<any>;
     remove(appDeclaration: AppDeclaration): Promise<void>;
 }
-export declare function createNodePackage(appIdentifier: string, debug: boolean): Promise<AppCodePackage>;
+export declare function createNodePackage(appIdentifier: string, debug: boolean, dryRun: boolean): Promise<AppCodePackage>;

package/dist/helpers/app/app-deployer.js

@@ -14,8 +14,9 @@ const axios_1 = tslib_1.__importDefault(require("axios"));
 const child_process = require('child_process');
 const fs = require('fs');
 class AppDeployer {
-    constructor(debug = false) {
+    constructor(debug = false, dryRun = false) {
         this.debug = debug;
+        this.dryRun = dryRun;
         //pass
     }
     async deploy(appDeclaration) {
@@ -28,6 +29,10 @@ class AppDeployer {
             console.log('%s      Updating existing app.', chalk_1.default.yellow.bold('APP'));
             app = await this.updateExistingApp(appDeclaration, app);
         }
+        if (this.dryRun) {
+            console.log('Dry run, skipping action and workflow template definition deployment.');
+            return {};
+        }
         await new actions_deployer_1.ActionsDeployer().deployActions(appDeclaration, app);
         await new workflow_template_definition_deployer_1.WorkflowTemplateDefinitionDeployer().deployWorkflowTemplateDefinitions(appDeclaration, app);
         return app;
@@ -51,7 +56,7 @@ class AppDeployer {
         const isDocker = Object.hasOwnProperty.call(appDeclaration, 'dockerImageRef');
         let appCodePackageId;
         if (!isDocker) { // this is the expected default behavior
-            const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug);
+            const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug, this.dryRun);
             appCodePackageId = appCodePackage.id;
         }
         const newApp = {
@@ -68,7 +73,12 @@ class AppDeployer {
             triggerKeyDefinitions,
             dockerImageRef: (_a = appDeclaration.dockerImageRef) !== null && _a !== void 0 ? _a : null,
             appCodePackageId: appCodePackageId !== null && appCodePackageId !== void 0 ? appCodePackageId : null,
+            frameworkVersion: 2,
         };
+        if (this.dryRun) {
+            console.log('Dry run, not creating app');
+            return {};
+        }
         const app = await new sdk_1.Entities().create({ entityName: 'app', object: newApp });
         console.log(`%s      Created new app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
         return app;
@@ -87,7 +97,7 @@ class AppDeployer {
         const isDocker = Object.hasOwnProperty.call(appDeclaration, 'dockerImageRef');
         let appCodePackageId;
         if (!isDocker) { // this is the expected default behavior
-            const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug);
+            const appCodePackage = await createNodePackage(appDeclaration.appIdentifier, this.debug, this.dryRun);
             appCodePackageId = appCodePackage.id;
         }
         const updates = {
@@ -103,7 +113,12 @@ class AppDeployer {
             triggerKeyDefinitions,
             dockerImageRef: (_a = appDeclaration.dockerImageRef) !== null && _a !== void 0 ? _a : null,
             appCodePackageId: appCodePackageId !== null && appCodePackageId !== void 0 ? appCodePackageId : null,
+            frameworkVersion: 2,
         };
+        if (this.dryRun) {
+            console.log('Dry run, not creating app');
+            return {};
+        }
         const app = await new sdk_1.Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
         console.log(`%s      Updated app: ${app.name}`, chalk_1.default.yellow.bold('APP'));
         return app;
@@ -125,7 +140,7 @@ class AppDeployer {
     }
 }
 exports.AppDeployer = AppDeployer;
-async function createNodePackage(appIdentifier, debug) {
+async function createNodePackage(appIdentifier, debug, dryRun) {
     // zip src code and package.json and package-lock.json files into a zip file
     // and upload as a code package.
     const entitiesClient = new sdk_1.Entities();
@@ -133,7 +148,6 @@ async function createNodePackage(appIdentifier, debug) {
         // clear and make temp directory
         fs.rmSync('tmp/', { recursive: true, force: true });
         fs.cpSync('package.json', 'tmp/package.json');
-        fs.cpSync('app.yml', 'tmp/app.yml');
         //copy package-lock.json if it exists
         if (fs.existsSync('package-lock.json')) {
             fs.cpSync('package-lock.json', 'tmp/package-lock.json');
@@ -145,9 +159,15 @@ async function createNodePackage(appIdentifier, debug) {
         console.log('Building package...');
         child_process.execSync('npx tsc --outDir tmp/dist');
         console.log('Building package done.');
+        // including the app.yml file in the package at the dist level
+        fs.cpSync('app.yml', 'tmp/dist/app.yml');
         console.log('Zipping package...');
         await (0, zip_a_folder_1.zip)('tmp/', 'tmp.zip');
         console.log('Zipping package done.');
+        if (dryRun) {
+            console.log('Dry run, skipping cloud updates');
+            return {};
+        }
         console.log('Uploading package to S3...');
         let apps = await entitiesClient.get({ entityName: 'app', criteria: { hidden: true } });
         apps = apps.concat(await entitiesClient.get({ entityName: 'app', criteria: { private: true } }));

package/dist/templates/typescript/app.yml

@@ -5,7 +5,6 @@ visibility: private  # This should be private unless you want to develop an app
 hidden: false # can be used with a public app to prevent it from showing on the marketplace, but still installable by other orgs
 publisher: "Your company name" # Your company name, used for public apps
 version: 1.0
-# dockerImageRef: CHANGE_ME  # Deprecated. For VibeIQ Deployment... for use by VibeIQ employees only
 
 # Properties you can configure when you install the app.
 # These property values will be available to all of your actions when they run

package/dist/templates/typescript/package.json

@@ -7,36 +7,22 @@
     "@contrail/contrail-cli": "bin/init",
     "contrail": "bin/init"
   },
-  "config": {
-    "wf": "/workflow-actions-prod"
-  },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
     "build": "tsc",
-    "start": "nodemon --watch \"src/**/*.ts\" --exec ts-node src/framework/mock-server.ts",
-    "debug": "nodemon -r ts-node/register --inspect=127.0.0.1:60002 --watch 'actions/**/*.ts' --exec node src/framework/mock-server.ts",
+    "start": "nodemon --watch \"src/**/*.ts\" --exec ts-node src/main.ts",
+    "debug": "nodemon -r ts-node/register --inspect=127.0.0.1:60002 --watch 'actions/**/*.ts' --exec node src/main.ts",
     "lint": "eslint . --fix",
     "test": "jest",
-    "test-watch": "jest --watch",
-    "docker-build": "docker build . -t \"${npm_package_name}:${npm_package_version}\"  --platform=linux/amd64",
-    "docker-build:win": "docker build . -t \"%npm_package_name%:%npm_package_version%\"  --platform=linux/amd64",
-    "docker-run-entry": "docker run -it --entrypoint=/bin/bash \"${npm_package_name}:${npm_package_version}\"",
-    "docker-run-entry:win": "docker run -it --entrypoint=/bin/bash \"%npm_package_name%:%npm_package_version%\"",
-    "docker-run": "docker run --env CONTRAIL_CLI_ENV=DEV -p 9000:8080 \"${npm_package_name}:${npm_package_version}\"",
-    "docker-run:win": "docker run  --env CONTRAIL_CLI_ENV=DEV -p 9000:8080 \"%npm_package_name%:%npm_package_version%\"",
-    "docker-ecr-login": "aws ecr get-login-password | docker login --username AWS --password-stdin ${AWS_REGISTRY}",
-    "docker-ecr-login:win": "aws ecr get-login-password | docker login --username AWS --password-stdin %AWS_REGISTRY%",
-    "docker-tag": "docker tag ${npm_package_name}:${npm_package_version} \"${AWS_REGISTRY}${npm_package_config_wf}:${npm_package_name}.${npm_package_version}\"",
-    "docker-tag:win": "docker tag %npm_package_name%:%npm_package_version% %AWS_REGISTRY%%npm_package_config_wf%:%npm_package_name%.%npm_package_version%",
-    "docker-push": "docker push \"${AWS_REGISTRY}${npm_package_config_wf}:${npm_package_name}.${npm_package_version}\"",
-    "docker-push:win": "docker push \"%AWS_REGISTRY%%npm_package_config_wf%:%npm_package_name%.%npm_package_version%\""
+    "test-watch": "jest --watch"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@contrail/app-framework": "^1.0.9",
     "@contrail/sdk": "^1.1.54",
     "chalk": "^4.0.0",
     "js-yaml": "^4.1.0"
@@ -44,6 +30,7 @@
   "devDependencies": {
     "@types/node": "^18.14.6",
     "body-parser": "^1.20.2",
+    "copyfiles": "^2.4.1",
     "express": "^4.18.2",
     "jest": "^29.2.2",
     "nodemon": "^1.19.4",

package/dist/templates/typescript/src/actions/logItem.ts

@@ -1,21 +1,24 @@
-import { Entities } from "@contrail/sdk";
-import { AppActionCallBack, AppActionCallbackStatus } from "../framework";
-import { Logger } from "../framework/logger";
+import { Entities } from '@contrail/sdk';
+import { Action, AppAction, AppActionCallBack, AppActionCallbackStatus, Logger } from '@contrail/app-framework';
 
-export async function execute(event, config: any, logger: Logger): Promise<AppActionCallBack> {
-  logger.log('Starting Example Action');
-  logger.log('Getting item from SDK');
+export class LogItemAction implements AppAction {
 
-  const item = await new Entities().get({
-    entityName: 'item',
-    id: event.id,
-  });
-  logger.log('Got item: ', item);
+  @Action('logItem')
+  public async execute(event, config: any, logger: Logger): Promise<AppActionCallBack> {
+    logger.log('Starting Example Action');
+    logger.log('Getting item from SDK');
 
-  return {
-    output: {
-      item,
-    },
-    status: AppActionCallbackStatus.SUCCESS
-  };
+    const item = await new Entities().get({
+      entityName: 'item',
+      id: event.id,
+    });
+    logger.log('Got item: ', item);
+
+    return {
+      output: {
+        item,
+      },
+      status: AppActionCallbackStatus.SUCCESS
+    };
+  }
 }

package/dist/templates/typescript/src/main.ts

@@ -0,0 +1,48 @@
+import { ContrailAppModule, loadAppConfig, registerAppInfo, runMockServer, AppActionRequest, AppActionResponse, ActionDispatcher, GLOBAL_ACTION_REGISTRY } from '@contrail/app-framework';
+
+// we can't use static import here. Require only
+import fs from 'fs';
+import path from 'path';
+const pJson = require('../package.json');
+
+const APP_YML_LOCATION = path.resolve(path.join(__dirname, '..', 'app.yml'));
+export class AppModule extends ContrailAppModule {
+
+  initModule() {
+    // register the app info
+    const appConfig = loadAppConfig(APP_YML_LOCATION);
+    registerAppInfo({
+      appName: appConfig.appIdentifier, //appName is required
+      packageVersion: pJson.version
+    });
+
+    // register app's actions
+    for (const file of fs.readdirSync(path.join(__dirname, 'actions'))) {
+      // only parse js and ts file, avoid property files
+      if (
+        file.endsWith('.js') ||
+        (file.endsWith('.ts') && !file.endsWith('.d.ts'))
+      ) {
+        require(path.join(__dirname, 'actions', file));
+      }
+    }
+
+    console.log(`Registered ${Object.keys(GLOBAL_ACTION_REGISTRY).length} action(s):`);
+    for(const key of Object.keys(GLOBAL_ACTION_REGISTRY)) {
+      console.log(`\t- ${appConfig.appIdentifier}:${key}`);
+    }
+  }
+}
+
+// If the module is being run directly, run the mock server
+// https://nodejs.org/api/modules.html#accessing-the-main-module
+if (require.main === module) {
+  runMockServer(new AppModule(), null);
+}
+
+// special handler for Lambda
+export async function handle(data: AppActionRequest): Promise<AppActionResponse> {
+  // start the module
+  new AppModule().initModule();
+  return ActionDispatcher.dispatchActionRequest(data);
+}

package/dist/templates/typescript/tsconfig.json

@@ -1,17 +1,9 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
-    "module": "commonjs",
     "declaration": true,
+    "emitDecoratorMetadata": true,
     "esModuleInterop": true,
-    "outDir": "dist",
-    "strict": false,
     "experimentalDecorators": true,
-    "strictPropertyInitialization": false,
-    "noImplicitAny": false,
-    "emitDecoratorMetadata": true,
-    "skipLibCheck": true,
-    "moduleResolution": "node",
     "lib": [
       "es5",
       "ES2015",
@@ -21,8 +13,25 @@
       "dom",
       "esnext.asynciterable"
     ],
-    "types": ["node"]
+    "module": "CommonJS",
+    // "moduleResolution": "node",
+    "noImplicitAny": false,
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "strictPropertyInitialization": false,
+    "target": "ES2020",
+    "types": [
+      "node"
+    ]
   },
-  "include": ["src"],
-  "exclude": ["node_modules", "**/__tests__/*"]
-}
+  "exclude": [
+    "node_modules",
+    "**/__tests__/*"
+  ],
+  "include": [
+    "src",
+    "package.json"
+  ]
+}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.19",
+  "version": "2.1.2",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -44,6 +44,7 @@
         "appIdentifier": {
           "name": "appIdentifier",
           "type": "option",
+          "char": "a",
           "description": "The app identifier",
           "required": false,
           "multiple": false
@@ -110,13 +111,21 @@
           "required": false,
           "allowNo": false
         },
-        "debug": {
-          "name": "debug",
+        "verbose": {
+          "name": "verbose",
           "type": "boolean",
-          "char": "d",
+          "char": "v",
           "description": "Debug the app deployment step and do not remove the intermediate build artifacts.",
           "required": false,
           "allowNo": false
+        },
+        "dryRun": {
+          "name": "dryRun",
+          "type": "boolean",
+          "char": "d",
+          "description": "Dry run the upgrade without actually updating the app.",
+          "required": false,
+          "allowNo": false
         }
       },
       "args": {}
@@ -881,30 +890,6 @@
       },
       "args": {}
     },
-    "types:uploadTypePolicies": {
-      "id": "types:uploadTypePolicies",
-      "description": "Upload type policies",
-      "strict": true,
-      "pluginName": "@contrail/cli",
-      "pluginAlias": "@contrail/cli",
-      "pluginType": "core",
-      "aliases": [],
-      "examples": [
-        "$ contrail types UploadTypePolicies\n"
-      ],
-      "flags": {
-        "dir": {
-          "name": "dir",
-          "type": "option",
-          "char": "d",
-          "description": "The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml",
-          "required": false,
-          "multiple": false,
-          "default": "."
-        }
-      },
-      "args": {}
-    },
     "types:uploadTypePropertyPolicies": {
       "id": "types:uploadTypePropertyPolicies",
       "description": "Upload type property policies",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "2.0.19",
+  "version": "2.1.2",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",
@@ -22,7 +22,7 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@contrail/sdk": "^1.2.3",
+    "@contrail/sdk": "^1.2.0",
     "@contrail/types": "^3.0.20",
     "@contrail/util": "^1.0.17",
     "@oclif/core": "^2",

package/dist/commands/types/uploadTypePolicies.d.ts

@@ -1,10 +0,0 @@
-import { Command } from '@oclif/core';
-export default class UploadTypePolicies extends Command {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    run(): Promise<void>;
-}
-export declare function uploadTypePolicies(dir: string): Promise<void>;

package/dist/commands/types/uploadTypePolicies.js

@@ -1,226 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadTypePolicies = void 0;
-const tslib_1 = require("tslib");
-const sdk_1 = require("@contrail/sdk");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const login_1 = require("../../auth/login");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const core_1 = require("@oclif/core");
-const type_extractor_1 = require("../../helpers/types/type-extractor");
-const users_1 = require("../../api/users");
-const yaml = require('js-yaml');
-class UploadTypePolicies extends core_1.Command {
-    async run() {
-        const { flags } = await this.parse(UploadTypePolicies);
-        return await uploadTypePolicies(flags.dir);
-    }
-}
-exports.default = UploadTypePolicies;
-UploadTypePolicies.description = 'Upload type policies';
-UploadTypePolicies.examples = [
-    `$ contrail types UploadTypePolicies
-`,
-];
-UploadTypePolicies.flags = {
-    dir: core_1.Flags.string({ char: 'd', description: 'The directory from which to export the type policy data. Defaults to the current directory. The type policy data will be loaded from $dir/type-policies/*.yml', required: false, default: '.' }),
-};
-async function uploadTypePolicies(dir) {
-    try {
-        await (0, login_1.authUser)();
-        console.log('%s Uploading', chalk_1.default.yellow.bold('TYPE POLICY'));
-        const [reducedTypePolicies, reducedTypePolicyLinks] = await loadTypePolicies(dir);
-        await uploadTypePolicyObjects(reducedTypePolicies);
-        await uploadTypePolicyLinks(reducedTypePolicyLinks);
-        console.log('%s Uploaded', chalk_1.default.yellow.bold('TYPE POLICY'));
-    }
-    catch (e) {
-        console.log(`%s Type Policy Upload Failed. ${e}`, chalk_1.default.red.bold('FAIL'));
-        return;
-    }
-    console.log('%s Type Policy Upload Complete.', chalk_1.default.green.bold('COMPLETE'));
-}
-exports.uploadTypePolicies = uploadTypePolicies;
-function loadTypePolicies(fromDir) {
-    const tps = [];
-    let tpLinks = [];
-    const dir = path.join(fromDir, 'type-policies');
-    try {
-        const files = fs_1.default.readdirSync(dir);
-        for (const file of files) {
-            tps.push(yaml.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
-        }
-        tpLinks = yaml.load(fs_1.default.readFileSync(path.join(fromDir, 'type-policy-links.yml'), 'utf8'));
-        return [tps, tpLinks];
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadTypePolicyObjects(reducedTypePolicies) {
-    const orgUsers = await (0, users_1.getUserOrgs)();
-    const groups = await (0, users_1.getGroups)();
-    function fillPrincipal(statement) {
-        const principal = statement === null || statement === void 0 ? void 0 : statement.principal;
-        if (!principal) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
-            return statement;
-        }
-        const [type, identifier] = principal.split(':');
-        if (!type || !identifier) {
-            console.warn(`skipping bad statement principal ${statement === null || statement === void 0 ? void 0 : statement.principal}`);
-            return statement;
-        }
-        if (type === 'group') {
-            const group = groups.find(x => x.name === identifier);
-            if (!group) {
-                console.log(`Could not find group ${identifier}`);
-            }
-            else {
-                statement.principal = `group:${group.id}`;
-            }
-        }
-        else if (type === 'user') {
-            const orgUser = orgUsers.find(x => x.user.email === identifier);
-            if (!orgUser) {
-                console.log(`Could not find user ${identifier}`);
-            }
-            else {
-                statement.principal = `user:${orgUser.user.id}`;
-            }
-        }
-        return statement;
-    }
-    reducedTypePolicies.forEach(policy => {
-        policy.policy.statements = policy.policy.statements.map(x => fillPrincipal(x));
-    });
-    const currentTypePolicies = await new sdk_1.Entities().get({
-        entityName: 'type-policy',
-    });
-    const currentTypePolicyByLabel = {};
-    for (const currentTypePolicy of currentTypePolicies) {
-        currentTypePolicyByLabel[currentTypePolicy.label] = currentTypePolicy;
-    }
-    const loadedTypePolicyByName = {};
-    for (const loadedTPP of reducedTypePolicies) {
-        loadedTypePolicyByName[loadedTPP.label] = loadedTPP;
-    }
-    for (const [label, loadedTPP] of Object.entries(loadedTypePolicyByName)) {
-        try {
-            const found = currentTypePolicyByLabel[label];
-            if (!found) {
-                console.log('Creating: ', label);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-policy',
-                    object: loadedTPP
-                });
-            }
-            else {
-                console.log('Updating: ', label);
-                await new sdk_1.Entities().update({
-                    entityName: 'type-policy',
-                    id: found.id,
-                    object: loadedTPP,
-                });
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Uploading Type Policy: ${err}`);
-        }
-    }
-    for (const [label, currentTPP] of Object.entries(currentTypePolicyByLabel)) {
-        try {
-            const found = loadedTypePolicyByName[label];
-            if (!found) {
-                console.log('Deleting: ', label);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-policy',
-                    id: currentTPP['id'],
-                });
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Type Policy: ${err}`);
-        }
-    }
-}
-async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
-    const types = await (0, type_extractor_1.getTypes)();
-    const currentTypePolicies = await new sdk_1.Entities().get({
-        entityName: 'type-policy',
-    });
-    const currentTypePolicyLinks = await new sdk_1.Entities().get({
-        entityName: 'type-policy-link',
-    });
-    const currentLinksHashes = {};
-    for (const currentLink of currentTypePolicyLinks) {
-        const foundType = types.find(type => type.id === currentLink.typeId);
-        const foundTypePolicy = currentTypePolicies.find(tp => tp.id === currentLink.typePolicyId);
-        if (!foundType || !foundTypePolicy) {
-            console.log('skipping unhashable, invalid policy link:', currentLink);
-        }
-        const hash = `${foundType.slug}|${foundTypePolicy.label}`;
-        currentLinksHashes[hash] = currentLink;
-    }
-    const reducedLinksByHashes = {};
-    for (const loadedLink of reducedTypePolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePolicyLabel}`;
-        reducedLinksByHashes[hash] = loadedLink;
-    }
-    for (const loadedTPLink of reducedTypePolicyLinks) {
-        try {
-            const found = currentLinksHashes[`${loadedTPLink.typeSlug}|${loadedTPLink.typePolicyLabel}`];
-            if (!found) {
-                if (!transformReducedLink(loadedTPLink, types, currentTypePolicies)) {
-                    continue;
-                }
-                await new sdk_1.Entities().create({
-                    entityName: 'type-policy-link',
-                    object: {
-                        typePolicyId: loadedTPLink.typePolicyId,
-                        typeId: loadedTPLink.typeId,
-                    },
-                });
-            }
-            else {
-                if (!transformReducedLink(loadedTPLink, types, currentTypePolicies)) {
-                    continue;
-                }
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Uploading type policy links: ${err}`);
-        }
-    }
-    for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
-        try {
-            const found = reducedLinksByHashes[currentLinkHash];
-            if (!found) {
-                console.log('Deleting: ', currentLinkHash);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-policy-link',
-                    id: currentLink['id'],
-                });
-            }
-        }
-        catch (err) {
-            throw new Error(`Error Deleting rule set link: ${err}`);
-        }
-    }
-}
-function transformReducedLink(typePolicyLink, types, typePolicies) {
-    const foundType = types.find(type => type.slug === typePolicyLink.typeSlug);
-    if (!foundType) {
-        console.error('Could not find type with slug', typePolicyLink.typeSlug);
-        return false;
-    }
-    typePolicyLink.typeId = foundType.id;
-    const foundTypePolicy = typePolicies.find(tpp => tpp.label === typePolicyLink.typePolicyLabel);
-    if (!foundTypePolicy) {
-        console.error('Could not find type policy with label', typePolicyLink.typePolicyLabel);
-        return false;
-    }
-    typePolicyLink.typePolicyId = foundTypePolicy.id;
-    return true;
-}

package/dist/templates/typescript/Dockerfile

@@ -1,15 +0,0 @@
-# docker build -t app-name .
-# docker run -p 9000:8080 app-name
-FROM public.ecr.aws/lambda/nodejs:16
-
-# Install NPM dependencies for function
-COPY package* ${LAMBDA_TASK_ROOT}
-COPY app.yml  ${LAMBDA_TASK_ROOT}
-RUN npm install
-
-COPY tsconfig.json  ${LAMBDA_TASK_ROOT}
-COPY src/       ${LAMBDA_TASK_ROOT}/src
-
-RUN npm run build
-
-CMD ["dist/framework/handler.execute"]

package/dist/templates/typescript/docker_deploy.bat

@@ -1 +0,0 @@
-npm run docker-ecr-login:win && npm version patch && npm run docker-build:win && npm run docker-tag:win && npm run docker-push:win

package/dist/templates/typescript/src/framework/action-dispatcher.ts

@@ -1,93 +0,0 @@
-/** 
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-
-import { setAppCredentials } from "@contrail/sdk";
-import { loadAppConfig } from "./app-config";
-import { AppActionCallbackStatus, AppActionRequest, AppActionResponse } from "./interfaces";
-import { Logger } from "./logger";
-var pjson = require('../../package.json');
-
-const APP_CONFIG = loadAppConfig();
-const appName = APP_CONFIG.appIdentifier;
-
-export class ActionDispatcher {
-  
-  public static async dispatchActionRequest(data: AppActionRequest) : Promise<AppActionResponse> {
-    // Sets the auth creds on the SDK
-    await setAppCredentials(data.apiKey, data.orgSlug);
-
-    const logger = new Logger();
-    const event = (typeof data.event === 'string')
-      ? JSON.parse(data.event)
-      : data.event;
-
-    logger.log(`App Info: `, pjson.name, ':', pjson.version);
-    return ActionDispatcher.delegateToHandler(event, data, logger);
-  }
-
-  private static async delegateToHandler(event, data: AppActionRequest, logger: Logger) : Promise<AppActionResponse>{ 
-    try {
-      const handler = ActionDispatcher.getActionHandler(data);
-      let actionResults = await handler(event, data, logger)
-      let body: any = {
-        logs: logger.allEntries,
-        taskId: data.taskId,
-        status: AppActionCallbackStatus.SUCCESS,
-      };
-
-      if(typeof actionResults === 'string'){
-        body.output = { message: actionResults }
-      } else if(typeof actionResults === 'object'){
-        if(actionResults.output){
-          body.output = actionResults.output;
-        }
-        if(actionResults.status) {
-          body.status = actionResults.status;
-        }
-      } 
-      return {
-        statusCode: 200,
-        body
-      }    
-    } catch (error) {
-      console.log("Error caught in handling action, sending Failure status: ", error)
-      return {
-        statusCode: 200,
-        body: {
-          output: {
-            errorMessage: error.message,
-            errorDetails: error.details
-          },
-          taskId: data.taskId,
-          logs: logger.allEntries,
-          status: AppActionCallbackStatus.FAILURE,
-        }
-      }    
-    }
-  }
-
-  /** Retrives the handler function for the requested action 
-  */
-  private static getActionHandler(data: AppActionRequest): (event, data, logger) => any {
-    try {
-      const actionPath = data.action;
-      const actionName = actionPath.substring(appName.length + 1, actionPath.length);
-      console.log('action: ',  actionPath, actionName);
-      const handlerFile = require(`../actions/${actionName}`);
-      if(!handlerFile) {
-        throw new Error(`Handler file could not be located for action : ${data.action}`);  
-      }   
-      const handlerFunction = handlerFile.execute;
-      if(!handlerFunction) {
-        throw new Error(`Handler function 'execute' could not be located for action : ${data.action}`);  
-      }
-      return handlerFunction;
-    } catch (error) {
-      console.log("Error caught in getActionHandler: ", error)
-      throw new Error(`Could not locate handler function for requested action: ${data.action}`);
-    }
-  }
-}

package/dist/templates/typescript/src/framework/app-config.ts

@@ -1,24 +0,0 @@
-/**
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-import fs from 'fs';
-const yaml = require('js-yaml');
-
-export function loadAppConfig(){
-  const TARGET_DIR = process.cwd();
-  try {
-    const separator = getSeparatorByPlatform();
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + 'app.yml', 'utf8'));
-    return doc;
-  } catch (e) {
-    throw new Error(`ERROR PARSING YAML: ${e}`);
-  }
-}
-
-export function getSeparatorByPlatform() {
-  const isWin = process.platform === 'win32';
-  const separator = isWin ? '\\' : '/';
-  return separator;
-}

package/dist/templates/typescript/src/framework/handler.ts

@@ -1,11 +0,0 @@
-/** 
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-
-import { AppActionRequest, AppActionResponse, ActionDispatcher } from '.';
-
-export async function execute(data: AppActionRequest): Promise<AppActionResponse> {
-  return ActionDispatcher.dispatchActionRequest(data);
-}

package/dist/templates/typescript/src/framework/index.ts

@@ -1,3 +0,0 @@
-export * from './interfaces';
-export * from './action-dispatcher';
-export * from './logger';

package/dist/templates/typescript/src/framework/interfaces.ts

@@ -1,32 +0,0 @@
-/** 
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-export interface AppActionRequest {
-  action: string;
-  apiKey: string;
-  orgSlug: string;
-  taskId: string; 
-  event: any;
-  [key:string] : any;
-}
-
-
-export interface AppActionResponse {
-  statusCode: number;
-  body: AppActionCallBack;
-}
-
-export interface AppActionCallBack {
-  output?: any;
-  status?: AppActionCallbackStatus;
-  logs?: Array<string>;
-  taskId?: string;
-}
-
-
-export enum AppActionCallbackStatus {
-  FAILURE = 'FAILURE',
-  SUCCESS = 'SUCCESS'
-}

package/dist/templates/typescript/src/framework/logger.ts

@@ -1,21 +0,0 @@
-/** 
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-
-export class Logger {
-  allEntries : Array<string> = [];
-  public log(...args){
-    console.log(...args);
-    this.allEntries.push(new Date().toISOString() + ': ' + args.join(''));
-  }
-
-  public getEntries(){
-    return this.allEntries.join('\n');
-  }
-
-  public clearEntries(){
-    this.allEntries = [];
-  }
-}

package/dist/templates/typescript/src/framework/mock-server.ts

@@ -1,31 +0,0 @@
-/** 
- * WARNING:  Do not modify this file, it is part of the generic runtime handling logic
- * for VibeIQ app actions.
- */
-
-
-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}`);
-});