@contrail/cli 1.0.44 → 1.0.47

package/lib/cli.js

@@ -13,6 +13,7 @@ import { deleteWorkflowTemplates, localDeployWorkflowTemplate, listWorkflowTempl
 import { installApp, uninstallApp } from './apps/install-app/app-installer';
 import { upgradeApp } from './apps/upgrade-app/app-upgrader';
 import { cliInstallWorkflowTemplateDefinitions, listWorkflowTemplateDefinitions } from './workflow-template-definitions/workflow-template-definition-commands';
+import { configureProject } from './projects/project-uploader';
 const cliUsage = require('command-line-usage');
 /**
  *  Built using documentation here:
@@ -135,6 +136,18 @@ export async function cli(args) {
             }
             break;
         }
+        case 'projects': {
+            switch (command) {
+                case 'configure': {
+                    await configureProject(args);
+                    break;
+                }
+                default: {
+                    printIllegalCommand();
+                }
+            }
+            break;
+        }
         case 'workflow-templates': {
             switch (command) {
                 case 'load': {

package/lib/projects/interfaces.d.ts

@@ -0,0 +1,73 @@
+export declare class CommonConfiguration {
+    [key: string]: any;
+}
+export declare enum AssortmentType {
+    ASSORTMENT = "ASSORTMENT",
+    BOARD = "BOARD",
+    PLAN = "PLAN",
+    SHOWCASE = "SHOWCASE"
+}
+export declare class AssortmentConfiguration {
+    identifier: string;
+    name: string;
+    type: AssortmentType;
+    sourceAssortmentIdentifier?: string;
+    composedFromAssortmentIdentifiers?: string[];
+    ownerAtts?: {
+        [key: string]: any;
+    };
+    assortmentAtts?: {
+        [key: string]: any;
+    };
+}
+export declare class Folder {
+    identifier: string;
+    name: string;
+    assortments: AssortmentConfiguration[];
+    subFolders: Folder[];
+}
+export declare class ProjectConfiguration {
+    projectName: string;
+    identifier: string;
+    commonConfig: CommonConfiguration;
+    assortments: AssortmentConfiguration[];
+    subFolders: Folder[];
+}
+export declare class ProjectConfigurationTemplate {
+    projectName: string;
+    identifier: string;
+    commonConfig: CommonConfiguration;
+    allFolders: FolderSlim[];
+    allAssortments: AssortmentConfigurationSlim[];
+    allAssortmentRelationships: AssortmentConfigurationRelationships[];
+}
+export declare class FolderSlim {
+    identifier: string;
+    name: string;
+    folderIdentifier: string;
+}
+export declare class AssortmentConfigurationSlim {
+    identifier: string;
+    name: string;
+    type: AssortmentType;
+    folderIdentifier: string;
+    sourceAssortmentIdentifier?: string;
+    composedFromAssortmentIdentifiers?: string[];
+    ownerAtts?: {
+        [key: string]: any;
+    };
+    assortmentAtts?: {
+        [key: string]: any;
+    };
+}
+export declare class AssortmentConfigurationRelationships {
+    identifier: string;
+    sourceAssortmentIdentifier?: string;
+    composedFromAssortmentIdentifiers?: string[];
+    ownerAtts?: {
+        [key: string]: any;
+    };
+    assortmentAtts?: {
+        [key: string]: any;
+    };
+}

package/lib/projects/interfaces.js

@@ -0,0 +1,23 @@
+export class CommonConfiguration {
+}
+export var AssortmentType;
+(function (AssortmentType) {
+    AssortmentType["ASSORTMENT"] = "ASSORTMENT";
+    AssortmentType["BOARD"] = "BOARD";
+    AssortmentType["PLAN"] = "PLAN";
+    AssortmentType["SHOWCASE"] = "SHOWCASE";
+})(AssortmentType || (AssortmentType = {}));
+export class AssortmentConfiguration {
+}
+export class Folder {
+}
+export class ProjectConfiguration {
+}
+export class ProjectConfigurationTemplate {
+}
+export class FolderSlim {
+}
+export class AssortmentConfigurationSlim {
+}
+export class AssortmentConfigurationRelationships {
+}

package/lib/projects/project-uploader.d.ts

@@ -0,0 +1 @@
+export declare function configureProject(args: any): Promise<void>;

package/lib/projects/project-uploader.js

@@ -0,0 +1,104 @@
+import { Request } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+import yaml from 'js-yaml';
+export async function configureProject(args) {
+    try {
+        await authUser();
+        console.log('%s Parsing Template.', chalk.blue.bold('START'));
+        console.log('%s Uploading', chalk.yellow.bold('PROJECT'));
+        const templateFileLocation = args[3];
+        console.log('Using Template File Location: ', templateFileLocation);
+        await uploadProject(templateFileLocation);
+        console.log('%s Uploaded', chalk.yellow.bold('PROJECT'));
+    }
+    catch (e) {
+        console.log(`%s Project Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+        return;
+    }
+    console.log('%s Project Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+function getProjectFile(fileName) {
+    const CURRENT_DIR = process.cwd();
+    try {
+        const separator = getSeparatorByPlatform();
+        const fullPath = CURRENT_DIR + separator + fileName;
+        console.log('Getting file from path: ', fullPath);
+        const doc = yaml.load(fs.readFileSync(fullPath, 'utf8'));
+        return doc.projectConfiguration;
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadProject(templateFileLocation) {
+    const projectConfigurationFromFile = getProjectFile(templateFileLocation);
+    const projectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
+    console.log('Configuring Project.');
+    await Request.request('/project-configurator', {
+        method: 'POST',
+        body: JSON.stringify(projectConfiguration),
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+        },
+    });
+}
+function getProjectConfiguration(projectConfigurationFromFile) {
+    if (!projectConfigurationFromFile.allFolders && !projectConfigurationFromFile.allAssortments && !projectConfigurationFromFile.allAssortmentRelationships) {
+        return projectConfigurationFromFile;
+    }
+    const parsed = parseToProjectConfiguration(projectConfigurationFromFile);
+    return parsed;
+}
+function parseToProjectConfiguration(projectConfigurationFromFile) {
+    const projectConfiguration = {
+        projectName: projectConfigurationFromFile.projectName,
+        identifier: projectConfigurationFromFile.identifier,
+        commonConfig: projectConfigurationFromFile.commonConfig,
+        assortments: [],
+        subFolders: [],
+    };
+    const foldersByIdentifier = { [projectConfiguration.identifier]: projectConfiguration };
+    for (const folder of projectConfigurationFromFile.allFolders) {
+        foldersByIdentifier[folder.identifier] = folder;
+    }
+    const assortmentsByIdentifier = {};
+    for (const assortment of projectConfigurationFromFile.allAssortments) {
+        assortmentsByIdentifier[assortment.identifier] = assortment;
+    }
+    for (const assortmentRelationships of projectConfigurationFromFile.allAssortmentRelationships) {
+        const assortment = assortmentsByIdentifier[assortmentRelationships.identifier];
+        if (!assortment) {
+            console.warn('Relationship defined for assortment that is not defined.', assortmentRelationships);
+        }
+        else {
+            Object.assign(assortment, assortmentRelationships);
+        }
+    }
+    for (const assortment of projectConfigurationFromFile.allAssortments) {
+        const folder = foldersByIdentifier[assortment.folderIdentifier];
+        if (!folder) {
+            console.warn('Assortment defined for folder that is not defined.', assortment);
+        }
+        if (!folder.assortments) {
+            folder.assortments = [];
+        }
+        delete assortment.folderIdentifier;
+        folder.assortments.push(assortment);
+    }
+    for (const folderSlim of projectConfigurationFromFile.allFolders) {
+        const folder = foldersByIdentifier[folderSlim.folderIdentifier];
+        if (!folder) {
+            console.warn('Folder defined for folder that is not defined.', folderSlim);
+        }
+        if (!folder.subFolders) {
+            folder.subFolders = [];
+        }
+        delete folderSlim.folderIdentifier;
+        folder.subFolders.push(folderSlim);
+    }
+    return projectConfiguration;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.44",
+  "version": "1.0.47",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {
@@ -23,8 +23,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@contrail/sdk": "^1.0.154",
-    "@contrail/types": "^2.0.75",
+    "@contrail/sdk": "^1.1.43",
+    "@contrail/types": "^3.0.20",
     "@contrail/util": "^1.0.17",
     "amazon-cognito-identity-js": "^5.2.3",
     "arg": "^4.0.1",

package/src/cli.ts

@@ -14,6 +14,8 @@ import { deleteWorkflowTemplates, localDeployWorkflowTemplate, listWorkflowTempl
 import { installApp, uninstallApp } from './apps/install-app/app-installer';
 import { upgradeApp } from './apps/upgrade-app/app-upgrader';
 import { cliInstallWorkflowTemplateDefinitions, listWorkflowTemplateDefinitions } from './workflow-template-definitions/workflow-template-definition-commands';
+import { configureProject } from './projects/project-uploader';
+
 const cliUsage = require('command-line-usage');
 
 /**
@@ -145,6 +147,18 @@ export async function cli(args) {
     }
     break;
   }
+  case 'projects': {
+    switch (command) {
+    case 'configure': {
+      await configureProject(args);
+      break;
+    }
+    default: {
+      printIllegalCommand();
+    }
+    }
+    break;
+  }
   case 'workflow-templates': {
     switch (command) {
     case 'load': {

package/src/projects/interfaces.ts

@@ -0,0 +1,69 @@
+export class CommonConfiguration {
+  [key: string]: any;
+}
+
+export enum AssortmentType {
+  ASSORTMENT = 'ASSORTMENT',
+  BOARD = 'BOARD',
+  PLAN = 'PLAN',
+  SHOWCASE = 'SHOWCASE',
+}
+
+export class AssortmentConfiguration {
+  identifier: string;
+  name: string;
+  type: AssortmentType;
+  sourceAssortmentIdentifier?: string;
+  composedFromAssortmentIdentifiers?: string[];
+  ownerAtts?: {[key: string]: any};
+  assortmentAtts?: {[key: string]: any};
+}
+
+export class Folder {
+  identifier: string;
+  name: string;
+  assortments: AssortmentConfiguration[];
+  subFolders: Folder[];
+}
+
+export class ProjectConfiguration {
+  projectName: string;
+  identifier: string;
+  commonConfig: CommonConfiguration;
+  assortments: AssortmentConfiguration[];
+  subFolders: Folder[];
+}
+
+export class ProjectConfigurationTemplate {
+  projectName: string;
+  identifier: string;
+  commonConfig: CommonConfiguration;
+  allFolders: FolderSlim[];
+  allAssortments: AssortmentConfigurationSlim[];
+  allAssortmentRelationships: AssortmentConfigurationRelationships[];
+}
+
+export class FolderSlim {
+  identifier: string;
+  name: string;
+  folderIdentifier: string;
+}
+
+export class AssortmentConfigurationSlim {
+  identifier: string;
+  name: string;
+  type: AssortmentType;
+  folderIdentifier: string;
+  sourceAssortmentIdentifier?: string;
+  composedFromAssortmentIdentifiers?: string[];
+  ownerAtts?: {[key: string]: any};
+  assortmentAtts?: {[key: string]: any};
+}
+
+export class AssortmentConfigurationRelationships {
+  identifier: string;
+  sourceAssortmentIdentifier?: string;
+  composedFromAssortmentIdentifiers?: string[];
+  ownerAtts?: {[key: string]: any};
+  assortmentAtts?: {[key: string]: any};
+}

package/src/projects/project-uploader.ts

@@ -0,0 +1,130 @@
+import { Request } from '@contrail/sdk';
+import chalk from 'chalk';
+import fs from 'fs';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+import { ProjectConfiguration, ProjectConfigurationTemplate } from './interfaces';
+
+import yaml from 'js-yaml';
+
+export async function configureProject(args) {
+  try {
+    await authUser();
+    console.log('%s Parsing Template.', chalk.blue.bold('START'));
+
+    console.log('%s Uploading', chalk.yellow.bold('PROJECT'));
+    const templateFileLocation = args[3];
+    console.log('Using Template File Location: ', templateFileLocation);
+    await uploadProject(templateFileLocation);
+    console.log('%s Uploaded', chalk.yellow.bold('PROJECT'));
+
+  }
+  catch (e) {
+    console.log(`%s Project Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Project Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+
+function getProjectFile(fileName){
+  const CURRENT_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+    const fullPath = CURRENT_DIR + separator + fileName;
+    console.log('Getting file from path: ', fullPath);
+
+    const doc = yaml.load(fs.readFileSync(fullPath, 'utf8'));
+    return doc.projectConfiguration;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function uploadProject(templateFileLocation) {
+  const projectConfigurationFromFile = getProjectFile(templateFileLocation);
+  const projectConfiguration: ProjectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
+
+  console.log('Configuring Project.');
+
+  await Request.request(
+    '/project-configurator',
+    {
+      method: 'POST',
+      body: JSON.stringify(projectConfiguration),
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+    });
+}
+
+function getProjectConfiguration(projectConfigurationFromFile): ProjectConfiguration {
+  if (!projectConfigurationFromFile.allFolders && !projectConfigurationFromFile.allAssortments && !projectConfigurationFromFile.allAssortmentRelationships) {
+    return projectConfigurationFromFile;
+  }
+
+  const parsed = parseToProjectConfiguration(projectConfigurationFromFile);
+  return parsed;
+}
+
+function parseToProjectConfiguration(projectConfigurationFromFile: ProjectConfigurationTemplate): ProjectConfiguration {
+
+  const projectConfiguration: ProjectConfiguration = {
+    projectName: projectConfigurationFromFile.projectName,
+    identifier: projectConfigurationFromFile.identifier,
+    commonConfig: projectConfigurationFromFile.commonConfig,
+    assortments: [],
+    subFolders: [],
+  };
+
+  const foldersByIdentifier: any = {[projectConfiguration.identifier]: projectConfiguration};
+  for (const folder of projectConfigurationFromFile.allFolders) {
+    foldersByIdentifier[folder.identifier] = folder;
+  }
+
+  const assortmentsByIdentifier = {};
+  for (const assortment of projectConfigurationFromFile.allAssortments) {
+    assortmentsByIdentifier[assortment.identifier] = assortment;
+  }
+
+  for (const assortmentRelationships of projectConfigurationFromFile.allAssortmentRelationships) {
+    const assortment = assortmentsByIdentifier[assortmentRelationships.identifier];
+    if (!assortment) {
+      console.warn('Relationship defined for assortment that is not defined.', assortmentRelationships);
+    }
+    else {
+      Object.assign(assortment, assortmentRelationships);
+    }
+  }
+
+  for (const assortment of projectConfigurationFromFile.allAssortments) {
+    const folder = foldersByIdentifier[assortment.folderIdentifier];
+    if (!folder) {
+      console.warn('Assortment defined for folder that is not defined.', assortment);
+    }
+
+    if (!folder.assortments) {
+      folder.assortments = [];
+    }
+
+    delete assortment.folderIdentifier;
+    folder.assortments.push(assortment);
+  }
+
+  for (const folderSlim of projectConfigurationFromFile.allFolders) {
+    const folder = foldersByIdentifier[folderSlim.folderIdentifier];
+    if (!folder) {
+      console.warn('Folder defined for folder that is not defined.', folderSlim);
+    }
+
+    if (!folder.subFolders) {
+      folder.subFolders = [];
+    }
+
+    delete folderSlim.folderIdentifier;
+    folder.subFolders.push(folderSlim);
+  }
+
+  return projectConfiguration;
+}