@contrail/cli 3.4.11-alpha.0f34b47 → 3.4.11-alpha.11e1d43

package/dist/commands/types/uploadTypePropertyPolicies.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadTypePropertyPolicies = void 0;
+exports.findAllOccurrences = exports.uploadTypePropertyPolicies = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@contrail/sdk");
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -8,10 +8,12 @@ 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 = [
@@ -36,12 +38,14 @@ 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 = await loadTPPolicies(dir);
+        const [reducedTypePropertyPolicies, reducedTypePropertyPolicyLinks] = 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;
     }
@@ -50,13 +54,15 @@ 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')));
         }
-        return tpps;
+        tppLinks = js_yaml_1.default.load(fs_1.default.readFileSync(path.join(fromDir, 'type-property-policy-links.yml'), 'utf8'));
+        return [tpps, tppLinks];
     }
     catch (e) {
         throw new Error(`ERROR PARSING YAML: ${e}`);
@@ -149,3 +155,133 @@ 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,9 +2,6 @@ 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,10 +13,7 @@ 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 = '[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 description = 'Upload extracted usage info';
     static examples = [
         `$ contrail types uploadUsageInfo
 `,