@pnp/cli-microsoft365 7.0.0-beta.a9cf617 → 7.0.0-beta.e25bf4a

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

@@ -68,9 +68,13 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
             if (args.options.planId) {
                 return args.options.planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            if (args.options.planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -88,6 +92,7 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         Object.assign(this.telemetryProperties, {
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             orderHint: typeof args.options.orderHint !== 'undefined'
@@ -100,6 +105,8 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         option: "--planId [planId]"
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: "--ownerGroupId [ownerGroupId]"
     }, {
@@ -109,19 +116,16 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
     });
 }, _PlannerBucketAddCommand_initValidators = function _PlannerBucketAddCommand_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.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
 }, _PlannerBucketAddCommand_initOptionSets = function _PlannerBucketAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['planId', 'planTitle'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

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

@@ -75,13 +75,17 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getBucketById(id) {
@@ -114,6 +118,7 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
@@ -127,6 +132,8 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -135,24 +142,12 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
 }, _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.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planTitle || args.options.rosterId || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
-            }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
             if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
                 if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;
                 }
@@ -162,11 +157,22 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
                     return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
                 }
             }
+            if (args.options.rosterId) {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
+                }
+            }
         }
         return true;
     }));
 }, _PlannerBucketGetCommand_initOptionSets = function _PlannerBucketGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

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

@@ -56,9 +56,13 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
             if (args.options.planId) {
                 return args.options.planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            if (args.options.planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -76,6 +80,7 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         Object.assign(this.telemetryProperties, {
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
@@ -85,6 +90,8 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -92,19 +99,16 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
     });
 }, _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.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation_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({ options: ['planId', 'planTitle'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map

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

@@ -56,7 +56,7 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeBucket();
             }
             else {
@@ -105,13 +105,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -132,9 +136,10 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _PlannerBucketRemoveCommand_initOptions = function _PlannerBucketRemoveCommand_initOptions() {
@@ -146,48 +151,49 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
         option: '--ownerGroupName [ownerGroupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _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.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planTitle || args.options.rosterId || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
         else {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
-            }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
             if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
                 if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;
                 }
             }
-            else {
+            else if (args.options.planId) {
                 if (args.options.ownerGroupId || args.options.ownerGroupName) {
                     return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
                 }
             }
+            else {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
+                }
+            }
         }
         return true;
     }));
 }, _PlannerBucketRemoveCommand_initOptionSets = function _PlannerBucketRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketRemoveCommand();
 //# sourceMappingURL=bucket-remove.js.map

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

@@ -96,13 +96,17 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -123,6 +127,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
@@ -138,6 +143,8 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -149,33 +156,18 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
     });
 }, _PlannerBucketSetCommand_initValidators = function _PlannerBucketSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            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.id && (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName || args.options.rosterId)) {
+            return 'Don\'t specify planId, planTitle, ownerGroupId, ownerGroupName or rosterId when using id';
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+                return `${args.options.ownerGroupId} is not a valid GUID`;
             }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
-            if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
-                if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                    return `${args.options.ownerGroupId} is not a valid GUID`;
-                }
+            if (args.options.planId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
             }
-            if (args.options.planId) {
-                if (args.options.ownerGroupId || args.options.ownerGroupName) {
-                    return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
-                }
+            if (args.options.rosterId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
             }
         }
         if (!args.options.newName && !args.options.orderHint) {
@@ -184,7 +176,13 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         return true;
     }));
 }, _PlannerBucketSetCommand_initOptionSets = function _PlannerBucketSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketSetCommand();
 //# sourceMappingURL=bucket-set.js.map

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

@@ -56,7 +56,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removePlan();
             }
             else {
@@ -100,7 +100,7 @@ _PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_i
             title: typeof args.options.title !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PlannerPlanRemoveCommand_initOptions = function _PlannerPlanRemoveCommand_initOptions() {
@@ -113,7 +113,7 @@ _PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_i
     }, {
         option: '--ownerGroupName [ownerGroupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PlannerPlanRemoveCommand_initValidators = function _PlannerPlanRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -19,8 +19,7 @@ const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const Cli_1 = require("../../../../cli/Cli");
+const aadUser_1 = require("../../../../utils/aadUser");
 class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.ROSTER_MEMBER_ADD;
@@ -69,18 +68,8 @@ class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
             if (args.options.userId) {
                 return args.options.userId;
             }
-            const aadUserGetCommandoptions = {
-                userName: args.options.userName,
-                output: 'json',
-                debug: args.options.debug,
-                verbose: args.options.verbose
-            };
-            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.verbose) {
-                logger.logToStderr(aadUserGetOutput.stderr);
-            }
-            const aadUserGetJsonOutput = JSON.parse(aadUserGetOutput.stdout);
-            return aadUserGetJsonOutput.id;
+            const userId = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+            return userId;
         });
     }
 }

package/dist/m365/planner/commands/roster/roster-member-remove.js

