@contrail/cli 1.0.67 → 1.0.69

package/src/types/option-set-hierarchy-uploader.ts

@@ -1,122 +1,122 @@
-import { Entities } from '@contrail/sdk';
-import fs from 'fs';
-import * as path from 'path';
-import { authUser } from '../auth/login';
-import chalk from 'chalk';
-
-const yaml = require('js-yaml');
-
-export async function UploadOptionSetHierarchies(args) {
-  try {
-    await authUser();
-
-    console.log('%s Uploading', chalk.yellow.bold('OPTION SET HIERARCHIES'));
-    const optionSetHierarchies = await loadOptionSetHierarchies();
-    await uploadOptionSetHierarchies(optionSetHierarchies);
-    console.log('%s Uploaded', chalk.yellow.bold('OPTION SET HIERARCHIES'));
-
-  }
-  catch (e) {
-    console.log(`%s Option set hierarchy Upload Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Option set hierarchy Upload Complete.', chalk.green.bold('COMPLETE'));
-}
-
-function loadOptionSetHierarchies() {
-  const TARGET_DIR = process.cwd();
-  try {
-    const files = fs.readdirSync(path.join(TARGET_DIR, 'option-set-hierarchies'));
-    const OSHs = [];
-    for(const file of files) {
-      OSHs.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-set-hierarchies', file), 'utf8')));
-    }
-    return OSHs;
-  } catch (e) {
-    throw new Error(`ERROR PARSING YAML: ${e}`);
-  }
-}
-
-async function uploadOptionSetHierarchies(loadedOSHs) {
-
-  const optionSets = await new Entities().get({
-    entityName: 'type-property-option-set',
-  });
-
-  const currentOSHs = await new Entities().get({
-    entityName: 'option-set-hierarchy',
-  });
-
-  const optionSetsByName = {};
-  for (const optionSet of optionSets) {
-    optionSetsByName[optionSet.name] = optionSet;
-  }
-
-  const currentOSHByName = {};
-  for (const currentOSH of currentOSHs) {
-    currentOSHByName[currentOSH.name] = currentOSH;
-  }
-
-  const loadedOSHByName = {};
-  for (const loadedOSH of loadedOSHs) {
-    loadedOSHByName[loadedOSH.name] = loadedOSH;
-  }
-
-  console.debug('current OSH:', currentOSHs);
-  console.debug('loaded OSH:', loadedOSHs);
-
-  for (const osh of loadedOSHs) {
-    try {
-      const found = currentOSHByName[osh.name];
-      if (!found) {
-        if (!transformOSHNameToID(osh.hierarchy, optionSets)) { continue; }
-        console.log('Creating: ', osh);
-        await new Entities().create({
-          entityName: 'option-set-hierarchy',
-          object: osh
-        });
-      } else {
-        if (!transformOSHNameToID(osh.hierarchy, optionSets)) { continue; }
-        console.log('Updating: ', osh);
-        await new Entities().update({
-          entityName: 'option-set-hierarchy',
-          id: found.id,
-          object: osh,
-        });
-      }
-    } catch (err) {
-      throw new Error(`Error Uploading option set hierarchy: ${err}`);
-    }
-  }
-
-  for (const currentOSH of currentOSHs) {
-    try {
-      const found = loadedOSHByName[currentOSH.name];
-      if (!found) {
-        console.log('Deleting: ', currentOSH.name);
-        await new Entities().delete({
-          entityName: 'option-set-hierarchy',
-          id: currentOSH.id,
-        });
-      }
-    } catch (err) {
-      throw new Error(`Error Deleting Option set hierarchy: ${err}`);
-    }
-  }
-
-}
-
-// transforms the passed hierarchy from names to ids, and returns true if operation succeeded.
-function transformOSHNameToID(hierarchy, optionSets) {
-  console.log('passed hierarhy:', hierarchy);
-  for (let i = 0; i < hierarchy.length; i++) {
-    const os = optionSets.find(os => os.name === hierarchy[i]);
-    if (!os) {
-      console.error('could not find option set with name', hierarchy[i], ' at position', i, 'skipping...');
-      return false;
-    }
-    hierarchy[i] = os.id;
-  }
-  return true;
+import { Entities } from '@contrail/sdk';
+import fs from 'fs';
+import * as path from 'path';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+
+const yaml = require('js-yaml');
+
+export async function UploadOptionSetHierarchies(args) {
+  try {
+    await authUser();
+
+    console.log('%s Uploading', chalk.yellow.bold('OPTION SET HIERARCHIES'));
+    const optionSetHierarchies = await loadOptionSetHierarchies();
+    await uploadOptionSetHierarchies(optionSetHierarchies);
+    console.log('%s Uploaded', chalk.yellow.bold('OPTION SET HIERARCHIES'));
+
+  }
+  catch (e) {
+    console.log(`%s Option set hierarchy Upload Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Option set hierarchy Upload Complete.', chalk.green.bold('COMPLETE'));
+}
+
+function loadOptionSetHierarchies() {
+  const TARGET_DIR = process.cwd();
+  try {
+    const files = fs.readdirSync(path.join(TARGET_DIR, 'option-set-hierarchies'));
+    const OSHs = [];
+    for(const file of files) {
+      OSHs.push(yaml.load(fs.readFileSync(path.join(TARGET_DIR, 'option-set-hierarchies', file), 'utf8')));
+    }
+    return OSHs;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function uploadOptionSetHierarchies(loadedOSHs) {
+
+  const optionSets = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const currentOSHs = await new Entities().get({
+    entityName: 'option-set-hierarchy',
+  });
+
+  const optionSetsByName = {};
+  for (const optionSet of optionSets) {
+    optionSetsByName[optionSet.name] = optionSet;
+  }
+
+  const currentOSHByName = {};
+  for (const currentOSH of currentOSHs) {
+    currentOSHByName[currentOSH.name] = currentOSH;
+  }
+
+  const loadedOSHByName = {};
+  for (const loadedOSH of loadedOSHs) {
+    loadedOSHByName[loadedOSH.name] = loadedOSH;
+  }
+
+  console.debug('current OSH:', currentOSHs);
+  console.debug('loaded OSH:', loadedOSHs);
+
+  for (const osh of loadedOSHs) {
+    try {
+      const found = currentOSHByName[osh.name];
+      if (!found) {
+        if (!transformOSHNameToID(osh.hierarchy, optionSets)) { continue; }
+        console.log('Creating: ', osh);
+        await new Entities().create({
+          entityName: 'option-set-hierarchy',
+          object: osh
+        });
+      } else {
+        if (!transformOSHNameToID(osh.hierarchy, optionSets)) { continue; }
+        console.log('Updating: ', osh);
+        await new Entities().update({
+          entityName: 'option-set-hierarchy',
+          id: found.id,
+          object: osh,
+        });
+      }
+    } catch (err) {
+      throw new Error(`Error Uploading option set hierarchy: ${err}`);
+    }
+  }
+
+  for (const currentOSH of currentOSHs) {
+    try {
+      const found = loadedOSHByName[currentOSH.name];
+      if (!found) {
+        console.log('Deleting: ', currentOSH.name);
+        await new Entities().delete({
+          entityName: 'option-set-hierarchy',
+          id: currentOSH.id,
+        });
+      }
+    } catch (err) {
+      throw new Error(`Error Deleting Option set hierarchy: ${err}`);
+    }
+  }
+
+}
+
+// transforms the passed hierarchy from names to ids, and returns true if operation succeeded.
+function transformOSHNameToID(hierarchy, optionSets) {
+  console.log('passed hierarhy:', hierarchy);
+  for (let i = 0; i < hierarchy.length; i++) {
+    const os = optionSets.find(os => os.name === hierarchy[i]);
+    if (!os) {
+      console.error('could not find option set with name', hierarchy[i], ' at position', i, 'skipping...');
+      return false;
+    }
+    hierarchy[i] = os.id;
+  }
+  return true;
 }

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

@@ -1,123 +1,124 @@
-import { Entities } from '@contrail/sdk';
-import { ReducedOptionSet } from './interfaces';
-import fs from 'fs';
-import { getSeparatorByPlatform } from '../common';
-import { authUser } from '../auth/login';
-import chalk from 'chalk';
-const yaml = require('js-yaml');
-
-export async function MergeOptionSets(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 MERGE'));
-    const fileLocation = args[3];
-    console.log('Using File: ', fileLocation);
-
-    await mergeOptionSets(fileLocation);
-    console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
-
-  }
-  catch (e) {
-    console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
-    return;
-  }
-
-  console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
-}
-function loadOptionSets(fileLocation) {
-  const TARGET_DIR = process.cwd();
-  try {
-    const separator = getSeparatorByPlatform();
-
-    const fullPath = TARGET_DIR + separator + fileLocation;
-    console.log('Getting file from path: ', fullPath);
-
-    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
-    return doc.optionSets;
-  } catch (e) {
-    throw new Error(`ERROR PARSING YAML: ${e}`);
-  }
-}
-
-async function mergeOptionSets(fileLocation) {
-  const uploadedOptionSets: ReducedOptionSet[] = loadOptionSets(fileLocation);
-
-  await authUser();
-
-  const currentOptionSetsFull: any[] = await new Entities().get({
-    entityName: 'type-property-option-set',
-  });
-
-  const currentOptionSets = currentOptionSetsFull.map(os => Object.assign({}, {
-    name: os.name,
-    isArchived: os.isArchived,
-    optionSet: os.optionSet,
-  }));
-
-  const currentOptionSetsByName = {};
-  for (const currentOptionSet of currentOptionSets) {
-    currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
-  }
-
-  const uploadedOptionSetsByName = {};
-  for (const optionSet of uploadedOptionSets) {
-    uploadedOptionSetsByName[optionSet.name] = optionSet;
-  }
-
-  const mergedOptionSets: any[] = [];
-  for (const uploadedOptionSet of uploadedOptionSets) {
-    const existing = currentOptionSetsByName[uploadedOptionSet.name];
-    if (!existing) {
-      if (!uploadedOptionSet.optionSet) {
-        console.log('No OptionSet for: ', uploadedOptionSet.name);
-        continue;
-      }
-      console.log('Adding New: ', uploadedOptionSet.name);
-      mergedOptionSets.push(uploadedOptionSet);
-    }
-    else {
-      console.log('Merging: ', uploadedOptionSet.name);
-      mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
-    }
-  }
-
-  for (const currentOptionSet of currentOptionSets) {
-    const found = uploadedOptionSetsByName[currentOptionSet.name];
-    if (!found) {
-      console.log('Adding Existing: ', currentOptionSet.name);
-      mergedOptionSets.push(currentOptionSet);
-    }
-  }
-
-  saveData({optionSets: mergedOptionSets});
-}
-
-function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet: ReducedOptionSet) {
-  const merged = {
-    name: uploadedOptionSet.name,
-    optionSet: uploadedOptionSet.optionSet,
-    isArchived: uploadedOptionSet.isArchived,
-  };
-
-  for (const keyVal of existingOptionSet.optionSet) {
-    const value = keyVal.value;
-    const display = keyVal.display;
-
-    const found = merged.optionSet.find(keyVal => keyVal.value === value);
-    if (!found) {
-      merged.optionSet.push({value, display});
-    }
-
-  }
-
-  return merged;
-}
-
-function saveData(data) {
-  const yamlStr = yaml.dump(data);
-  const CURRENT_DIR = process.cwd();
-  const separator = getSeparatorByPlatform();
-  fs.writeFileSync(CURRENT_DIR + separator + 'merged_optionSets.yml', yamlStr, 'utf8');
+import { Entities } from '@contrail/sdk';
+import { ReducedOptionSet } from './interfaces';
+import fs from 'fs';
+import { getSeparatorByPlatform } from '../common';
+import { authUser } from '../auth/login';
+import chalk from 'chalk';
+const yaml = require('js-yaml');
+
+export async function MergeOptionSets(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 MERGE'));
+    const fileLocation = args[3];
+    console.log('Using File: ', fileLocation);
+
+    await mergeOptionSets(fileLocation);
+    console.log('%s Merged', chalk.yellow.bold('OPTION SET MERGE'));
+
+  }
+  catch (e) {
+    console.log(`%s Merge Failed. ${e}`, chalk.red.bold('FAIL'));
+    return;
+  }
+
+  console.log('%s Merge Complete.', chalk.green.bold('COMPLETE'));
+}
+function loadOptionSets(fileLocation) {
+  const TARGET_DIR = process.cwd();
+  try {
+    const separator = getSeparatorByPlatform();
+
+    const fullPath = TARGET_DIR + separator + fileLocation;
+    console.log('Getting file from path: ', fullPath);
+
+    const doc = yaml.load(fs.readFileSync(TARGET_DIR + separator + fileLocation, 'utf8'));
+    return doc;
+  } catch (e) {
+    throw new Error(`ERROR PARSING YAML: ${e}`);
+  }
+}
+
+async function mergeOptionSets(fileLocation) {
+  const uploadedOptionSets: ReducedOptionSet[] = loadOptionSets(fileLocation);
+
+  await authUser();
+
+  const currentOptionSetsFull: any[] = await new Entities().get({
+    entityName: 'type-property-option-set',
+  });
+
+  const currentOptionSets = currentOptionSetsFull.map(os => Object.assign({}, {
+    name: os.name,
+    isArchived: os.isArchived,
+    optionSet: os.optionSet,
+  }));
+
+  const currentOptionSetsByName = {};
+  for (const currentOptionSet of currentOptionSets) {
+    currentOptionSetsByName[currentOptionSet.name] = currentOptionSet;
+  }
+
+  const uploadedOptionSetsByName = {};
+  for (const optionSet of uploadedOptionSets) {
+    uploadedOptionSetsByName[optionSet.name] = optionSet;
+  }
+
+  const mergedOptionSets: any[] = [];
+  for (const uploadedOptionSet of uploadedOptionSets) {
+    const existing = currentOptionSetsByName[uploadedOptionSet.name];
+    if (!existing) {
+      if (!uploadedOptionSet.optionSet) {
+        console.log('No OptionSet for: ', uploadedOptionSet.name);
+        continue;
+      }
+      console.log('Adding New: ', uploadedOptionSet.name);
+      mergedOptionSets.push(uploadedOptionSet);
+    }
+    else {
+      console.log('Merging: ', uploadedOptionSet.name);
+      mergedOptionSets.push(mergeOptionSet(existing, uploadedOptionSet));
+    }
+  }
+
+  for (const currentOptionSet of currentOptionSets) {
+    const found = uploadedOptionSetsByName[currentOptionSet.name];
+    if (!found) {
+      console.log('Adding Existing: ', currentOptionSet.name);
+      mergedOptionSets.push(currentOptionSet);
+    }
+  }
+
+  saveData(mergedOptionSets);
+}
+
+function mergeOptionSet(existingOptionSet: ReducedOptionSet, uploadedOptionSet: ReducedOptionSet) {
+  const merged = {
+    name: uploadedOptionSet.name,
+    optionSet: uploadedOptionSet.optionSet,
+    isArchived: uploadedOptionSet.isArchived,
+  };
+
+  if (existingOptionSet?.optionSet?.length > 0) {
+    for (const keyVal of existingOptionSet.optionSet) {
+      const value = keyVal.value;
+      const display = keyVal.display;
+
+      const found = merged.optionSet.find(keyVal => keyVal.value === value);
+      if (!found) {
+        merged.optionSet.push({value, display});
+      }
+    }
+  }
+
+  return merged;
+}
+
+function saveData(data) {
+  const yamlStr = yaml.dump(data);
+  const CURRENT_DIR = process.cwd();
+  const separator = getSeparatorByPlatform();
+  fs.writeFileSync(CURRENT_DIR + separator + 'merged_optionSets.yml', yamlStr, 'utf8');
 }