@pnp/cli-microsoft365 6.3.0-beta.fee5cdb → 6.4.0-beta.006c079

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

@@ -106,6 +106,9 @@ _PlannerRosterMemberAddCommand_instances = new WeakSet(), _PlannerRosterMemberAd
         if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
         return true;
     }));
 };

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

@@ -0,0 +1,98 @@
+"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 _PlannerRosterMemberGetCommand_instances, _PlannerRosterMemberGetCommand_initTelemetry, _PlannerRosterMemberGetCommand_initOptions, _PlannerRosterMemberGetCommand_initOptionSets, _PlannerRosterMemberGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+class PlannerRosterMemberGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_GET;
+    }
+    get description() {
+        return 'Gets a member of the specified Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
+            }
+            try {
+                const userId = yield this.getUserId(args);
+                const requestOptions = {
+                    url: `${this.resource}/beta/planner/rosters/${args.options.rosterId}/members/${userId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUserId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userId) {
+                return args.options.userId;
+            }
+            return aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+        });
+    }
+}
+_PlannerRosterMemberGetCommand_instances = new WeakSet(), _PlannerRosterMemberGetCommand_initTelemetry = function _PlannerRosterMemberGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _PlannerRosterMemberGetCommand_initOptions = function _PlannerRosterMemberGetCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _PlannerRosterMemberGetCommand_initOptionSets = function _PlannerRosterMemberGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberGetCommand_initValidators = function _PlannerRosterMemberGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    }));
+};
+module.exports = new PlannerRosterMemberGetCommand();
+//# sourceMappingURL=roster-member-get.js.map

package/dist/m365/planner/commands.js

@@ -15,6 +15,7 @@ exports.default = {
     ROSTER_ADD: `${prefix} roster add`,
     ROSTER_GET: `${prefix} roster get`,
     ROSTER_MEMBER_ADD: `${prefix} roster member add`,
+    ROSTER_MEMBER_GET: `${prefix} roster member get`,
     ROSTER_MEMBER_LIST: `${prefix} roster member list`,
     ROSTER_MEMBER_REMOVE: `${prefix} roster member remove`,
     ROSTER_REMOVE: `${prefix} roster remove`,

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const odata_1 = require("../../../../utils/odata");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
@@ -36,16 +37,24 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
-            if (args.options.asAdmin) {
-                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving environment: ${args.options.name || 'default'}`);
             }
