@pnp/cli-microsoft365 6.9.0-beta.91abae4 → 6.9.0-beta.d8f8efb

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

@@ -95,19 +95,18 @@ class FileListCommand extends GraphCommand_1.default {
         });
     }
     getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting document library...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((drives) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting document library...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const drives = yield request_1.default.get(requestOptions);
             const lowerCaseFolderUrl = folderUrl.href.toLowerCase();
             const drive = drives.value
                 .sort((a, b) => b.webUrl.localeCompare(a.webUrl))
@@ -119,29 +118,28 @@ class FileListCommand extends GraphCommand_1.default {
                         lowerCaseFolderUrl[driveUrl.length] === '/');
             });
             if (!drive) {
-                return Promise.reject(`Document library '${folderUrlFromUser}' not found`);
+                throw `Document library '${folderUrlFromUser}' not found`;
             }
             if (this.verbose) {
                 logger.logToStderr(`Document library: ${drive.webUrl}, ${drive.id}`);
             }
-            return Promise.resolve(drive);
+            return drive;
         });
     }
     getStartingFolderId(documentLibrary, folderUrl, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting starting folder id...`);
-        }
-        const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(documentLibrary.webUrl, 'i'), '');
-        const requestOptions = {
-            url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((folder) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting starting folder id...`);
+            }
+            const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(documentLibrary.webUrl, 'i'), '');
+            const requestOptions = {
+                url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const folder = yield request_1.default.get(requestOptions);
             if (this.verbose) {
                 logger.logToStderr(`Starting folder id: ${folder.id}`);
             }
@@ -149,37 +147,33 @@ class FileListCommand extends GraphCommand_1.default {
         });
     }
     loadFoldersToGetFilesFrom(folderId, driveId, recursive) {
-        if (!recursive) {
-            return Promise.resolve();
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((subfolders) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!recursive) {
+                return;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const subfolders = yield request_1.default.get(requestOptions);
             const subfolderIds = subfolders.value.map((subfolder) => subfolder.id);
             this.foldersToGetFilesFrom = this.foldersToGetFilesFrom.concat(subfolderIds);
-            return Promise
-                .all(subfolderIds.map((subfolderId) => this.loadFoldersToGetFilesFrom(subfolderId, driveId, recursive)))
-                .then(_ => Promise.resolve());
+            yield Promise.all(subfolderIds.map((subfolderId) => this.loadFoldersToGetFilesFrom(subfolderId, driveId, recursive)));
         });
     }
     loadFilesFromFolders(driveId, folderIds, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Loading files from folders...`);
-        }
-        let files = [];
-        return Promise
-            .all(folderIds.map((folderId) => 
-        // get items from folder. Because we can't filter out folders here
-        // we need to get all items from the folder and filter them out later
-        odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
-            .then(res => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Loading files from folders...`);
+            }
+            let files = [];
+            const res = yield Promise.all(folderIds.map((folderId) => 
+            // get items from folder. Because we can't filter out folders here
+            // we need to get all items from the folder and filter them out later
+            odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)));
             // flatten data from all promises
             files = files.concat(...res);
             // remove folders from the list of files

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

@@ -41,39 +41,28 @@ class OneDriveListCommand extends SpoCommand_1.default {
         });
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
-                .then((res) => {
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">1</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">SPSPERS</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                    return;
-                }
-                else {
-                    const sites = json[json.length - 1];
-                    this.allSites.push(...sites._Child_Items_);
-                    if (sites.NextStartIndexFromSharePoint) {
-                        this
-                            .getAllSites(spoAdminUrl, sites.NextStartIndexFromSharePoint, formDigest, logger)
-                            .then(_ => resolve(), err => reject(err));
-                    }
-                    else {
-                        resolve();
-                    }
+        return __awaiter(this, void 0, void 0, function* () {
+            const formDigestInfo = yield spo_1.spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">1</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">SPSPERS</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw (response.ErrorInfo.ErrorMessage);
+            }
+            else {
+                const sites = json[json.length - 1];
+                this.allSites.push(...sites._Child_Items_);
+                if (sites.NextStartIndexFromSharePoint) {
+                    yield this.getAllSites(spoAdminUrl, sites.NextStartIndexFromSharePoint, formDigest, logger);
                 }
-            }, err => reject(err));
+            }
         });
     }
 }

package/dist/m365/pa/commands/app/app-export.js

@@ -22,6 +22,7 @@ const path = require("path");
 const formatting_1 = require("../../../../utils/formatting");
 const request_1 = require("../../../../request");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const promises_1 = require("timers/promises");
 class PaAppExportCommand extends PowerPlatformCommand_1.default {
     get name() {
         return commands_1.default.APP_EXPORT;
@@ -32,6 +33,7 @@ class PaAppExportCommand extends PowerPlatformCommand_1.default {
     constructor() {
         super();
         _PaAppExportCommand_instances.add(this);
+        this.pollingInterval = 5000;
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
@@ -144,7 +146,7 @@ class PaAppExportCommand extends PowerPlatformCommand_1.default {
                     link = response.properties.packageLink.value;
                 }
                 else {
-                    yield this.sleep(5000);
+                    (0, promises_1.setTimeout)(this.pollingInterval);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Current status of the get package link: ${status}`);
@@ -153,9 +155,6 @@ class PaAppExportCommand extends PowerPlatformCommand_1.default {
             return link;
         });
     }
-    sleep(ms) {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
 }
 _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry = function _PaAppExportCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/pa/commands/app/app-get.js

@@ -89,15 +89,17 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         });
     }
     getApps(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all apps...`);
-        }
-        const options = {
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all apps...`);
+            }
+            const options = {
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            return yield Cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        });
     }
     setProperties(app) {
         app.displayName = app.properties.displayName;

package/dist/m365/pa/commands/app/app-remove.js

@@ -44,7 +44,7 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
             const removePaApp = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
                     url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`,
-                    resolveWithFullResponse: true,
+                    fullResponse: true,
                     headers: {
                         accept: 'application/json'
                     },

package/dist/m365/pa/commands/pcf/pcf-init.js

@@ -19,7 +19,6 @@ const chalk = require("chalk");
 const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
-const Command_1 = require("../../../../Command");
 const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -77,7 +76,7 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
                 logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
             }
             catch (err) {
-                throw new Command_1.CommandError(err);
+                throw err;
             }
         });
     }

package/dist/m365/pa/commands/solution/solution-init.js

@@ -19,7 +19,6 @@ const chalk = require("chalk");
 const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
-const Command_1 = require("../../../../Command");
 const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -89,7 +88,7 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
                 }
             }
             catch (err) {
-                throw new Command_1.CommandError(err);
+                throw err;
             }
         });
     }

package/dist/m365/pa/commands/solution/solution-reference-add.js

@@ -17,7 +17,6 @@ var _PaSolutionReferenceAddCommand_instances, _PaSolutionReferenceAddCommand_ini
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
-const Command_1 = require("../../../../Command");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const cds_project_mutator_1 = require("../../cds-project-mutator");
 const commands_1 = require("../../commands");
@@ -51,7 +50,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
                 fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
             }
             catch (err) {
-                throw new Command_1.CommandError(err);
+                throw err;
             }
         });
     }

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() {