@contrail/cli 3.5.2 → 3.5.3-alpha.73bd011

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllOccurrences = exports.uploadTypePropertyPolicies = void 0;
+exports.uploadTypePropertyPolicies = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@contrail/sdk");
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -8,12 +8,10 @@ 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 basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-const _ = tslib_1.__importStar(require("lodash"));
 class UploadTypePropertyPolicies extends basecommand_1.BaseCommand {
     static description = 'Upload type property policies';
     static examples = [
@@ -38,14 +36,12 @@ async function uploadTypePropertyPolicies(dir) {
     try {
         await (0, login_1.authUser)();
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE PROPERTY POLICY')} Uploading`);
-        const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = await loadTPPolicies(dir);
+        const reducedTypePropertyPolicies = await loadTPPolicies(dir);
         await uploadTPPolicyObjects(reducedTypePropertyPolicies);
-        await uploadTypePropertyPolicyLinks(reducedTypePropertyPolicyLinks);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE PROPERTY POLICY')} Uploaded`);
     }
     catch (e) {
         logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Type Property Policy Upload Failed . ${e}`);
-        //TODO make this only print if a debug flag is set
         console.trace(e);
         return;
     }
@@ -54,15 +50,13 @@ async function uploadTypePropertyPolicies(dir) {
 exports.uploadTypePropertyPolicies = uploadTypePropertyPolicies;
 function loadTPPolicies(fromDir) {
     const tpps = [];
-    let tppLinks = [];
     const dir = path.join(fromDir, 'type-property-policies');
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
             tpps.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        tppLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-property-policy-links.yml'), 'utf8'));
-        return [tpps, tppLinks];
+        return tpps;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -155,133 +149,3 @@ 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 currentTPPs = await new sdk_1.Entities().get({
-        entityName: 'type-property-policy',
-    });
-    const currentTPPLinks = await new sdk_1.Entities().get({
-        entityName: 'type-property-policy-link',
-    });
-    logger_1.default.info(`found ${currentTPPLinks.length} current type property policy links`);
-    logger_1.default.info(`found ${reducedTypePropertyPolicyLinks.length} type property policy links to load`);
-    const currentLinksHashes = {};
-    for (const currentLink of currentTPPLinks) {
-        const foundTPs = findAllOccurrences(typeProperties, (tp) => tp.id === currentLink.typePropertyId);
-        for (const foundTP of foundTPs) {
-            const foundTPP = currentTPPs.find((tpp) => tpp.id === currentLink.typePropertyPolicyId);
-            if (!foundTP || !foundTPP) {
-                logger_1.default.info(`skipping unhashable, invalid policy link: ${JSON.stringify(currentLink, null, 2)}`);
-                continue;
-            }
-            const hash = `${foundTP.typeSlug}|${foundTP.slug}|${foundTPP.identifier}`;
-            currentLinksHashes[hash] = currentLink;
-        }
-    }
-    logger_1.default.debug(`current links hashes: ${JSON.stringify(currentLinksHashes, null, 2)}`);
-    const reducedLinksByHashes = {};
-    for (const loadedLink of reducedTypePropertyPolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePropertySlug}|${loadedLink.typePropertyPolicyIdentifier}`;
-        reducedLinksByHashes[hash] = loadedLink;
-    }
-    const toCreate = Object.keys(reducedLinksByHashes)
-        .filter((x) => !currentLinksHashes[x])
-        .map((x) => {
-        return {
-            [x]: reducedLinksByHashes[x],
-        };
-    })
-        .reduce((a, b) => Object.assign(a, b), {});
-    const toDelete = _.uniqBy(Object.keys(currentLinksHashes)
-        .filter((x) => !reducedLinksByHashes[x])
-        .map((x) => {
-        return {
-            [x]: currentLinksHashes[x],
-        };
-    }), 'id').reduce((a, b) => Object.assign(a, b), {});
-    logger_1.default.debug(`reduced links hashes: ${JSON.stringify(reducedLinksByHashes, null, 2)}`);
-    logger_1.default.info(`found ${Object.keys(toCreate).length} type property policy links to create`);
-    logger_1.default.info(`found ${Object.keys(toDelete).length} type property policy links to delete`);
-    logger_1.default.debug(`to create: ${JSON.stringify(toCreate, null, 2)}`);
-    logger_1.default.debug(`to delete: ${JSON.stringify(toDelete, null, 2)}`);
-    logger_1.default.debug(`current links hashes to delete: ${JSON.stringify(Object.keys(currentLinksHashes).filter((x) => !reducedLinksByHashes[x]), null, 2)}`);
-    // fs.writeFileSync('toCreate.json', JSON.stringify(toCreate, null, 2));
-    // fs.writeFileSync('toDelete.json', JSON.stringify(toDelete, null, 2));
-    // fs.writeFileSync('currentLinksHashes.json', JSON.stringify(currentLinksHashes, null, 2));
-    // fs.writeFileSync('reducedLinksByHashes.json', JSON.stringify(reducedLinksByHashes, null, 2));
-    // fs.writeFileSync(
-    //   'current_link_hashes_to_delete.json',
-    //   JSON.stringify(
-    //     Object.keys(currentLinksHashes).filter((x) => !reducedLinksByHashes[x]),
-    //     null,
-    //     2,
-    //   ),
-    // );
-    // return;
-    for (const [hash, link] of Object.entries(toCreate)) {
-        try {
-            if (!transformReducedLink(link, typeProperties, currentTPPs)) {
-                continue;
-            }
-            logger_1.default.info(`Creating: ${hash}: ${JSON.stringify(link, null, 2)}`);
-            await new sdk_1.Entities().create({
-                entityName: 'type-property-policy-link',
-                object: {
-                    typePropertyPolicyId: link.typePropertyPolicyId,
-                    typePropertyId: link.typePropertyId,
-                },
-            });
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading type property policy links: ${err}`);
-        }
-    }
-    for (const [hash, link] of Object.entries(toDelete)) {
-        try {
-            logger_1.default.info(`Deleting: ${hash}`);
-            await new sdk_1.Entities().delete({
-                entityName: 'type-property-policy-link',
-                id: link['id'],
-            });
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting type property policy link: ${err}`);
-        }
-    }
-    function transformReducedLink(TPPLink, typeProperties, typePropertyPolicies) {
-        const foundTP = typeProperties.find((tp) => tp.slug === TPPLink.typePropertySlug && tp.typeSlug === TPPLink.typeSlug);
-        if (!foundTP) {
-            logger_1.default.error(`Could not find type property with slug ${TPPLink.typePropertySlug} `);
-            return false;
-        }
-        TPPLink.typePropertyId = foundTP.id;
-        const foundTPP = typePropertyPolicies.find((tpp) => tpp.identifier === TPPLink.typePropertyPolicyIdentifier);
-        if (!foundTPP) {
-            logger_1.default.error(`Could not find type property policy with identifier ${TPPLink.typePropertyPolicyIdentifier} `);
-            return false;
-        }
-        TPPLink.typePropertyPolicyId = foundTPP.id;
-        return true;
-    }
-}
-function findAllOccurrences(array, evaluator) {
-    const found = [];
-    for (let i = 0; i < array.length; i++) {
-        const element = array[i];
-        if (evaluator(element)) {
-            found.push(element);
-        }
-    }
-    return found;
-}
-exports.findAllOccurrences = findAllOccurrences;

package/dist/helpers/types/type-uploader.js

@@ -303,7 +303,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             }
         }
         catch (err) {
-            throw new Error(`Error Deleting Properties: ${err}`);
+            logger_1.default.error(`Error Deleting Type-Property ${currentPropertyType.slug}: ${err}`);
         }
     }
 }