-            const res = yield odata_1.odata.getAllItems(`${url}?api-version=2020-10-01`);
-            const environmentItem = res.filter((env) => args.options.name ? env.name === args.options.name : env.properties.isDefault === true)[0];
-            if (!environmentItem) {
-                throw `The specified Power Platform environment does not exist`;
+            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform`;
+            if (args.options.asAdmin) {
+                url += '/scopes/admin';
             }
-            logger.log(environmentItem);
+            const envName = args.options.name ? formatting_1.formatting.encodeQueryParameter(args.options.name) : '~Default';
+            url += `/environments/${envName}?api-version=2020-10-01`;
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            logger.log(response);
         });
     }
 }

package/dist/m365/purview/commands/retentionevent/retentionevent-add.js

@@ -0,0 +1,138 @@
+"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 _PurviewRetentionEventAddCommand_instances, _PurviewRetentionEventAddCommand_initOptions, _PurviewRetentionEventAddCommand_initValidators, _PurviewRetentionEventAddCommand_initTelemetry, _PurviewRetentionEventAddCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const odata_1 = require("../../../../utils/odata");
+class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENT_ADD;
+    }
+    get description() {
+        return 'Create a retention event';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventAddCommand_instances, "m", _PurviewRetentionEventAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Creating retention event...`);
+            }
+            const eventQueries = [];
+            if (args.options.assetIds) {
+                eventQueries.push({ queryType: "files", query: args.options.assetIds });
+            }
+            if (args.options.keywords) {
+                eventQueries.push({ queryType: "messages", query: args.options.keywords });
+            }
+            const eventTypeId = yield this.getEventTypeId(logger, args);
+            const data = {
+                'retentionEventType@odata.bind': `https://graph.microsoft.com/beta/security/triggerTypes/retentionEventTypes/${eventTypeId}`,
+                displayName: args.options.displayName,
+                description: args.options.description,
+                eventQueries: eventQueries,
+                eventTriggerDateTime: args.options.triggerDateTime
+            };
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: data
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getEventTypeId(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.eventTypeId) {
+                return args.options.eventTypeId;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving the event type id for event type ${args.options.eventTypeName}`);
+            }
+            const items = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
+            const eventTypes = items.filter((x) => x.displayName === args.options.eventTypeName);
+            if (eventTypes.length === 0) {
+                throw `The specified event type '${args.options.eventTypeName}' does not exist.`;
+            }
+            return eventTypes[0].id;
+        });
+    }
+}
+_PurviewRetentionEventAddCommand_instances = new WeakSet(), _PurviewRetentionEventAddCommand_initOptions = function _PurviewRetentionEventAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-i, --eventTypeId [eventTypeId]'
+    }, {
+        option: '-e, --eventTypeName [eventTypeName]'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--triggerDateTime [triggerDateTime]'
+    }, {
+        option: '-a, --assetIds [assetIds]'
+    }, {
+        option: '-k, --keywords [keywords]'
+    });
+}, _PurviewRetentionEventAddCommand_initValidators = function _PurviewRetentionEventAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.triggerDateTime && !validation_1.validation.isValidISODateTime(args.options.triggerDateTime)) {
+            return 'The triggerDateTime is not a valid ISO date string';
+        }
+        if (!args.options.assetIds && !args.options.keywords) {
+            return 'Specify assetIds and/or keywords, but at least one.';
+        }
+        return true;
+    }));
+}, _PurviewRetentionEventAddCommand_initTelemetry = function _PurviewRetentionEventAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined',
+            triggerDateTime: typeof args.options.triggerDateTime !== 'undefined',
+            eventTypeId: typeof args.options.eventTypeId !== 'undefined',
+            eventTypeName: typeof args.options.eventTypeName !== 'undefined',
+            assetIds: typeof args.options.assetIds !== 'undefined',
+            keywords: typeof args.options.keywords !== 'undefined'
+        });
+    });
+}, _PurviewRetentionEventAddCommand_initOptionSets = function _PurviewRetentionEventAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['eventTypeId', 'eventTypeName'] });
+};
+module.exports = new PurviewRetentionEventAddCommand();
+//# sourceMappingURL=retentionevent-add.js.map

package/dist/m365/purview/commands/retentionlabel/retentionlabel-add.js

@@ -13,13 +13,14 @@ 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 _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators;
+var _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators, _PurviewRetentionLabelAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const odata_1 = require("../../../../utils/odata");
 class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONLABEL_ADD;
@@ -33,6 +34,7 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionLabelAddCommand_instances, "m", _PurviewRetentionLabelAddCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,6 +54,10 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
                 },
                 defaultRecordBehavior: defaultRecordBehavior
             };
+            if (args.options.retentionTrigger === 'dateOfEvent') {
+                const eventTypeId = yield this.getEventTypeId(args, logger);
+                requestBody['retentionEventType@odata.bind'] = `https://graph.microsoft.com/beta/security/triggerTypes/retentionEventTypes/${eventTypeId}`;
+            }
             if (args.options.descriptionForAdmins) {
                 if (this.verbose) {
                     logger.logToStderr(`Using '${args.options.descriptionForAdmins}' as descriptionForAdmins`);
@@ -87,6 +93,22 @@ class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
             }
         });
     }
