@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.eff4ea7

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:alpine-3.12
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 ARG CLI_VERSION=latest
 
@@ -48,6 +48,7 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'm365 cli completion sh setup' \
   && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
 
+RUN pip install setuptools==58
 RUN pip install jmespath-terminal
 
 CMD [ "bash", "-l" ]

package/dist/cli/Cli.js

@@ -801,6 +801,22 @@ class Cli {
             return response;
         });
     }
+    static handleMultipleResultsFound(promptMessage, errorMessage, values) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const interactive = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.interactive, false);
+            if (!interactive) {
+                throw errorMessage;
+            }
+            const response = yield Cli.prompt({
+                type: 'list',
+                name: 'select',
+                default: 0,
+                message: promptMessage,
+                choices: Object.keys(values)
+            });
+            return values[response.select];
+        });
+    }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));
         const optionsToRemove = Object.getOwnPropertyNames(args.options)

package/dist/m365/cli/commands/config/config-set.js

@@ -43,6 +43,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.csvQuoted:
                 case settingsNames_1.settingsNames.csvQuotedEmpty:
                 case settingsNames_1.settingsNames.disableTelemetry:
+                case settingsNames_1.settingsNames.interactive:
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:

package/dist/m365/flow/commands/flow-list.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions;
+var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const formatting_1 = require("../../../utils/formatting");
 const AzmgmtItemsListCommand_1 = require("../../base/AzmgmtItemsListCommand");
@@ -31,14 +31,28 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     constructor() {
         super();
         _FlowListCommand_instances.add(this);
+        this.allowedSharingStatuses = ['all', 'personal', 'ownedByMe', 'sharedWithMe'];
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows?api-version=2016-11-01`;
             try {
-                yield this.getAllItems(url, logger, true);
+                if (args.options.asAdmin || !args.options.sharingStatus || args.options.sharingStatus === 'ownedByMe') {
+                    yield this.getAllItems(url, logger, true);
+                }
+                else if (args.options.sharingStatus === 'personal') {
+                    yield this.getFilteredItems(url, logger, 'personal', true);
+                }
+                else if (args.options.sharingStatus === 'sharedWithMe') {
+                    yield this.getFilteredItems(url, logger, 'team', true);
+                }
+                else {
+                    yield this.getFilteredItems(url, logger, 'personal', true);
+                    yield this.getFilteredItems(url, logger, 'team', false);
+                }
                 if (this.items.length > 0) {
                     this.items.forEach(i => {
                         i.displayName = i.properties.displayName;
@@ -56,19 +70,38 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
             }
         });
     }
+    getFilteredItems(url, logger, filter, firstRun) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.getAllItems(`${url}&$filter=search('${filter}')`, logger, firstRun);
+        });
+    }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            sharingStatus: typeof args.options.sharingStatus !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
     });
 }, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--sharingStatus [sharingStatus]',
+        autocomplete: this.allowedSharingStatuses
     }, {
         option: '--asAdmin'
     });
+}, _FlowListCommand_initValidators = function _FlowListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.asAdmin && args.options.sharingStatus) {
+            return `The options asAdmin and sharingStatus cannot be specified together.`;
+        }
+        if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(',')}`;
+        }
+        return true;
+    }));
 };
 module.exports = new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

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

