@contrail/cli 3.5.1-alpha.68d57e0 → 3.5.1-alpha.fd40e6d

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.1-alpha.68d57e0 linux-x64 node-v24.14.1
+@contrail/cli/3.5.1-alpha.fd40e6d linux-x64 node-v24.14.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND
@@ -1405,7 +1405,7 @@ EXAMPLES
 
 ## `contrail types uploadUsageInfo`
 
-Upload extracted usage info
+[DEPRECATED] Upload extracted usage info. Use uploadTypeOverrides instead.
 
 ```
 USAGE
@@ -1420,7 +1420,7 @@ FLAGS
                                    <options: error|warn|info|debug>
 
 DESCRIPTION
-  Upload extracted usage info
+  [DEPRECATED] Upload extracted usage info. Use uploadTypeOverrides instead.
 
 EXAMPLES
   $ contrail types uploadUsageInfo

package/dist/api/types.d.ts

@@ -1,13 +1,8 @@
 export declare function getOptionSets(): Promise<any[]>;
 export declare function getUserLists(): Promise<any[]>;
 export declare function getOptionSetHierarchies(): Promise<any[]>;
-export declare function getOptionSetHierarchyLinks(): Promise<any[]>;
 export declare function getRuleSets(): Promise<any[]>;
-export declare function getRuleSetLinks(): Promise<any[]>;
-export declare function getUsageInfo(): Promise<any[]>;
 export declare function getTypePropertyPolicies(): Promise<any[]>;
-export declare function getTypePropertyPolicyLinks(): Promise<any[]>;
 export declare function getTypePolicies(): Promise<any[]>;
 export declare function getTypeOverrideCopies(): Promise<any[]>;
 export declare function uploadTypeOverrideObjects(reducedOverrides: any): Promise<void>;
-export declare function getTypePolicyLinks(): Promise<any[]>;

package/dist/api/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypePolicyLinks = exports.uploadTypeOverrideObjects = exports.getTypeOverrideCopies = exports.getTypePolicies = exports.getTypePropertyPolicyLinks = exports.getTypePropertyPolicies = exports.getUsageInfo = exports.getRuleSetLinks = exports.getRuleSets = exports.getOptionSetHierarchyLinks = exports.getOptionSetHierarchies = exports.getUserLists = exports.getOptionSets = void 0;
+exports.uploadTypeOverrideObjects = exports.getTypeOverrideCopies = exports.getTypePolicies = exports.getTypePropertyPolicies = exports.getRuleSets = exports.getOptionSetHierarchies = exports.getUserLists = exports.getOptionSets = void 0;
 const sdk_1 = require("@contrail/sdk");
 async function getOptionSets() {
     return await new sdk_1.Entities().get({
@@ -21,13 +21,6 @@ async function getOptionSetHierarchies() {
     });
 }
 exports.getOptionSetHierarchies = getOptionSetHierarchies;
-async function getOptionSetHierarchyLinks() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-option-set-hierarchy-link',
-    });
-}
-exports.getOptionSetHierarchyLinks = getOptionSetHierarchyLinks;
 async function getRuleSets() {
     const entitiesClient = new sdk_1.Entities();
     return await entitiesClient.get({
@@ -35,20 +28,6 @@ async function getRuleSets() {
     });
 }
 exports.getRuleSets = getRuleSets;
-async function getRuleSetLinks() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-rule-set-link',
-    });
-}
-exports.getRuleSetLinks = getRuleSetLinks;
-async function getUsageInfo() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-property-usage-info',
-    });
-}
-exports.getUsageInfo = getUsageInfo;
 async function getTypePropertyPolicies() {
     const entitiesClient = new sdk_1.Entities();
     return await entitiesClient.get({
@@ -56,13 +35,6 @@ async function getTypePropertyPolicies() {
     });
 }
 exports.getTypePropertyPolicies = getTypePropertyPolicies;
-async function getTypePropertyPolicyLinks() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-property-policy-link',
-    });
-}
-exports.getTypePropertyPolicyLinks = getTypePropertyPolicyLinks;
 async function getTypePolicies() {
     const entitiesClient = new sdk_1.Entities();
     return await entitiesClient.get({
@@ -86,10 +58,3 @@ async function uploadTypeOverrideObjects(reducedOverrides) {
     });
 }
 exports.uploadTypeOverrideObjects = uploadTypeOverrideObjects;
-async function getTypePolicyLinks() {
-    const entitiesClient = new sdk_1.Entities();
-    return await entitiesClient.get({
-        entityName: 'type-policy-link',
-    });
-}
-exports.getTypePolicyLinks = getTypePolicyLinks;

package/dist/commands/types/getAll.js

@@ -54,14 +54,9 @@ async function getAll(outDir, overwrite) {
             types: await (0, type_extractor_1.getTypes)(),
             optionSets: await (0, types_1.getOptionSets)(),
             optionSetHierarchies: await (0, types_1.getOptionSetHierarchies)(),
-            optionSetHierarchyLinks: await (0, types_1.getOptionSetHierarchyLinks)(),
             ruleSets: await (0, types_1.getRuleSets)(),
-            ruleSetLinks: await (0, types_1.getRuleSetLinks)(),
-            usageInfo: await (0, types_1.getUsageInfo)(),
             typePropertyPolicies: await (0, types_1.getTypePropertyPolicies)(),
-            typePropertyPolicyLinks: await (0, types_1.getTypePropertyPolicyLinks)(),
             typePolicies: await (0, types_1.getTypePolicies)(),
-            typePolicyLinks: await (0, types_1.getTypePolicyLinks)(),
             typeOverrides: await (0, types_1.getTypeOverrideCopies)(),
             orgUsers: await (0, users_1.getUserOrgs)(),
             groups: await (0, users_1.getGroups)(),
@@ -125,31 +120,18 @@ async function saveData(reducedData, dir, overwrite) {
             split: true,
             fileLabel: 'identifier',
         },
-        reducedOptionSetHierarchyLinks: {
-            filename: 'type-option-set-hierarchy-links',
-            split: false,
-            fileLabel: '',
-        },
         reducedRuleSets: { filename: 'rule-sets', split: true, fileLabel: 'name' },
-        reducedRuleSetLinks: { filename: 'rule-set-links', split: false, fileLabel: '' },
-        reducedUsageInfo: { filename: 'usage-info', split: false, fileLabel: '' },
         reducedTypePropertyPolicies: {
             filename: 'type-property-policies',
             split: true,
             fileLabel: 'label',
         },
-        reducedTypePropertyPolicyLinks: {
-            filename: 'type-property-policy-links',
-            split: false,
-            fileLabel: '',
-        },
         reducedOverrides: {
             filename: 'type-overrides',
             split: false,
             fileLabel: '',
         },
         reducedTypePolicies: { filename: 'type-policies', split: true, fileLabel: 'label' },
-        reducedTypePolicyLinks: { filename: 'type-policy-links', split: false, fileLabel: '' },
     };
     for (const [key, folder] of Object.entries(propertyToFolderMap)) {
         const CURRENT_DIR = process.cwd();

package/dist/commands/types/loadAll.js

@@ -7,7 +7,6 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const login_1 = require("../../auth/login");
 const uploadOptionSets_1 = require("./uploadOptionSets");
 const uploadOptionSetHierarchies_1 = require("./uploadOptionSetHierarchies");
-const uploadUsageInfo_1 = require("./uploadUsageInfo");
 const uploadRuleSets_1 = require("./uploadRuleSets");
 const uploadTypePropertyPolicies_1 = require("./uploadTypePropertyPolicies");
 const type_uploader_1 = require("../../helpers/types/type-uploader");
@@ -41,7 +40,6 @@ async function loadAll(dir, skipPolicies = false) {
         await (0, uploadOptionSets_1.uploadOptionSets)(dir);
         await (0, type_uploader_1.uploadTypes)(dir);
         await (0, uploadOptionSetHierarchies_1.uploadOptionSetHierarchies)(dir);
-        await (0, uploadUsageInfo_1.uploadUsageInfo)(dir);
         await (0, uploadRuleSets_1.uploadRuleSets)(dir);
         if (!skipPolicies) {
             await (0, uploadTypePropertyPolicies_1.uploadTypePropertyPolicies)(dir);

package/dist/commands/types/mergeTypeProperties.js

@@ -62,14 +62,9 @@ async function mergeTypeProperties(fileLocation, typePaths) {
         types: await (0, type_extractor_1.getTypes)(),
         optionSets: await (0, types_2.getOptionSets)(),
         optionSetHierarchies: [],
-        optionSetHierarchyLinks: [],
         ruleSets: [],
-        ruleSetLinks: [],
-        usageInfo: [],
         typePropertyPolicies: [],
-        typePropertyPolicyLinks: [],
         typePolicies: [],
-        typePolicyLinks: [],
     };
     const reducedData = await (0, types_1.getAllReducedTypes)(data);
     for (const typePath of typePaths) {

package/dist/commands/types/uploadOptionSetHierarchies.js

@@ -8,7 +8,6 @@ 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 basecommand_1 = require("../../basecommand");
 const logger_1 = tslib_1.__importDefault(require("../../logger"));
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
@@ -38,8 +37,6 @@ async function uploadOptionSetHierarchies(dir) {
         logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHIES')} Uploading`);
         const optionSetHierarchies = await loadOptionSetHierarchies(dir);
         await uploadOSH(optionSetHierarchies);