@@ -42,7 +42,7 @@ class PlannerRosterMemberRemoveCommand extends GraphCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRosterMember(args);
             }
             else {
@@ -89,7 +89,7 @@ class PlannerRosterMemberRemoveCommand extends GraphCommand_1.default {
     }
     removeLastMemberConfirmation(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!args.options.confirm) {
+            if (!args.options.force) {
                 const rosterMembers = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/rosters/${args.options.rosterId}/members?$select=Id`);
                 if (rosterMembers.length === 1) {
                     const result = yield Cli_1.Cli.prompt({
@@ -110,7 +110,7 @@ _PlannerRosterMemberRemoveCommand_instances = new WeakSet(), _PlannerRosterMembe
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PlannerRosterMemberRemoveCommand_initOptions = function _PlannerRosterMemberRemoveCommand_initOptions() {
@@ -121,7 +121,7 @@ _PlannerRosterMemberRemoveCommand_instances = new WeakSet(), _PlannerRosterMembe
     }, {
         option: '--userName [userName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _PlannerRosterMemberRemoveCommand_initOptionSets = function _PlannerRosterMemberRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['userId', 'userName'] });

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

@@ -34,7 +34,7 @@ class PlannerRosterRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRoster(args, logger);
             }
             else {
@@ -74,14 +74,14 @@ class PlannerRosterRemoveCommand extends GraphCommand_1.default {
 _PlannerRosterRemoveCommand_instances = new WeakSet(), _PlannerRosterRemoveCommand_initTelemetry = function _PlannerRosterRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PlannerRosterRemoveCommand_initOptions = function _PlannerRosterRemoveCommand_initOptions() {
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new PlannerRosterRemoveCommand();

package/dist/m365/planner/commands/task/task-checklistitem-remove.js

@@ -35,7 +35,7 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeChecklistitem(args);
             }
             else {
@@ -95,11 +95,11 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
 _PlannerTaskChecklistItemRemoveCommand_instances = new WeakSet(), _PlannerTaskChecklistItemRemoveCommand_initTelemetry = function _PlannerTaskChecklistItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _PlannerTaskChecklistItemRemoveCommand_initOptions = function _PlannerTaskChecklistItemRemoveCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id <id>' }, { option: '--taskId <taskId>' }, { option: '--confirm' });
+    this.options.unshift({ option: '-i, --id <id>' }, { option: '--taskId <taskId>' }, { option: '-f, --force' });
 };
 module.exports = new PlannerTaskChecklistItemRemoveCommand();
 //# sourceMappingURL=task-checklistitem-remove.js.map

package/dist/m365/planner/commands/task/task-reference-remove.js

@@ -37,7 +37,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeReference(logger, args);
             }
             else {
@@ -116,11 +116,11 @@ _PlannerTaskReferenceRemoveCommand_instances = new WeakSet(), _PlannerTaskRefere
         Object.assign(this.telemetryProperties, {
             url: typeof args.options.url !== 'undefined',
             alias: typeof args.options.alias !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _PlannerTaskReferenceRemoveCommand_initOptions = function _PlannerTaskReferenceRemoveCommand_initOptions() {
-    this.options.unshift({ option: '-u, --url [url]' }, { option: '--alias [alias]' }, { option: '-i, --taskId <taskId>' }, { option: '--confirm' });
+    this.options.unshift({ option: '-u, --url [url]' }, { option: '--alias [alias]' }, { option: '-i, --taskId <taskId>' }, { option: '-f, --force' });
 }, _PlannerTaskReferenceRemoveCommand_initValidators = function _PlannerTaskReferenceRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.url && args.options.url.indexOf('https://') !== 0 && args.options.url.indexOf('http://') !== 0) {

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

@@ -58,7 +58,7 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeTask();
             }
             else {
@@ -158,11 +158,11 @@ _PlannerTaskRemoveCommand_instances = new WeakSet(), _PlannerTaskRemoveCommand_i
             planTitle: typeof args.options.planTitle !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _PlannerTaskRemoveCommand_initOptions = function _PlannerTaskRemoveCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--confirm' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '-f, --force' });
 }, _PlannerTaskRemoveCommand_initValidators = function _PlannerTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-get.js

@@ -44,7 +44,7 @@ class PpAiBuilderModelGetCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving an AI builder model '${args.options.id || args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const res = yield this.getAiBuilderModel(dynamicsApiUrl, args.options);
                 logger.log(res);
             }
@@ -88,7 +88,7 @@ _PpAiBuilderModelGetCommand_instances = new WeakSet(), _PpAiBuilderModelGetComma
     });
 }, _PpAiBuilderModelGetCommand_initOptions = function _PpAiBuilderModelGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/aibuildermodel/aibuildermodel-list.js

@@ -41,7 +41,7 @@ class PpAiBuilderModelListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving available AI Builder models`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const aimodels = yield odata_1.odata.getAllItems(`${dynamicsApiUrl}/api/data/v9.0/msdyn_aimodels?$filter=iscustomizable/Value eq true`);
                 logger.log(aimodels);
             }
@@ -59,7 +59,7 @@ _PpAiBuilderModelListCommand_instances = new WeakSet(), _PpAiBuilderModelListCom
     });
 }, _PpAiBuilderModelListCommand_initOptions = function _PpAiBuilderModelListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });