@contrail/cli 3.4.3 → 3.4.4-alpha.1

package/dist/commands/types/uploadRuleSets.js

@@ -1,198 +1,198 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadRuleSets = void 0;
-const tslib_1 = require("tslib");
-const sdk_1 = require("@contrail/sdk");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-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 basecommand_1 = require("../../basecommand");
-const logger_1 = tslib_1.__importDefault(require("../../logger"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-class UploadRuleSets extends basecommand_1.BaseCommand {
-    static description = 'Upload an extracted rule set';
-    static examples = [
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadRuleSets = void 0;
+const tslib_1 = require("tslib");
+const sdk_1 = require("@contrail/sdk");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+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 basecommand_1 = require("../../basecommand");
+const logger_1 = tslib_1.__importDefault(require("../../logger"));
+const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
+class UploadRuleSets extends basecommand_1.BaseCommand {
+    static description = 'Upload an extracted rule set';
+    static examples = [
         `$ contrail types uploadRuleSets
-`,
-    ];
-    static flags = {
-        ...basecommand_1.BaseCommand.baseFlags,
-        dir: core_1.Flags.string({
-            char: 'd',
-            description: 'The directory from which to export the rule set data. Defaults to the current directory. The rule set data will be loaded from $dir/rule-sets/*.yml',
-            required: false,
-            default: '.',
-        }),
-    };
-    async run() {
-        await uploadRuleSets(this.flags.dir);
-    }
-}
-exports.default = UploadRuleSets;
-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);
-        await uploadRuleSetObjects(reducedRuleSets);
-        await uploadRuleSetLinkObjects(reducedRuleSetLinks);
-        logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploaded`);
-    }
-    catch (e) {
-        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Rule Set Upload Failed. ${e}`);
-        return;
-    }
-    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Rule set Upload Complete.`);
-}
-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];
-    }
-    catch (e) {
-        throw new Error(`ERROR PARSING YAML: ${e}`);
-    }
-}
-async function uploadRuleSetObjects(reducedRuleSets) {
-    const currentRuleSets = await new sdk_1.Entities().get({
-        entityName: 'type-rule-set',
-    });
-    const currentRuleSetsByIdentifier = {};
-    for (const currentRuleSet of currentRuleSets) {
-        currentRuleSetsByIdentifier[currentRuleSet.identifier] = currentRuleSet;
-    }
-    const loadedRuleSetsByIdentifier = {};
-    for (const loadedRuleSet of reducedRuleSets) {
-        loadedRuleSetsByIdentifier[loadedRuleSet.identifier] = loadedRuleSet;
-    }
-    logger_1.default.debug(`current rule sets: ${currentRuleSets}`);
-    logger_1.default.debug(`reduced rule sets: ${reducedRuleSets}`);
-    for (const reducedRuleSet of reducedRuleSets) {
-        try {
-            const found = currentRuleSetsByIdentifier[reducedRuleSet.identifier];
-            if (!found) {
-                logger_1.default.info(`Creating: ${reducedRuleSet.identifier}`);
-                await new sdk_1.Entities().create({
-                    entityName: 'type-rule-set',
-                    object: reducedRuleSet,
-                });
-            }
-            else {
-                logger_1.default.info(`Updating: ${reducedRuleSet.identifier}`);
-                await new sdk_1.Entities().update({
-                    entityName: 'type-rule-set',
-                    id: found.id,
-                    object: reducedRuleSet,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Uploading rule sets: ${err}`);
-        }
-    }
-    for (const currentRuleSet of currentRuleSets) {
-        try {
-            const found = loadedRuleSetsByIdentifier[currentRuleSet.identifier];
-            if (!found) {
-                logger_1.default.info(`Deleting: ${currentRuleSet.identifier}`);
-                await new sdk_1.Entities().delete({
-                    entityName: 'type-rule-set',
-                    id: currentRuleSet.id,
-                });
-            }
-        }
-        catch (err) {
-            logger_1.default.error(`Error Deleting rule set: ${err}`);
-        }
-    }
-}
-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;
-}
+`,
+    ];
+    static flags = {
+        ...basecommand_1.BaseCommand.baseFlags,
+        dir: core_1.Flags.string({
+            char: 'd',
+            description: 'The directory from which to export the rule set data. Defaults to the current directory. The rule set data will be loaded from $dir/rule-sets/*.yml',
+            required: false,
+            default: '.',
+        }),
+    };
+    async run() {
+        await uploadRuleSets(this.flags.dir);
+    }
+}
+exports.default = UploadRuleSets;
+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);
+        await uploadRuleSetObjects(reducedRuleSets);
+        await uploadRuleSetLinkObjects(reducedRuleSetLinks);
+        logger_1.default.info(`${chalk_1.default.yellow.bold('RULE SET')} Uploaded`);
+    }
+    catch (e) {
+        logger_1.default.info(`${chalk_1.default.red.bold('FAIL')} Rule Set Upload Failed. ${e}`);
+        return;
+    }
+    logger_1.default.info(`${chalk_1.default.green.bold('COMPLETE')} Rule set Upload Complete.`);
+}
+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];
+    }
+    catch (e) {
+        throw new Error(`ERROR PARSING YAML: ${e}`);
+    }
+}
+async function uploadRuleSetObjects(reducedRuleSets) {
+    const currentRuleSets = await new sdk_1.Entities().get({
+        entityName: 'type-rule-set',
+    });
+    const currentRuleSetsByIdentifier = {};
+    for (const currentRuleSet of currentRuleSets) {
+        currentRuleSetsByIdentifier[currentRuleSet.identifier] = currentRuleSet;
+    }
+    const loadedRuleSetsByIdentifier = {};
+    for (const loadedRuleSet of reducedRuleSets) {
+        loadedRuleSetsByIdentifier[loadedRuleSet.identifier] = loadedRuleSet;
+    }
+    logger_1.default.debug(`current rule sets: ${currentRuleSets}`);
+    logger_1.default.debug(`reduced rule sets: ${reducedRuleSets}`);
+    for (const reducedRuleSet of reducedRuleSets) {
+        try {
+            const found = currentRuleSetsByIdentifier[reducedRuleSet.identifier];
+            if (!found) {
+                logger_1.default.info(`Creating: ${reducedRuleSet.identifier}`);
+                await new sdk_1.Entities().create({
+                    entityName: 'type-rule-set',
+                    object: reducedRuleSet,
+                });
+            }
+            else {
+                logger_1.default.info(`Updating: ${reducedRuleSet.identifier}`);
+                await new sdk_1.Entities().update({
+                    entityName: 'type-rule-set',
+                    id: found.id,
+                    object: reducedRuleSet,
+                });
+            }
+        }
+        catch (err) {
+            logger_1.default.error(`Error Uploading rule sets: ${err}`);
+        }
+    }
+    for (const currentRuleSet of currentRuleSets) {
+        try {
+            const found = loadedRuleSetsByIdentifier[currentRuleSet.identifier];
+            if (!found) {
+                logger_1.default.info(`Deleting: ${currentRuleSet.identifier}`);
+                await new sdk_1.Entities().delete({
+                    entityName: 'type-rule-set',
+                    id: currentRuleSet.id,
+                });
+            }
+        }
+        catch (err) {
+            logger_1.default.error(`Error Deleting rule set: ${err}`);
+        }
+    }
+}
+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/uploadTypePolicies.d.ts

@@ -1,12 +1,12 @@
-import { BaseCommand } from '../../basecommand';
-export default class UploadTypePolicies 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 uploadTypePolicies(dir: string): Promise<void>;
+import { BaseCommand } from '../../basecommand';
+export default class UploadTypePolicies 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 uploadTypePolicies(dir: string): Promise<void>;