+    getEventTypeId(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.eventTypeId) {
+                return args.options.eventTypeId;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving the event type id for event type ${args.options.eventTypeName}`);
+            }
+            const eventTypes = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
+            const filteredEventTypes = eventTypes.filter((eventType) => eventType.displayName === args.options.eventTypeName);
+            if (filteredEventTypes.length === 0) {
+                throw `The specified retention event type '${args.options.eventTypeName}' does not exist.`;
+            }
+            return filteredEventTypes[0].id;
+        });
+    }
 }
 _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLabelAddCommand_initTelemetry = function _PurviewRetentionLabelAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -95,7 +117,9 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
             defaultRecordBehavior: typeof args.options.defaultRecordBehavior !== 'undefined',
             descriptionForUsers: typeof args.options.descriptionForUsers !== 'undefined',
             descriptionForAdmins: typeof args.options.descriptionForAdmins !== 'undefined',
-            labelToBeApplied: typeof args.options.labelToBeApplied !== 'undefined'
+            labelToBeApplied: typeof args.options.labelToBeApplied !== 'undefined',
+            eventTypeId: typeof args.options.eventTypeId !== 'undefined',
+            eventTypeName: typeof args.options.eventTypeName !== 'undefined'
         });
     });
 }, _PurviewRetentionLabelAddCommand_initOptions = function _PurviewRetentionLabelAddCommand_initOptions() {
@@ -103,46 +127,56 @@ _PurviewRetentionLabelAddCommand_instances = new WeakSet(), _PurviewRetentionLab
         option: '-n, --displayName <displayName>'
     }, {
         option: '--behaviorDuringRetentionPeriod <behaviorDuringRetentionPeriod>',
-        autocomplete: ['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord']
+        autocomplete: PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods
     }, {
         option: '--actionAfterRetentionPeriod <actionAfterRetentionPeriod>',
-        autocomplete: ['none', 'delete', 'startDispositionReview']
+        autocomplete: PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods
     }, {
         option: '--retentionDuration <retentionDuration>'
     }, {
         option: '-t, --retentionTrigger [retentionTrigger]',
-        autocomplete: ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent']
+        autocomplete: PurviewRetentionLabelAddCommand.retentionTriggers
     }, {
         option: '--defaultRecordBehavior [defaultRecordBehavior]',
-        autocomplete: ['startLocked', 'startUnlocked']
+        autocomplete: PurviewRetentionLabelAddCommand.defaultRecordBehavior
     }, {
         option: '--descriptionForUsers [descriptionForUsers]'
     }, {
         option: '--descriptionForAdmins [descriptionForAdmins]'
     }, {
         option: '--labelToBeApplied [labelToBeApplied]'
+    }, {
+        option: '--eventTypeId [eventTypeId]'
+    }, {
+        option: '--eventTypeName [eventTypeName]'
     });
 }, _PurviewRetentionLabelAddCommand_initValidators = function _PurviewRetentionLabelAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (isNaN(args.options.retentionDuration)) {
             return `Specified retentionDuration ${args.options.retentionDuration} is not a number`;
         }
-        if (['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord'].indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
-            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are doNotRetain|retain|retainAsRecord|retainAsRegulatoryRecord`;
+        if (PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.indexOf(args.options.behaviorDuringRetentionPeriod) === -1) {
+            return `${args.options.behaviorDuringRetentionPeriod} is not a valid behavior of a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods.join(', ')}`;
         }
-        if (['none', 'delete', 'startDispositionReview'].indexOf(args.options.actionAfterRetentionPeriod) === -1) {
-            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are none|delete|startDispositionReview`;
+        if (PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.indexOf(args.options.actionAfterRetentionPeriod) === -1) {
+            return `${args.options.actionAfterRetentionPeriod} is not a valid action to take on a document with the label. Allowed values are ${PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods.join(', ')}`;
         }
         if (args.options.retentionTrigger &&
-            ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent'].indexOf(args.options.retentionTrigger) === -1) {
-            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are dateLabeled|dateCreated|dateModified|dateOfEvent`;
+            PurviewRetentionLabelAddCommand.retentionTriggers.indexOf(args.options.retentionTrigger) === -1) {
+            return `${args.options.retentionTrigger} is not a valid action retention duration calculation. Allowed values are ${PurviewRetentionLabelAddCommand.retentionTriggers.join(', ')}`;
         }
         if (args.options.defaultRecordBehavior &&
-            ['startLocked', 'startUnlocked'].indexOf(args.options.defaultRecordBehavior) === -1) {
-            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are startLocked|startUnlocked`;
+            PurviewRetentionLabelAddCommand.defaultRecordBehavior.indexOf(args.options.defaultRecordBehavior) === -1) {
+            return `${args.options.defaultRecordBehavior} is not a valid state of a record label. Allowed values are ${PurviewRetentionLabelAddCommand.defaultRecordBehavior.join(', ')}`;
         }
         return true;
     }));
+}, _PurviewRetentionLabelAddCommand_initOptionSets = function _PurviewRetentionLabelAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['eventTypeId', 'eventTypeName'], runsWhen(args) { return args.options.retentionTrigger === 'dateOfEvent'; } });
 };
+PurviewRetentionLabelAddCommand.behaviorDuringRetentionPeriods = ['doNotRetain', 'retain', 'retainAsRecord', 'retainAsRegulatoryRecord'];
+PurviewRetentionLabelAddCommand.actionAfterRetentionPeriods = ['none', 'delete', 'startDispositionReview'];
+PurviewRetentionLabelAddCommand.retentionTriggers = ['dateLabeled', 'dateCreated', 'dateModified', 'dateOfEvent'];
+PurviewRetentionLabelAddCommand.defaultRecordBehavior = ['startLocked', 'startUnlocked'];
 module.exports = new PurviewRetentionLabelAddCommand();
 //# sourceMappingURL=retentionlabel-add.js.map

package/dist/m365/purview/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
     AUDITLOG_LIST: `${prefix} auditlog list`,
+    RETENTIONEVENT_ADD: `${prefix} retentionevent add`,
     RETENTIONEVENT_GET: `${prefix} retentionevent get`,
     RETENTIONEVENT_LIST: `${prefix} retentionevent list`,
     RETENTIONEVENT_REMOVE: `${prefix} retentionevent remove`,

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.17.0-beta.1.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1 = require("./rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1 = require("./rules/FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5");
+const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
+const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023_DEVDEP_microsoft_eslint_config_spfx");
+const FN002024_DEVDEP_eslint_1 = require("./rules/FN002024_DEVDEP_eslint");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.17.0-beta.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.17.0-beta.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.17.0-beta.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.17.0-beta.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.17.0-beta.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.17.0-beta.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.17.0-beta.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.17.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.17.0-beta.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.17.0-beta.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.17.0-beta.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.17.0-beta.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.17.0-beta.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.17.0-beta.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.17.0-beta.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.17.0-beta.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.17.0-beta.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.17.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.17.0-beta.1'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.17.0-beta.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.17.0-beta.1'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.17.0-beta.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.17.0-beta.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.17.0-beta.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.17.0-beta.1'),
+    new FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1.FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5('0.4.0'),
+    new FN002024_DEVDEP_eslint_1.FN002024_DEVDEP_eslint('8.7.0')
+];
+//# sourceMappingURL=upgrade-1.17.0-beta.1.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const fsUtil_1 = require("../../../../utils/fsUtil");
 const packageManager_1 = require("../../../../utils/packageManager");
@@ -74,7 +76,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.15.0',
             '1.15.2',
             '1.16.0',
-            '1.16.1'
+            '1.16.1',
+            '1.17.0-beta.1'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -88,15 +91,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
             // uncomment to support upgrading to preview releases
-            // if (!args.options.toVersion &&
-            //   !args.options.preview &&
-            //   prerelease(this.toVersion)) {
-            //   // no version and no preview specified while the current version to
-            //   // upgrade to is a prerelease so let's grab the first non-preview version
-            //   // since we're supporting only one preview version, it's sufficient for
-            //   // us to take second to last version
-            //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-            // }
+            if (!args.options.toVersion &&
+                !args.options.preview &&
+                (0, semver_1.prerelease)(this.toVersion)) {
+                // no version and no preview specified while the current version to
+                // upgrade to is a prerelease so let's grab the first non-preview version
+                // since we're supporting only one preview version, it's sufficient for
+                // us to take second to last version
+                this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+            }
             this.packageManager = args.options.packageManager || 'npm';
             this.shell = args.options.shell || 'bash';
             if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -483,9 +486,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
+            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({