@@ -64,21 +64,23 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        if (args.options.planId) {
-            return Promise.resolve(args.options.planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            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;
+        });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_initTelemetry = function _PlannerBucketAddCommand_initTelemetry() {

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

@@ -49,13 +49,12 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         });
     }
     getBucketId(args) {
-        const { id, name } = args.options;
-        if (id) {
-            return Promise.resolve(id);
-        }
-        return this
-            .getPlanId(args)
-            .then((planId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, name } = args.options;
+            if (id) {
+                return id;
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -63,28 +62,27 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${name} does not exist`);
+                throw `The specified bucket ${name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0].id.toString());
+            return filteredBuckets[0].id.toString();
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getBucketById(id) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,13 +97,14 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_initTelemetry = function _PlannerBucketGetCommand_initTelemetry() {

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

@@ -52,21 +52,23 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        if (args.options.planId) {
-            return Promise.resolve(args.options.planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            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;
+        });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_initTelemetry = function _PlannerBucketListCommand_initTelemetry() {

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

@@ -73,19 +73,18 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         });
     }
     getBucket(args) {
-        if (args.options.id) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }
-        return this
-            .getPlanId(args)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return yield request_1.default.get(requestOptions);
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -93,37 +92,37 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${args.options.name} does not exist`);
+                throw `The specified bucket ${args.options.name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0]);
+            return filteredBuckets[0];
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveCommand_initTelemetry = function _PlannerBucketRemoveCommand_initTelemetry() {

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

@@ -64,19 +64,18 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         });
     }
     getBucket(args) {
-        if (args.options.id) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }
-        return this
-            .getPlanId(args)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return yield request_1.default.get(requestOptions);
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -84,37 +83,37 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${args.options.name} does not exist`);
+                throw `The specified bucket ${args.options.name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0]);
+            return filteredBuckets[0];
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_initTelemetry = function _PlannerBucketSetCommand_initTelemetry() {

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

@@ -76,13 +76,12 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         });
     }
     updatePlanDetails(options, newPlan) {
-        const planId = newPlan.id;
-        if (!options.shareWithUserIds && !options.shareWithUserNames) {
-            return Promise.resolve(newPlan);
-        }
-        return Promise
-            .all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)])
-            .then(resArray => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const planId = newPlan.id;
+            if (!options.shareWithUserIds && !options.shareWithUserNames) {
+                return newPlan;
+            }
+            const resArray = yield Promise.all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)]);
             const sharedWith = resArray[0];
             const etag = resArray[1];
             const requestOptionsPlanDetails = {
@@ -97,70 +96,68 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
                     sharedWith: sharedWith
                 }
             };
-            return request_1.default.patch(requestOptionsPlanDetails);
-        })
-            .then(planDetails => {
+            const planDetails = yield request_1.default.patch(requestOptionsPlanDetails);
             return Object.assign(Object.assign({}, newPlan), planDetails);
         });
     }
     getPlanDetailsEtag(planId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => response['@odata.etag']);
-    }
-    generateSharedWith(options) {
-        const sharedWith = {};
-        return this
-            .getUserIds(options)
-            .then((userIds) => {
-            userIds.map(x => sharedWith[x] = true);
-            return Promise.resolve(sharedWith);
-        });
-    }
-    getUserIds(options) {
-        if (options.shareWithUserIds) {
-            return Promise.resolve(options.shareWithUserIds.split(','));
-        }
-        // Hitting this section means assignedToUserNames won't be undefined
-        const userNames = options.shareWithUserNames;
-        const userArr = userNames.split(',').map(o => o.trim());
-        const promises = userArr.map(user => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
                 headers: {
-                    'content-type': 'application/json'
+                    accept: 'application/json'
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
         });
-        return Promise
-            .all(promises)
-            .then((usersRes) => {
+    }
+    generateSharedWith(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharedWith = {};
+            const userIds = yield this.getUserIds(options);
+            userIds.map(x => sharedWith[x] = true);
+            return sharedWith;
+        });
+    }
+    getUserIds(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.shareWithUserIds) {
+                return options.shareWithUserIds.split(',');
+            }
+            // Hitting this section means assignedToUserNames won't be undefined
+            const userNames = options.shareWithUserNames;
+            const userArr = userNames.split(',').map(o => o.trim());
+            const promises = userArr.map(user => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                    headers: {
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.get(requestOptions);
+            });
+            const usersRes = yield Promise.all(promises);
             const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
             const userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
             // Find the members where no graph response was found
             const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
             if (invalidUsers && invalidUsers.length > 0) {
-                return Promise.reject(`Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+                throw `Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`;
             }
-            return Promise.resolve(userIds);
+            return userIds;
         });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTelemetry = function _PlannerPlanAddCommand_initTelemetry() {