@contrail/cli 1.0.0 → 1.0.2

package/lib/auth/auth.d.ts

@@ -0,0 +1,9 @@
+export interface AuthContext {
+    apiUserToken: string;
+    apiGateway?: string;
+    orgSlug?: string;
+    orgId?: string;
+}
+export declare class Auth {
+    static config: AuthContext;
+}

package/lib/auth/auth.js

@@ -0,0 +1,2 @@
+export class Auth {
+}

package/lib/auth/login.js

@@ -1,6 +1,7 @@
 const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
 import inquirer from 'inquirer';
-import { setConfig } from '@contrail/sdk';
+import { Request, setConfig } from '@contrail/sdk';
+import { Auth } from './auth';
 const CONFIGURATION = {
     userPoolId: 'us-east-1_x8hXZUsL6',
     clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '2oubek96sue5rsncovtqhs3scm',
@@ -59,7 +60,7 @@ export async function authUser() {
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
                 const user = result;
-                await setSDKConfig(user, params.orgSlug);
+                await setAuthContext(user, params);
                 resolve({ success: true, data: result });
             },
             onFailure: (err) => {
@@ -69,11 +70,27 @@ export async function authUser() {
         });
     });
 }
-async function setSDKConfig(user, orgSlug) {
-    // console.log('user:', user);
-    setConfig({
+async function setAuthContext(user, params) {
+    // Set Auth Config
+    Auth.config = {
         apiUserToken: user.idToken.jwtToken,
         apiGateway: process.env.API_GATEWAY,
-        orgSlug,
+        orgSlug: params.orgSlug,
+    };
+    // SET SDK CONFIG
+    setConfig(Auth.config);
+    const currentUser = await Request.request('/users/current', {
+        method: 'GET',
+        headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+        },
     });
+    if (!currentUser) {
+        throw Error('Could not get current user');
+    }
+    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
+    if (org) {
+        Auth.config.orgId = org.orgId || org.id;
+    }
 }

package/lib/create-app/setup-template.js

@@ -7,9 +7,9 @@ import { projectInstall } from 'pkg-install';
 const copy = promisify(ncp);
 const TARGET_DIR = process.cwd();
 const currentFileUrl = import.meta.url;
-const TEMPLATE_DIR = path.resolve(new URL(currentFileUrl).pathname, '../../../templates/javascript').replace(/\\/g, '\\').replace(/C:\\C:/g, '');
-// console.log("TEMPLATE_DIR: ", TEMPLATE_DIR)
-// console.log("TARGET_DIR: ", TARGET_DIR)
+const TEMPLATE_DIR = path.resolve(new URL(currentFileUrl).pathname, '../../../templates/javascript').replace(/\\/g, '\\').replace(/(.):\\(.):/g, '');
+// console.log('TEMPLATE_DIR: ', TEMPLATE_DIR);
+// console.log('TARGET_DIR: ', TARGET_DIR);
 function copyTemplate() {
     return copy(TEMPLATE_DIR, TARGET_DIR, {
         clobber: false,

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

@@ -5,7 +5,6 @@ export class ActionsDeployer {
     async deployActions(appDeclaration, app) {
         // FETCH ALL ACTIONS FROM THE API.
         const existingActions = await this.getActionsForApp(app);
-        console.log('existingActions: ', existingActions);
         // UPSERT / DELETE BASED ON ACTION IDENTIFIER
         console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
         for (const actionKey of Object.keys(appDeclaration.actions)) {
@@ -70,9 +69,7 @@ export class ActionsDeployer {
         }
         const CURRENT_DIR = process.cwd();
         const functionLocaiton = CURRENT_DIR + '\\' + actionDeclaration.handler;
-        console.log('getFunction: ', functionLocaiton);
         const content = fs.readFileSync(functionLocaiton);
-        console.log('content: ', content.toString());
         return content.toString();
     }
 }

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

@@ -6,4 +6,5 @@ export declare class AppDeployer {
     getExistingApp(appDeclaration: AppDeclartion): Promise<any>;
     updateExistingApp(appDeclaration: AppDeclartion, existingApp: any): Promise<any>;
     private createNewApp;
+    private getAppConfigProperties;
 }

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

@@ -1,5 +1,6 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
+import { Auth } from '../auth/auth';
 import { ActionsDeployer } from './actions-deployer';
 export class AppDeployer {
     async deploy(appDeclaration) {
@@ -24,7 +25,12 @@ export class AppDeployer {
         }
     }
     async getExistingApp(appDeclaration) {
-        const apps = await new Entities().get({ entityName: 'app', criteria: { orgId: '-VMrLJrt3clDKPi0', private: (appDeclaration.visibility === 'private') } });
+        const orgId = Auth.config.orgId;
+        const apps = await new Entities().get({ entityName: 'app', criteria: {
+                orgId,
+                private: (appDeclaration.visibility === 'private')
+            },
+        });
         //    console.log('Existing: ', apps);
         return apps.find(app => app.identifier === appDeclaration.appIdentifier);
     }
@@ -36,6 +42,8 @@ export class AppDeployer {
             publisher: appDeclaration.publisher,
             thumbnail: appDeclaration.thumbnail,
             eventWorkflowTriggerKeyMapping: 'NONE',
+            keywords: appDeclaration.keywords,
+            configProperties: this.getAppConfigProperties(appDeclaration),
         };
         const app = await new Entities().update({ entityName: 'app', id: existingApp.id, object: updates });
         console.log(`%s      Updated app: ${app.name}`, chalk.yellow.bold('APP'));
@@ -50,9 +58,27 @@ export class AppDeployer {
             publisher: appDeclaration.publisher,
             thumbnail: appDeclaration.thumbnail,
             eventWorkflowTriggerKeyMapping: 'NONE',
+            keywords: appDeclaration.keywords,
+            configProperties: this.getAppConfigProperties(appDeclaration),
         };
         const app = await new Entities().create({ entityName: 'app', object: newApp });
         console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
         return app;
     }
+    getAppConfigProperties(appDeclaration) {
+        const appConfiguration = [];
+        for (const configKey of Object.keys(appDeclaration.appConfiguration)) {
+            const declaration = appDeclaration.appConfiguration[configKey];
+            const config = {
+                label: declaration.label,
+                slug: configKey,
+                propertyType: declaration.propertyType,
+            };
+            if (declaration.options) {
+                config.options = declaration.options;
+            }
+            appConfiguration.push(config);
+        }
+        return appConfiguration;
+    }
 }

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

@@ -9,9 +9,18 @@ export interface AppDeclartion {
     publisher: string;
     version: string;
     thumbnail?: string;
+    keywords?: Array<string>;
     actions?: {
         [key: string]: AppActionDeclaration;
     };
+    appConfiguration: {
+        [key: string]: AppConfigurationElement;
+    };
+}
+export interface AppConfigurationElement {
+    propertyType: string;
+    options?: any[];
+    label: string;
 }
 export interface AppActionDeclaration {
     handler: string;

package/package.json

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

package/src/auth/auth.ts

@@ -0,0 +1,10 @@
+export interface AuthContext {
+  apiUserToken: string;
+  apiGateway?: string;
+  orgSlug?: string;
+  orgId?: string;
+}
+
+export class Auth {
+  public static config: AuthContext;
+}

package/src/auth/login.ts

@@ -1,6 +1,7 @@
 const AmazonCognitoIdentity = require('amazon-cognito-identity-js');
 import inquirer from 'inquirer';
-import { Entities, setConfig } from '@contrail/sdk';
+import { Entities, Request, setConfig } from '@contrail/sdk';
+import { Auth } from './auth';
 
 const CONFIGURATION = {
     userPoolId: 'us-east-1_x8hXZUsL6',
@@ -67,7 +68,8 @@ export async function authUser(){
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
                 const user = result;
-                await setSDKConfig(user, params.orgSlug);
+                await setAuthContext(user, params);
+
                 resolve({success: true, data: result});
             },
             onFailure: (err) => {
@@ -76,14 +78,31 @@ export async function authUser(){
             },
         });
     });
-
 }
 
-async function setSDKConfig(user, orgSlug){
-    // console.log('user:', user);
-    setConfig({
+async function setAuthContext(user, params){
+
+    // Set Auth Config
+    Auth.config = {
         apiUserToken: user.idToken.jwtToken,
         apiGateway: process.env.API_GATEWAY,
-        orgSlug,
+        orgSlug: params.orgSlug,
+    };
+    // SET SDK CONFIG
+    setConfig(Auth.config);
+
+    const currentUser = await Request.request('/users/current', {
+        method: 'GET',
+        headers: {
+            'Accept': 'application/json',
+            'Content-Type': 'application/json',
+        },
     });
-}
+    if (!currentUser) {
+        throw Error('Could not get current user');
+    }
+    const org = currentUser.orgs.find(o => o.orgSlug === Auth.config.orgSlug);
+    if (org) {
+        Auth.config.orgId = org.orgId || org.id;
+    }
+}

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

@@ -9,13 +9,9 @@ const copy = promisify(ncp);
 const TARGET_DIR = process.cwd();
 
 const currentFileUrl = import .meta.url;
-const TEMPLATE_DIR = path.resolve(
-   new URL(currentFileUrl).pathname,
-   '../../../templates/javascript',
-).replace(/\\/g, '\\').replace(/C:\\C:/g, '');
-
-// console.log("TEMPLATE_DIR: ", TEMPLATE_DIR)
-// console.log("TARGET_DIR: ", TARGET_DIR)
+const TEMPLATE_DIR = path.resolve(new URL(currentFileUrl).pathname, '../../../templates/javascript').replace(/\\/g, '\\').replace(/(.):\\(.):/g, '');
+// console.log('TEMPLATE_DIR: ', TEMPLATE_DIR);
+// console.log('TARGET_DIR: ', TARGET_DIR);
 
 function copyTemplate(){
   return copy(TEMPLATE_DIR, TARGET_DIR, {

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

@@ -8,7 +8,6 @@ export class ActionsDeployer {
 
     // FETCH ALL ACTIONS FROM THE API.
     const existingActions = await this.getActionsForApp(app);
-    console.log('existingActions: ', existingActions);
     // UPSERT / DELETE BASED ON ACTION IDENTIFIER
     console.log('%s \tDeploying actions.', chalk.yellow.bold('ACTION'));
     for (const actionKey of Object.keys(appDeclaration.actions)) {
@@ -79,9 +78,7 @@ export class ActionsDeployer {
     }
     const CURRENT_DIR = process.cwd();
     const functionLocaiton = CURRENT_DIR + '\\' + actionDeclaration.handler;
-    console.log('getFunction: ', functionLocaiton);
     const content = fs.readFileSync(functionLocaiton);
-    console.log('content: ', content.toString());
     return content.toString();
   }
 }

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

@@ -1,5 +1,7 @@
 import { Entities } from '@contrail/sdk';
 import chalk from 'chalk';
+import { config } from 'process';
+import { Auth } from '../auth/auth';
 import { ActionsDeployer } from './actions-deployer';
 import { App, AppDeclartion } from './interfaces';
 
@@ -27,7 +29,11 @@ export class AppDeployer {
   }
 
   public async getExistingApp(appDeclaration: AppDeclartion) {
-    const apps = await new Entities().get({ entityName: 'app', criteria: { orgId: '-VMrLJrt3clDKPi0', private: (appDeclaration.visibility === 'private')}});
+    const orgId = Auth.config.orgId;
+    const apps = await new Entities().get({ entityName: 'app', criteria: {
+      orgId,
+      private: (appDeclaration.visibility === 'private')},
+    });
 //    console.log('Existing: ', apps);
     return apps.find(app => app.identifier === appDeclaration.appIdentifier);
   }
@@ -39,11 +45,12 @@ export class AppDeployer {
       publisher: appDeclaration.publisher,
       thumbnail: appDeclaration.thumbnail,
       eventWorkflowTriggerKeyMapping: 'NONE',
+      keywords: appDeclaration.keywords,
+      configProperties: this.getAppConfigProperties(appDeclaration),
     };
     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;
-
   }
   private async createNewApp(appDeclaration: AppDeclartion) {
     const newApp = {
@@ -54,10 +61,29 @@ export class AppDeployer {
       publisher: appDeclaration.publisher,
       thumbnail: appDeclaration.thumbnail,
       eventWorkflowTriggerKeyMapping: 'NONE',
-
+      keywords: appDeclaration.keywords,
+      configProperties: this.getAppConfigProperties(appDeclaration),
     };
     const app = await new Entities().create({ entityName: 'app', object: newApp });
     console.log(`%s      Created new app: ${app.name}`, chalk.yellow.bold('APP'));
     return app;
+
   }
+  private getAppConfigProperties(appDeclaration: AppDeclartion){
+    const appConfiguration = [];
+    for (const configKey of Object.keys(appDeclaration.appConfiguration)) {
+      const declaration = appDeclaration.appConfiguration[configKey];
+      const config: any = {
+        label: declaration.label,
+        slug: configKey,
+        propertyType: declaration.propertyType,
+      };
+      if (declaration.options) {
+        config.options = declaration.options;
+      }
+      appConfiguration.push(config);
+    }
+    return appConfiguration;
+  }
+
 }

package/src/deploy-app/interfaces.ts

@@ -9,7 +9,15 @@ export interface AppDeclartion {
   publisher: string;
   version: string;
   thumbnail?: string;
+  keywords?: Array<string>;
   actions?: { [key: string]: AppActionDeclaration };
+  appConfiguration: { [key: string]: AppConfigurationElement };
+}
+
+export interface AppConfigurationElement {
+	propertyType: string;
+	options?: any[];
+	label: string;
 }
 
 export interface AppActionDeclaration {