@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.2ab70db

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -8,48 +8,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const Auth_1 = require("../../../../Auth");
-const planner_1 = require("../../../../utils/planner");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_GET;
     }
     get description() {
         return 'Gets the Microsoft Planner bucket in a plan';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getBucketId(args)
-            .then((bucketId) => this.getBucketById(bucketId))
-            .then((bucket) => {
-            logger.log(bucket);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const bucketId = yield this.getBucketId(args);
+                const bucket = yield this.getBucketById(bucketId);
+                logger.log(bucket);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getBucketId(args) {
         const { id, name } = args.options;
@@ -110,36 +111,36 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_initTelemetry = function _PlannerBucketGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerBucketGetCommand_initOptions = function _PlannerBucketGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--planId [planId]'
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerBucketGetCommand_initValidators = function _PlannerBucketGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
                 return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
             if (args.options.name) {
@@ -147,13 +148,13 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+            if (!args.options.planId && !args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+            if (args.options.planId && args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName || args.options.planTitle) {
+            if (args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
                     return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
@@ -174,7 +175,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             return 'Please specify id or name';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

package/dist/m365/planner/commands/bucket/bucket-list.js

@@ -1,46 +1,59 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
-const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_LIST;
     }
     get description() {
         return 'Lists the Microsoft Planner buckets in a plan';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'name', 'planId', 'orderHint'];
     }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getPlanId(args)
-            .then((planId) => utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`))
-            .then((buckets) => {
-            logger.log(buckets);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const planId = yield this.getPlanId(args);
+                const buckets = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`);
+                logger.log(buckets);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPlanId(args) {
         if (args.options.planId) {
@@ -59,45 +72,41 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
-            return 'Specify either planId or planTitle but not both';
-        }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+}
+_PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_initTelemetry = function _PlannerBucketListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerBucketListCommand_initOptions = function _PlannerBucketListCommand_initOptions() {
+    this.options.unshift({
+        option: '--planId [planId]'
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerBucketListCommand_initValidators = function _PlannerBucketListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _PlannerBucketListCommand_initOptionSets = function _PlannerBucketListCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle']);
+};
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -1,75 +1,81 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerBucketRemoveCommand_instances, _PlannerBucketRemoveCommand_initTelemetry, _PlannerBucketRemoveCommand_initOptions, _PlannerBucketRemoveCommand_initValidators, _PlannerBucketRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const cli_1 = require("../../../../cli");
-const utils_1 = require("../../../../utils");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const planner_1 = require("../../../../utils/planner");
-const Auth_1 = require("../../../../Auth");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketRemoveCommand_instances, "m", _PlannerBucketRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketRemoveCommand_instances, "m", _PlannerBucketRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketRemoveCommand_instances, "m", _PlannerBucketRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketRemoveCommand_instances, "m", _PlannerBucketRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_REMOVE;
     }
     get description() {
         return 'Removes the Microsoft Planner bucket from a plan';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        telemetryProps.confirm = args.options.confirm || false;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        const removeBucket = () => {
-            this
-                .getBucket(args)
-                .then(bucket => {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'if-match': bucket['@odata.etag']
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeBucket();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            const removeBucket = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const bucket = yield this.getBucket(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'if-match': bucket['@odata.etag']
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeBucket();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeBucket();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removeBucket();
+                }
+            }
+        });
     }
     getBucket(args) {
         if (args.options.id) {
@@ -124,55 +130,50 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    optionSets() {
-        return [
-            ['id', 'name']
-        ];
-    }
-    validate(args) {
+}
+_PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveCommand_initTelemetry = function _PlannerBucketRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            confirm: args.options.confirm || false
+        });
+    });
+}, _PlannerBucketRemoveCommand_initOptions = function _PlannerBucketRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--planId [planId]'
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PlannerBucketRemoveCommand_initValidators = function _PlannerBucketRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
                 return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
         }
         else {
-            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+            if (!args.options.planId && !args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+            if (args.options.planId && args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName || args.options.planTitle) {
+            if (args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
                     return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
@@ -190,7 +191,9 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _PlannerBucketRemoveCommand_initOptionSets = function _PlannerBucketRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new PlannerBucketRemoveCommand();
 //# sourceMappingURL=bucket-remove.js.map