@contrail/cli 1.0.15 → 1.0.17

package/src/colors/color-loader.ts

@@ -0,0 +1,110 @@
+import { Entities } from '@contrail/sdk';
+import chalk from 'chalk';
+import { authUser } from '../auth/login';
+import { getSeparatorByPlatform } from '../common';
+
+const csv = require('csvtojson')
+
+interface Color {
+  name: string;
+  hex: string;
+  red?: number;
+  green?: number;
+  blue?: number;
+}
+
+export async function deleteColors() {
+  try {
+    await authUser();
+    const colors = await getExistingColors();
+    console.log("Deleting %s colors", colors.length)
+    for (const color of colors) {
+      await deleteColor(color);
+    }
+  }
+  catch (e) {
+    console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+  console.log('%s Deleting Colors Complete.', chalk.green.bold('COMPLETE'));
+}
+
+export async function loadColors() {
+  try {
+    await authUser();
+    console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+    console.log(`%s Uploading`, chalk.yellow.bold('COLORS'));
+    await uploadColors();
+    console.log(`%s Uploaded`, chalk.yellow.bold('COLORS'));
+
+  }
+  catch (e) {
+    console.log(`%s Loading Colors Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Loading Colors Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function getLocalColors() {
+  console.log("loading colors from local file")
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const csvFilePath = TARGET_DIR + separator + 'colors.csv'
+    return await csv().fromFile(csvFilePath)
+  } catch (e) {
+    throw new Error(`ERROR PARSING COLORS CSV: ${e}`);
+  }
+}
+
+async function getExistingColors() {
+  console.log(`%s Getting Existing Colors`, chalk.yellow.bold('COLORS'));
+  try {
+    return new Entities().get({ entityName: 'color'}); //, useSearch: false }); Not in EntitiesClientGetOptions yet
+  } catch (e) {
+    throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
+  }
+}
+
+async function deleteColor(color) {
+  try {
+    await new Entities().delete({ entityName: 'color', id: color.id });
+  } catch (e) {
+    throw new Error(`ERROR DOWNLOADING COLORS: ${e}`);
+  }
+}
+
+async function uploadColors() {
+  const colors: Color[] = await getLocalColors();
+  const existingColors = await getExistingColors();
+  const existingNamesValues = existingColors.filter(x => x.name).map(x => x.name)
+  for (const color of colors) {
+    if (existingNamesValues.includes(color.name)) {
+      console.log(`%s SKIPPING %s (%s)`, chalk.yellow.bold('COLORS'), color.hex, color.name);
+      continue;
+    }
+    if (color.hex.length > 1 && color.hex[0] === '#') {
+      color.hex = color.hex.substring(1);
+    }
+    const o: any = {
+      hex: color.hex,
+      name: color.name
+    }
+    if (color.red) {
+      o.red = color.red
+    }
+    if (color.green) {
+      o.green = color.green
+    }
+    if (color.blue) {
+      o.blue = color.blue
+    }
+
+    await new Entities().create({
+      entityName: 'color',
+      object: o
+    });
+  }
+}

package/src/config/config.ts

@@ -28,8 +28,7 @@ export async function readVibeIQConfig() {
     console.debug(`failed to open config file (${configFileLocation}) for reading.`);
     console.debug('trying to initialize config file');
     await initializeVibeIQConfig();
-    console.error(`Could not open config file (${configFileLocation}) for reading.`);
-    throw e
+    fileContent = await fsPromises.readFile(configFileLocation);
   }
 
   try {
@@ -54,12 +53,24 @@ export async function getConfig() {
   return await readVibeIQConfig();
 }
 
-export async function storeConfig(incomingConfig: Object) {
-  const config = await readVibeIQConfig();
-  const newConfig = {
-    ...config,
-    ...incomingConfig
-  };
-  await writeVibeIQConfig(newConfig);
+export async function deleteConfigs(configNames: string[]) {
+  const currentConfig = await readVibeIQConfig();
+  for(const configName of configNames) {
+    delete currentConfig[configName];
+  }
+  await storeConfig(currentConfig, false);
+}
+
+export async function storeConfig(incomingConfig: Object, merge=true) {
+  let config;
+  if (merge) {
+    config = {
+      ... await readVibeIQConfig(),
+      ... incomingConfig
+    }
+  } else {
+    config = incomingConfig
+  }
+  await writeVibeIQConfig(config);
 }
 

package/src/config/configCommands.ts

@@ -0,0 +1,13 @@
+import {deleteConfigs, readVibeIQConfig} from './config';
+export async function listConfig() {
+  console.log(await readVibeIQConfig())
+}
+
+export async function removeConfig(args) {
+  if (args?.length < 4) {
+    throw new Error('At least one configuration must be included to be removed.');
+  }
+
+  await deleteConfigs(args.slice(3));
+
+}

package/src/types/csv-parser.ts

@@ -0,0 +1,59 @@
+import csvToJson from 'csvtojson';
+import * as client from 'https'
+import { Entities } from '@contrail/sdk';
+
+export async function getCSVFromFile(loadFileId: string): Promise<any[]> {
+
+  let file;
+  try {
+    file = await new Entities().get({ entityName: 'file', id: loadFileId });
+    console.log('Got file: ', file);
+  } catch (e) {
+    console.log(`Failed to get file: ${loadFileId}`, JSON.stringify(e));
+    throw new Error(`Failed to get file: ${loadFileId} - ` + JSON.stringify(e));
+  }
+
+  if (!file || !file.downloadUrl) {
+    console.log(`File: ${loadFileId} does not have a downloadUrl`);
+    throw new Error(`File: ${loadFileId} does not have a downloadUrl`);
+  }
+
+  // get csv
+  let response;
+  try {
+    response = await new Promise((resolve, reject) => {
+      client.get(file.downloadUrl, function(res) {
+        console.log('Status code:', res.statusCode);
+        console.log('Status text:', res.statusMessage);
+
+        let body = '';
+
+        res.on('data', (data) => {
+          body += data.toString();
+        });
+
+        res.on('end', () => {
+          console.log('Response body:');
+          //console.log(body);
+          resolve(body);
+        });
+
+      }).on('error', function(e) {
+        console.error(e);
+        reject(e);
+      });
+    });
+  } catch (e) {
+    console.log(`Failed to get data from downloadUrl: ${file.downloadUrl}`, e);
+    throw e;
+  }
+
+  if (!response) {
+    console.log('Response is empty');
+    throw new Error('Response is empty');
+  }
+  const csvJson = await csvToJson({flatKeys: true}).fromString(response);
+  // console.log('csvJson', csvJson);
+
+  return csvJson;
+}

package/src/types/option-set-parser.ts

@@ -0,0 +1,55 @@
+import { ReducedOptionSet } from './interfaces';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { parseOptionSets } from '@contrail/types';
+import chalk from 'chalk';
+const csv = require('csvtojson')
+const yaml = require('js-yaml');
+
+export async function ParseOptionSetsLocalFiles(args) {
+  try {
+    if (args?.length < 4) {
+      throw new Error('File name must be included.');
+    }
+    console.log(`%s Importing local file`, chalk.yellow.bold('OPTION SET PARSE'));
+    const fileLocation = args[3];
+    console.log('Using File: ', fileLocation);
+
+    await parseOptionSetsLocalFiles(fileLocation);
+    console.log(`%s Parsed`, chalk.yellow.bold('OPTION SET PARSE'));
+
+  }
+  catch (e) {
+    console.log(`%s PARSE Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s PARSE Complete.', chalk.green.bold('COMPLETE'));
+}
+
+async function loadOptionSetCSV(fileLocation) {
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const fullPath = TARGET_DIR + separator + fileLocation;
+    console.log('Getting file from path: ', fullPath);
+
+    return await csv().fromFile(fullPath)
+  } catch (e) {
+    throw new Error(`ERROR PARSING CSV: ${e}`);
+  }
+}
+
+async function parseOptionSetsLocalFiles(fileLocation) {
+  const uploadedOptionData = await loadOptionSetCSV(fileLocation);
+  const parsedOptionSets = parseOptionSets(uploadedOptionData);
+  saveData({optionSets: parsedOptionSets})
+}
+
+function saveData(data) {
+  const yamlStr = yaml.dump(data);
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + 'parsed_local_optionSets.yml', yamlStr, 'utf8');
+}

package/src/types/parse-types.ts

@@ -1,9 +1,10 @@
-import { TypeProcessor } from '@contrail/sdk';
+import { GetSuggestedTypes } from '@contrail/types';
 import chalk from 'chalk';
 import fs from 'fs';
 import { getSeparatorByPlatform } from '../common';
 import * as csvToJson from 'csvtojson';
 import { authUser } from '../auth/login';
+import { getCSVFromFile } from './csv-parser';
 
 const yaml = require('js-yaml');
 
@@ -49,7 +50,7 @@ export async function ParseTypesFromFiles(args) {
   console.log('%s Parsing Complete.', chalk.green.bold('COMPLETE'));
 }
 
-async function loadDataFromCSV(fileName) {
+async function loadDataFromLocalCSV(fileName) {
   const CURRENT_DIR = process.cwd();
   try {
     const separator = getSeparatorByPlatform();
@@ -70,7 +71,7 @@ async function parseTypesFromLocalFiles(fileLocations: string[]) {
   for (const fileLocation of fileLocations) {
     try {
       console.log('Getting data for fileLocation: ', fileLocation);
-      const csvData = await loadDataFromCSV(fileLocation);
+      const csvData = await loadDataFromLocalCSV(fileLocation);
 
       console.log(`CSV import was successful. ${csvData?.length} rows found. Adding to total rows.`);
       csvJSONData.push(...csvData);
@@ -82,7 +83,7 @@ async function parseTypesFromLocalFiles(fileLocations: string[]) {
   }
 
   console.log(`CSV imports were successful. ${csvJSONData?.length} total rows found.`);
-  const suggestions = await new TypeProcessor().GetSuggestedTypes(csvJSONData)
+  const suggestions = GetSuggestedTypes(csvJSONData)
   saveData({optionSets: suggestions.OptionSets}, 'parsed_optionSets.yml');
   saveData({typeProperties: suggestions.TypeProperties}, 'parsed_typeProperties.yml');
 }
@@ -90,7 +91,23 @@ async function parseTypesFromLocalFiles(fileLocations: string[]) {
 async function parseTypesFromFiles(fileIds: string[]) {
   await authUser();
 
-  const suggestions = await new TypeProcessor().GetSuggestedTypesFromFiles({loadFileIds: fileIds})
+  // get csv data
+  const csvJSONData: any[] = [];
+  for (const loadFileId of fileIds) {
+    try {
+      console.log('Getting data for fileId: ', loadFileId);
+      const csvJSON = await getCSVFromFile(loadFileId);
+      console.log(`CSV download was successful. ${csvJSON?.length} rows found. Adding to total rows`);
+      csvJSONData.push(...csvJSON);
+    }
+    catch (e) {
+      console.log('Error retrieving csv data', e);
+      throw e;
+    }
+  }
+
+  console.log(`CSV downloads were successful. ${csvJSONData?.length} total rows found.`);
+  const suggestions = GetSuggestedTypes(csvJSONData)
 
   saveData({optionSets: suggestions.OptionSets}, 'parsed_optionSets.yml');
   saveData({typeProperties: suggestions.TypeProperties}, 'parsed_typeProperties.yml');