package/dist/interfaces.d.ts

@@ -370,31 +370,6 @@ export interface ReducedOptionSet {
     isArchived: boolean;
     optionSet: any[];
 }
-export interface ReducedUsageInfo {
-    typeId: string;
-    typePropertyId: string;
-    typePath: string;
-    typePropertySlug: string;
-    editable: boolean;
-    used: boolean;
-    formulaFunction?: string;
-    validationFunction?: string;
-    numberFormat?: any;
-    defaultValue?: string;
-    label?: string;
-    required?: boolean;
-    searchable?: boolean;
-    isUniqueProperty?: boolean;
-    isUniquePropertyInFamily?: boolean;
-    copyBehavior?: string;
-    copyDefault?: string;
-    propertyLevel?: string;
-    isArchived: boolean;
-    isFederationProperty?: boolean;
-    carryOverBehavior?: string;
-    carryOverDefault?: string;
-}
-export type PersistReducedUsageInfo = Omit<ReducedUsageInfo, 'typePath' | 'typePropertySlug'>;
 export declare enum PropertyType {
     Text = "text",
     String = "string",

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.2",
+  "version": "3.5.3-alpha.73bd011",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -2520,57 +2520,6 @@
       },
       "args": {}
     },
-    "types:uploadUsageInfo": {
-      "id": "types:uploadUsageInfo",
-      "description": "Upload extracted usage info",
-      "strict": true,
-      "pluginName": "@contrail/cli",
-      "pluginAlias": "@contrail/cli",
-      "pluginType": "core",
-      "aliases": [],
-      "examples": [
-        "$ contrail types uploadUsageInfo\n"
-      ],
-      "flags": {
-        "logLevel": {
-          "name": "logLevel",
-          "type": "option",
-          "char": "l",
-          "description": "The Log Level",
-          "required": false,
-          "multiple": false,
-          "options": [
-            "error",
-            "warn",
-            "info",
-            "debug"
-          ]
-        },
-        "alwaysConfirmEnv": {
-          "name": "alwaysConfirmEnv",
-          "type": "option",
-          "char": "e",
-          "description": "The Environment variables",
-          "required": false,
-          "multiple": false,
-          "options": [
-            "true",
-            "false"
-          ],
-          "default": "true"
-        },
-        "dir": {
-          "name": "dir",
-          "type": "option",
-          "char": "d",
-          "description": "The directory from which to export the usage info data. Defaults to the current directory. The usage info data will be loaded from $dir/usage-info.yml",
-          "required": false,
-          "multiple": false,
-          "default": "."
-        }
-      },
-      "args": {}
-    },
     "users:export": {
       "id": "users:export",
       "description": "Export all users in the org.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.2",
+  "version": "3.5.3-alpha.73bd011",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",

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

@@ -1,15 +0,0 @@
-import { BaseCommand } from '../../basecommand';
-import { PersistReducedUsageInfo } from '../../interfaces';
-export default class UploadUsageInfo extends BaseCommand {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    run(): Promise<void>;
-}
-export declare function uploadUsageInfo(dir: string): Promise<void>;
-export declare const persistReducedUsageInfoFields: readonly ["typeId", "typePropertyId", "editable", "used", "formulaFunction", "validationFunction", "numberFormat", "defaultValue", "label", "required", "searchable", "isUniqueProperty", "isUniquePropertyInFamily", "copyBehavior", "copyDefault", "propertyLevel", "isArchived", "isFederationProperty", "carryOverBehavior", "carryOverDefault"];
-export declare function transformReducedUsageInfoToTypeIdsFromPath(reducedUsageInfo: any, types: any): PersistReducedUsageInfo | undefined;

package/dist/commands/types/uploadUsageInfo.js

@@ -1,180 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformReducedUsageInfoToTypeIdsFromPath = exports.persistReducedUsageInfoFields = exports.uploadUsageInfo = void 0;
-const tslib_1 = require("tslib");
-const sdk_1 = require("@contrail/sdk");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const login_1 = require("../../auth/login");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const path = tslib_1.__importStar(require("path"));
-const core_1 = require("@oclif/core");
-const type_extractor_1 = require("../../helpers/types/type-extractor");
-const basecommand_1 = require("../../basecommand");
-const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-class UploadUsageInfo extends basecommand_1.BaseCommand {
-    static description = 'Upload extracted usage info';
-    static examples = [
-        `$ contrail types uploadUsageInfo
-`,
-    ];
-    static flags = {
-        ...basecommand_1.BaseCommand.baseFlags,
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'The directory from which to export the usage info data. Defaults to the current directory. The usage info data will be loaded from $dir/usage-info.yml',
-            required: false,
-            default: '.',
-        }),
-    };
-    async run() {
-        await uploadUsageInfo(this.flags.dir);
-    }
-}
-exports.default = UploadUsageInfo;
-async function uploadUsageInfo(dir) {
-    try {
-        await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploading`);
-        const reducedUsageInfo = await loadUsageInfo(dir);
-        await uploadUsageInfoObjects(reducedUsageInfo);
-        logger_1.default.info(`${chalk_1.default.yellow.bold('USAGE INFO')} Uploaded`);
-    }
-    catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Usage Info Upload Failed . ${e}`);
-        return;
-    }
-    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Usage Info Upload Complete.`);
-}
-exports.uploadUsageInfo = uploadUsageInfo;
-function loadUsageInfo(dir) {
-    try {
-        const doc = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, 'usage-info.yml'), 'utf8'));
-        return doc;
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadUsageInfoObjects(loadedUsageInfo) {
-    const typesWithProperties = await (0, type_extractor_1.getTypes)();
-    const currentUsageInfo = await new sdk_1.Entities().get({
-        entityName: 'type-property-usage-info',
-    });
-    const currentUsageInfosHashes = {};
-    for (const currentUI of currentUsageInfo) {
-        const foundType = typesWithProperties.find((t) => t.id === currentUI.typeId);
-        const typeProperties = foundType?.typeProperties || [];
-        const foundTypeProperty = typeProperties.find((tp) => tp.id === currentUI.typePropertyId);
-        if (!foundType || !foundTypeProperty) {
-            logger_1.default.info(`skipping unhashable, invalid usage info: ${JSON.stringify(currentUI, null, 2)}`);
-            continue;
-        }
-        const hash = `${foundType.typePath}|${foundTypeProperty.slug}`;
-        currentUsageInfosHashes[hash] = currentUI;
-    }
-    const reducedUsageInfoHashes = {};
-    for (const loadedUI of loadedUsageInfo) {
-        const hash = `${loadedUI.typePath}|${loadedUI.typePropertySlug}`;
-        reducedUsageInfoHashes[hash] = loadedUI;
-    }
-    logger_1.default.debug(`current usage info: ${JSON.stringify(currentUsageInfo)}`);
-    logger_1.default.debug(`loaded usage info: ${JSON.stringify(loadedUsageInfo)}`);
-    for (const loadedUI of loadedUsageInfo) {
-        try {
-            const found = currentUsageInfosHashes[`${loadedUI.typePath}|${loadedUI.typePropertySlug}`];
-            const transformedUI = transformReducedUsageInfoToTypeIdsFromPath(loadedUI, typesWithProperties);
-            if (!transformedUI) {
-                continue;
-            }
-            if (!found) {
-                logger_1.default.debug(`Creating:  ${JSON.stringify(transformedUI)}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-property-usage-info',
-                    object: transformedUI,
-                });
-            }
-            else {
-                logger_1.default.info(`Updating:  ${JSON.stringify(transformedUI)}`);
-                await new sdk_1.Entities().update({
-                    entityName: 'type-property-usage-info',
-                    id: found.id,
-                    object: transformedUI,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading usage info: ${err}`);
-        }
-    }
-    for (const [hash, currentUI] of Object.entries(currentUsageInfosHashes)) {
-        try {
-            const found = reducedUsageInfoHashes[hash];
-            if (!found) {
-                logger_1.default.debug(`Creating:  ${hash}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-property-usage-info',
-                    id: currentUI['id'],
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting usage info: ${err}`);
-        }
-    }
-}
-//This should contain the property keys in PersistReducedUsageInfo in interfaces.ts
-//except for typePath and typePropertySlug which are used for transformation but not persisted to the database.
-// If you add a new property to PersistReducedUsageInfo, you need to add it to this array to be persisted to the database.
-exports.persistReducedUsageInfoFields = [
-    // 'typePath',
-    // 'typePropertySlug',
-    'typeId',
-    'typePropertyId',
-    'editable',
-    'used',
-    'formulaFunction',
-    'validationFunction',
-    'numberFormat',
-    'defaultValue',
-    'label',
-    'required',
-    'searchable',
-    'isUniqueProperty',
-    'isUniquePropertyInFamily',
-    'copyBehavior',
-    'copyDefault',
-    'propertyLevel',
-    'isArchived',
-    'isFederationProperty',
-    'carryOverBehavior',
-    'carryOverDefault',
-];
-// transforms the reduced Usage Info from name slugs to ids
-function transformReducedUsageInfoToTypeIdsFromPath(reducedUsageInfo, types) {
-    const foundType = types.find((t) => t.typePath === reducedUsageInfo.typePath);
-    if (!foundType) {
-        logger_1.default.error(`Could not find type with typePath ${reducedUsageInfo.typePath} while transforming ${reducedUsageInfo.typePropertySlug}`);
-        return undefined;
-    }
-    const foundTypeProperty = foundType.typeProperties?.find((tp) => tp.slug === reducedUsageInfo.typePropertySlug);
-    if (!foundTypeProperty) {
-        logger_1.default.error(`Could not find type property with slug ${reducedUsageInfo.typePropertySlug} while transforming ${JSON.stringify(reducedUsageInfo)}`);
-        return undefined;
-    }
-    // Create a new object with only the properties that are in the persistReducedUsageInfoFields array
-    // If there is a compile error on the code below, it means you added a new property to PersistReducedUsageInfo
-    // interface in interfaces.ts but forgot to add it to the persistReducedUsageInfoFields array above,
-    // It needs to be added to be persisted to the database.
-    const persistedUsageInfo = {
-        typeId: foundType.id,
-        typePropertyId: foundTypeProperty.id,
-    };
-    for (const key of Object.keys(reducedUsageInfo)) {
-        if (exports.persistReducedUsageInfoFields.includes(key)) {
-            persistedUsageInfo[key] = reducedUsageInfo[key];
-        }
-    }
-    return persistedUsageInfo;
-}
-exports.transformReducedUsageInfoToTypeIdsFromPath = transformReducedUsageInfoToTypeIdsFromPath;

package/dist/commands/types/uploadUsageInfo.spec.d.ts

@@ -1 +0,0 @@
-export {};