-        const optionSetHierarchyLinks = await loadOptionSetHierarchyLinks(dir);
-        await uploadOSHLinks(optionSetHierarchyLinks);
         logger_1.default.info(`${chalk_1.default.yellow.bold('OPTION SET HIERARCHIES')} Uploaded`);
     }
     catch (e) {
@@ -63,14 +60,6 @@ function loadOptionSetHierarchies(fromDir) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
     }
 }
-function loadOptionSetHierarchyLinks(fromDir) {
-    try {
-        return js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-option-set-hierarchy-links.yml'), 'utf8'));
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
 async function uploadOSH(loadedOSHs) {
     const optionSets = await new sdk_1.Entities().get({
         entityName: 'type-property-option-set',
@@ -150,109 +139,3 @@ function transformOSHNameToID(hierarchy, optionSets) {
     }
     return true;
 }
-async function uploadOSHLinks(reducedOSHLinks) {
-    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 currentOSHs = await new sdk_1.Entities().get({
-        entityName: 'option-set-hierarchy',
-    });
-    const currentOSHLinks = await new sdk_1.Entities().get({
-        entityName: 'type-option-set-hierarchy-link',
-    });
-    const currentOSHLinkHashes = {};
-    for (const currentLink of currentOSHLinks) {
-        const foundType = typesWithProperties.find((x) => x.id === currentLink.typeId);
-        const foundOSH = currentOSHs.find((osh) => osh.id === currentLink.optionSetHierarchyId);
-        const foundTPSlugs = typeProperties
-            .filter((x) => currentLink?.hierarchyTypePropertyIds?.includes(x.id))
-            .map((x) => x.slug);
-        if (!foundType ||
-            !foundOSH ||
-            foundTPSlugs.length !== currentLink.hierarchyTypePropertyIds.length) {
-            logger_1.default.info(`skipping unhashable, invalid type option set hierarchy link: ${JSON.stringify(currentLink, null, 2)}`);
-        }
-        // don't mutate original array
-        const sortedFoundTPSlugs = [...foundTPSlugs].sort();
-        const hash = `${foundType.slug}|${foundOSH.name}|${sortedFoundTPSlugs.join('|')}`;
-        currentOSHLinkHashes[hash] = currentLink;
-    }
-    const reducedLinksByHashes = {};
-    for (const loadedLink of reducedOSHLinks) {
-        // don't mutate original array
-        const sortedTPSlugs = [...loadedLink.typePropertySlugs].sort();
-        const hash = `${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyIdentifier}|${sortedTPSlugs.join('|')}}`;
-        reducedLinksByHashes[hash] = loadedLink;
-    }
-    for (const loadedLink of reducedOSHLinks) {
-        try {
-            // don't mutate original array
-            const sortedTPSlugs = [...loadedLink.typePropertySlugs].sort();
-            const found = currentOSHLinkHashes[`${loadedLink.typeSlug}|${loadedLink.optionSetHierarchyIdentifier}|${sortedTPSlugs.join('|')}`];
-            if (!found) {
-                if (!transformReducedLink(loadedLink, typesWithProperties, currentOSHs)) {
-                    continue;
-                }
-                logger_1.default.debug(`Creating:  ${JSON.stringify(loadedLink, null, 2)}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-option-set-hierarchy-link',
-                    object: {
-                        hierarchyTypePropertyIds: loadedLink.hierarchyTypePropertyIds,
-                        optionSetHierarchyId: loadedLink.optionSetHierarchyId,
-                        typeId: loadedLink.typeId,
-                    },
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error uploading type option set hierarchy links: ${err}`);
-        }
-    }
-    for (const [currentLinkHash, currentLink] of Object.entries(currentOSHLinkHashes)) {
-        try {
-            const found = reducedLinksByHashes[currentLinkHash];
-            if (!found) {
-                logger_1.default.debug(`Deleting: ${JSON.stringify(currentLinkHash)}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-option-set-hierarchy-link',
-                    id: currentLink['id'],
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting rule set link: ${err}`);
-        }
-    }
-}
-function transformReducedLink(OSHLink, typesWithProperties, OSHs) {
-    logger_1.default.debug(`OSHLink before transform: ${JSON.stringify(OSHLink, null, 2)}`);
-    const foundType = typesWithProperties.find((x) => x.slug === OSHLink.typeSlug);
-    if (!foundType) {
-        logger_1.default.error(`OSH Links: Could not find type with slug ${OSHLink.typeSlug}`);
-        return false;
-    }
-    OSHLink.typeId = foundType.id;
-    const foundTPs = foundType?.typeProperties?.filter((x) => OSHLink.typePropertySlugs.includes(x.slug)) ?? [];
-    if (foundTPs.length !== OSHLink.typePropertySlugs.length) {
-        logger_1.default.error(`OSH Links: Could not find all type properties with slugs ${OSHLink.typePropertySlugs}`);
-        return false;
-    }
-    logger_1.default.debug(`foundTPs: ${JSON.stringify(foundTPs)}`);
-    OSHLink.hierarchyTypePropertyIds = foundTPs.map((x) => x.id);
-    const foundOSH = OSHs.find((x) => x.identifier === OSHLink.optionSetHierarchyIdentifier);
-    if (!foundOSH) {
-        logger_1.default.error(`OSH Links: Could not find option set hierarchy with identifier ${OSHLink.optionSetHierarchyIdentifier}`);
-        return false;
-    }
-    OSHLink.optionSetHierarchyId = foundOSH.id;
-    logger_1.default.debug(`OSHLink after transform: ${JSON.stringify(OSHLink, null, 2)}`);
-    return true;
-}

package/dist/commands/types/uploadOptionSets.js

@@ -129,7 +129,7 @@ async function uploadOS(dir) {
     }
     function validateOptionSets(optionSets) {
         optionSets.forEach((optionSet) => {
-            optionSet.optionSet.forEach((option) => {
+            optionSet.optionSet?.forEach((option) => {
                 validateOption(option, optionSet.slug);
             });
         });

package/dist/commands/types/uploadRuleSets.js

@@ -35,9 +35,8 @@ async function uploadRuleSets(dir) {
     try {
         await (0, login_1.authUser)();
         logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploading`);
-        const [reducedRuleSets, reducedRuleSetLinks] = await loadReducedRuleSets(dir);
+        const reducedRuleSets = await loadReducedRuleSets(dir);
         await uploadRuleSetObjects(reducedRuleSets);
-        await uploadRuleSetLinkObjects(reducedRuleSetLinks);
         logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploaded`);
     }
     catch (e) {
@@ -49,15 +48,13 @@ async function uploadRuleSets(dir) {
 exports.uploadRuleSets = uploadRuleSets;
 function loadReducedRuleSets(fromDir) {
     const ruleSets = [];
-    let ruleSetLinks = [];
     const dir = path.join(fromDir, 'rule-sets');
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
             ruleSets.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        ruleSetLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'rule-set-links.yml'), 'utf8'));
-        return [ruleSets, ruleSetLinks];
+        return ruleSets;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -116,83 +113,3 @@ async function uploadRuleSetObjects(reducedRuleSets) {
         }
     }
 }
-async function uploadRuleSetLinkObjects(loadedRuleSetLinks) {
-    const types = await new sdk_1.Entities().get({
-        entityName: 'type',
-    });
-    const currentRuleSets = await new sdk_1.Entities().get({
-        entityName: 'type-rule-set',
-    });
-    const currentRuleSetLinks = await new sdk_1.Entities().get({
-        entityName: 'type-rule-set-link',
-    });
-    const currentLinksHashes = {};
-    for (const currentLink of currentRuleSetLinks) {
-        const foundType = types.find((t) => t.id === currentLink.typeId);
-        const foundRuleSet = currentRuleSets.find((rs) => rs.id === currentLink.typeRuleSetId);
-        const hash = `${foundType.slug}|${foundRuleSet.name}`;
-        currentLinksHashes[hash] = currentLink;
-    }
-    const reducedLinksByHashes = {};
-    for (const loadedLink of loadedRuleSetLinks) {
-        const hash = `${loadedLink.type}|${loadedLink.ruleSet}`;
-        reducedLinksByHashes[hash] = loadedLink;
-    }
-    for (const loadedRuleSetLink of loadedRuleSetLinks) {
-        try {
-            const found = currentLinksHashes[`${loadedRuleSetLink.type}|${loadedRuleSetLink.ruleSet}`];
-            if (!found) {
-                if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
-                    continue;
-                }
-                logger_1.default.info(`Creating: ${JSON.stringify(loadedRuleSetLink, null, 2)}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-rule-set-link',
-                    object: {
-                        typeRuleSetId: loadedRuleSetLink.ruleSet,
-                        typeId: loadedRuleSetLink.type,
-                    },
-                });
-            }
-            else {
-                if (!transformReducedLink(loadedRuleSetLink, types, currentRuleSets)) {
-                    continue;
-                }
-                logger_1.default.info(`skipping updating existing rule set link: ${loadedRuleSetLink}`);
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading rule set links: ${err}`);
-        }
-    }
-    for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
-        try {
-            const found = reducedLinksByHashes[currentLinkHash];
-            if (!found) {
-                logger_1.default.info(`Deleting: ${currentLinkHash}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-rule-set-link',
-                    id: currentLink['id'],
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting rule set link: ${err}`);
-        }
-    }
-}
-function transformReducedLink(ruleSetLink, types, ruleSets) {
-    const foundType = types.find((t) => t.slug === ruleSetLink.type);
-    if (!foundType) {
-        logger_1.default.error(`Could not find type with name ${ruleSetLink.type}`);
-        return false;
-    }
-    ruleSetLink.type = foundType.id;
-    const foundRuleSet = ruleSets.find((rs) => rs.identifier === ruleSetLink.ruleSet);
-    if (!foundRuleSet) {
-        logger_1.default.error(`Could not find rule set with name ${foundType.ruleSet}`);
-        return false;
-    }
-    ruleSetLink.ruleSet = foundRuleSet.id;
-    return true;
-}

package/dist/commands/types/uploadTypeOverrides.js

@@ -34,8 +34,12 @@ exports.default = UploadTypeOverrides;
 async function uploadTypeOverrides(dir) {
     try {
         await (0, login_1.authUser)();
-        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} Uploading`);
         const reducedOverrides = readTypeOverridesFromFile(dir);
+        if (!reducedOverrides || reducedOverrides.length === 0) {
+            logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} No overrides found in type-overrides.yml — skipping upload to avoid wiping org overrides`);
+            return;
+        }
+        logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} Uploading`);
         await (0, types_1.uploadTypeOverrideObjects)(reducedOverrides);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE OVERRIDE')} Uploaded`);
     }
@@ -47,8 +51,12 @@ async function uploadTypeOverrides(dir) {
 }
 exports.uploadTypeOverrides = uploadTypeOverrides;
 function readTypeOverridesFromFile(fromDir) {
+    const filePath = path.join(fromDir, 'type-overrides.yml');
+    if (!fs_1.default.existsSync(filePath)) {
+        return null;
+    }
     try {
-        return js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-overrides.yml'), 'utf8'));
+        return js_yaml_1.default.load(fs_1.default.readFileSync(filePath, 'utf8'));
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);

package/dist/commands/types/uploadTypePolicies.js

@@ -8,7 +8,6 @@ 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"));
@@ -37,9 +36,8 @@ async function uploadTypePolicies(dir) {
     try {
         await (0, login_1.authUser)();
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE POLICY')} Uploading`);
-        const [reducedTypePolicies, reducedTypePolicyLinks] = await loadTypePolicies(dir);
+        const reducedTypePolicies = await loadTypePolicies(dir);
         await uploadTypePolicyObjects(reducedTypePolicies);
-        await uploadTypePolicyLinks(reducedTypePolicyLinks);
         logger_1.default.info(`${chalk_1.default.yellow.bold('TYPE POLICY')} Uploaded`);
     }
     catch (e) {
@@ -51,15 +49,13 @@ async function uploadTypePolicies(dir) {
 exports.uploadTypePolicies = uploadTypePolicies;
 function loadTypePolicies(fromDir) {
     const tps = [];
-    let tpLinks = [];
     const dir = path.join(fromDir, 'type-policies');
     try {
         const files = fs_1.default.readdirSync(dir);
         for (const file of files) {
             tps.push(js_yaml_1.default.load(fs_1.default.readFileSync(path.join(dir, file), 'utf8')));
         }
-        tpLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-policy-links.yml'), 'utf8'));
-        return [tps, tpLinks];
+        return tps;
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -152,83 +148,3 @@ async function uploadTypePolicyObjects(reducedTypePolicies) {
         }
     }
 }
-async function uploadTypePolicyLinks(reducedTypePolicyLinks) {
-    const types = await (0, type_extractor_1.getTypes)();
-    const currentTypePolicies = await new sdk_1.Entities().get({
-        entityName: 'type-policy',
-    });
-    const currentTypePolicyLinks = await new sdk_1.Entities().get({
-        entityName: 'type-policy-link',
-    });
-    const currentLinksHashes = {};
-    for (const currentLink of currentTypePolicyLinks) {
-        const foundType = types.find((type) => type.id === currentLink.typeId);
-        const foundTypePolicy = currentTypePolicies.find((tp) => tp.id === currentLink.typePolicyId);
-        if (!foundType || !foundTypePolicy) {
-            logger_1.default.info(`skipping unhashable, invalid policy link: ${JSON.stringify(currentLink, null, 2)}`);
-        }
-        const hash = `${foundType.slug}|${foundTypePolicy.identifier}`;
-        currentLinksHashes[hash] = currentLink;
-    }
-    const reducedLinksByHashes = {};
-    for (const loadedLink of reducedTypePolicyLinks) {
-        const hash = `${loadedLink.typeSlug}|${loadedLink.typePolicyIdentifier}`;
-        reducedLinksByHashes[hash] = loadedLink;
-    }
-    for (const loadedTPLink of reducedTypePolicyLinks) {
-        try {
-            const found = currentLinksHashes[`${loadedTPLink.typeSlug}|${loadedTPLink.typePolicyIdentifier}`];
-            if (!found) {
-                if (!transformReducedLink(loadedTPLink, types, currentTypePolicies)) {
-                    continue;
-                }
-                logger_1.default.info(`Creating:  ${loadedTPLink.typeSlug}|${loadedTPLink.typePolicyIdentifier}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-policy-link',
-                    object: {
-                        typePolicyId: loadedTPLink.typePolicyId,
-                        typeId: loadedTPLink.typeId,
-                    },
-                });
-            }
-            else {
-                if (!transformReducedLink(loadedTPLink, types, currentTypePolicies)) {
-                    continue;
-                }
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading type policy links: ${err}`);
-        }
-    }
-    for (const [currentLinkHash, currentLink] of Object.entries(currentLinksHashes)) {
-        try {
-            const found = reducedLinksByHashes[currentLinkHash];
-            if (!found) {
-                logger_1.default.info(`Deleting:  ${currentLinkHash}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-policy-link',
-                    id: currentLink['id'],
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting rule set link: ${err}`);
-        }
-    }
-}
-function transformReducedLink(typePolicyLink, types, typePolicies) {
-    const foundType = types.find((type) => type.slug === typePolicyLink.typeSlug);
-    if (!foundType) {
-        logger_1.default.error(`Could not find type with slug ${typePolicyLink.typeSlug}`);
-        return false;
-    }
-    typePolicyLink.typeId = foundType.id;
-    const foundTypePolicy = typePolicies.find((tpp) => tpp.identifier === typePolicyLink.typePolicyIdentifier);
-    if (!foundTypePolicy) {
-        logger_1.default.error(`Could not find type policy with identifier ${typePolicyLink.typePolicyIdentifier}`);
-        return false;
-    }
-    typePolicyLink.typePolicyId = foundTypePolicy.id;
-    return true;
-}

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

@@ -10,4 +10,3 @@ export default class UploadTypePropertyPolicies extends BaseCommand {
     run(): Promise<void>;
 }
 export declare function uploadTypePropertyPolicies(dir: string): Promise<void>;
-export declare function findAllOccurrences(array: any, evaluator: any): any[];

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/commands/types/uploadUsageInfo.d.ts

@@ -2,6 +2,9 @@ import { BaseCommand } from '../../basecommand';
 import { PersistReducedUsageInfo } from '../../interfaces';
 export default class UploadUsageInfo extends BaseCommand {
     static description: string;
+    static deprecationOptions: {
+        message: string;
+    };
     static examples: string[];
     static flags: {
         dir: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;

package/dist/commands/types/uploadUsageInfo.js

@@ -13,7 +13,10 @@ 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 description = '[DEPRECATED] Upload extracted usage info. Use uploadTypeOverrides instead.';
+    static deprecationOptions = {
+        message: 'uploadUsageInfo is deprecated. Usage info is now managed as type overrides. Use `contrail types uploadTypeOverrides` instead.',
+    };
     static examples = [
         `$ contrail types uploadUsageInfo
 `,

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/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.1-alpha.68d57e0",
+  "version": "3.5.1-alpha.fd40e6d",
   "commands": {
     "app:create": {
       "id": "app:create",
@@ -2522,7 +2522,7 @@
     },
     "types:uploadUsageInfo": {
       "id": "types:uploadUsageInfo",
-      "description": "Upload extracted usage info",
+      "description": "[DEPRECATED] Upload extracted usage info. Use uploadTypeOverrides instead.",
       "strict": true,
       "pluginName": "@contrail/cli",
       "pluginAlias": "@contrail/cli",
@@ -2531,6 +2531,9 @@
       "examples": [
         "$ contrail types uploadUsageInfo\n"
       ],
+      "deprecationOptions": {
+        "message": "uploadUsageInfo is deprecated. Usage info is now managed as type overrides. Use `contrail types uploadTypeOverrides` instead."
+      },
       "flags": {
         "logLevel": {
           "name": "logLevel",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.1-alpha.68d57e0",
+  "version": "3.5.1-alpha.fd40e6d",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",