@pnp/cli-microsoft365 11.0.0-beta.1f852eb → 11.0.0-beta.3143306

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

@@ -1,13 +1,16 @@
-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 _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initTelemetry, _PaEnvironmentGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional()
+})
+    .strict();
 class PaEnvironmentGetCommand extends PowerAppsCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,17 +18,20 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
     get description() {
         return 'Gets information about the specified Microsoft Power Apps environment';
     }
-    constructor() {
-        super();
-        _PaEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name || 'default'}...`);
         }
-        const environmentName = args.options.name ? formatting.encodeQueryParameter(args.options.name) : '~default';
+        const environmentName = args.options.default ? '~default' : formatting.encodeQueryParameter(args.options.name);
         const requestOptions = {
             url: `${this.resource}/providers/Microsoft.PowerApps/environments/${environmentName}?api-version=2016-11-01`,
             headers: {
@@ -47,16 +53,5 @@ class PaEnvironmentGetCommand extends PowerAppsCommand {
         }
     }
 }
-_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initTelemetry = function _PaEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    });
-};
 export default new PaEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

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

@@ -18,9 +18,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Get information about the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_GET];
-    }
     constructor() {
         super();
         _PpCopilotGetCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotGetCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotGetCommand_instances, "m", _PpCopilotGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_GET, commands.COPILOT_GET);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving copilot '${args.options.id || args.options.name}'...`);
         }

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

@@ -15,9 +15,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
     get description() {
         return 'Lists Microsoft Power Platform copilots in the specified Power Platform environment';
     }
-    alias() {
-        return [commands.CHATBOT_LIST];
-    }
     defaultProperties() {
         return ['name', 'botid', 'publishedOn', 'createdOn', 'botModifiedOn'];
     }
@@ -28,7 +25,6 @@ class PpCopilotListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotListCommand_instances, "m", _PpCopilotListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_LIST, commands.COPILOT_LIST);
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of copilots for environment '${args.options.environmentName}'.`);
         }

package/dist/m365/pp/commands/copilot/copilot-remove.js

@@ -18,9 +18,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
     get description() {
         return 'Removes the specified copilot';
     }
-    alias() {
-        return [commands.CHATBOT_REMOVE];
-    }
     constructor() {
         super();
         _PpCopilotRemoveCommand_instances.add(this);
@@ -30,7 +27,6 @@ class PpCopilotRemoveCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpCopilotRemoveCommand_instances, "m", _PpCopilotRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, commands.CHATBOT_REMOVE, commands.COPILOT_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing copilot '${args.options.id || args.options.name}'...`);
         }

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

@@ -1,13 +1,17 @@
-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 _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional()),
+    default: z.boolean().optional(),
+    asAdmin: z.boolean().optional()
+})
+    .strict();
 class PpEnvironmentGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.ENVIRONMENT_GET;
@@ -15,11 +19,14 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
     get description() {
         return 'Gets information about the specified Power Platform environment';
     }
-    constructor() {
-        super();
-        _PpEnvironmentGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !!options.name !== !!options.default, {
+            message: `Specify either name or default, but not both.`
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -29,7 +36,7 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
         if (args.options.asAdmin) {
             url += '/scopes/admin';
         }
-        const envName = args.options.name ? formatting.encodeQueryParameter(args.options.name) : '~Default';
+        const envName = args.options.default ? '~Default' : formatting.encodeQueryParameter(args.options.name);
         url += `/environments/${envName}?api-version=2020-10-01`;
         const requestOptions = {
             url: url,
@@ -42,19 +49,5 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand {
         await logger.log(response);
     }
 }
-_PpEnvironmentGetCommand_instances = new WeakSet(), _PpEnvironmentGetCommand_initTelemetry = function _PpEnvironmentGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            asAdmin: !!args.options.asAdmin
-        });
-    });
-}, _PpEnvironmentGetCommand_initOptions = function _PpEnvironmentGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '--asAdmin'
-    });
-};
 export default new PpEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -25,17 +25,13 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.includeMicrosoftPublishers) {
-            await this.warn(logger, `Parameter 'includeMicrosoftPublishers' is deprecated. Please use 'withMicrosoftPublishers' instead`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of publishers...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const shouldIncludeMicrosoftPublishers = args.options.withMicrosoftPublishers || args.options.includeMicrosoftPublishers;
             const requestOptions = {
-                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
+                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.withMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -52,7 +48,6 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
 _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherListCommand_initTelemetry = function _PpSolutionPublisherListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            includeMicrosoftPublishers: typeof args.options.includeMicrosoftPublishers !== 'undefined',
             withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
@@ -60,8 +55,6 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
-    }, {
-        option: '--includeMicrosoftPublishers'
     }, {
         option: '--withMicrosoftPublishers'
     }, {

package/dist/m365/pp/commands.js

@@ -3,13 +3,6 @@ export default {
     AIBUILDERMODEL_GET: `${prefix} aibuildermodel get`,
     AIBUILDERMODEL_LIST: `${prefix} aibuildermodel list`,
     AIBUILDERMODEL_REMOVE: `${prefix} aibuildermodel remove`,
-    CARD_CLONE: `${prefix} card clone`,
-    CARD_GET: `${prefix} card get`,
-    CARD_LIST: `${prefix} card list`,
-    CARD_REMOVE: `${prefix} card remove`,
-    CHATBOT_GET: `${prefix} chatbot get`,
-    CHATBOT_LIST: `${prefix} chatbot list`,
-    CHATBOT_REMOVE: `${prefix} chatbot remove`,
     COPILOT_GET: `${prefix} copilot get`,
     COPILOT_LIST: `${prefix} copilot list`,
     COPILOT_REMOVE: `${prefix} copilot remove`,

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -24,15 +24,11 @@ class PurviewThreatAssessmentGetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            if (args.options.includeResults) {
-                await this.warn(logger, `Parameter 'includeResults' is deprecated. Please use 'withResults' instead`);
-            }
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
             }
-            const shouldIncludeResults = args.options.includeResults || args.options.withResults;
             const requestOptions = {
-                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${shouldIncludeResults ? '?$expand=results' : ''}`,
+                url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.withResults ? '?$expand=results' : ''}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -56,8 +52,6 @@ _PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAsse
 }, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
-    }, {
-        option: '--includeResults'
     }, {
         option: '--withResults'
     });

package/dist/m365/spe/commands/container/container-add.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 const options = globalOptionsZod
@@ -77,8 +76,7 @@ class SpeContainerAddCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerAddCommand();

package/dist/m365/spe/commands/container/container-list.js

@@ -10,7 +10,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 class SpeContainerListCommand extends GraphCommand {
     get name() {
         return commands.CONTAINER_LIST;
@@ -47,8 +46,7 @@ class SpeContainerListCommand extends GraphCommand {
         if (options.containerTypeId) {
             return options.containerTypeId;
         }
-        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        return spe.getContainerTypeIdByName(spoAdminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 _SpeContainerListCommand_instances = new WeakSet(), _SpeContainerListCommand_initTelemetry = function _SpeContainerListCommand_initTelemetry() {

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -54,8 +53,7 @@ class SpeContainerRecycleBinItemListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemListCommand();

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -2,7 +2,6 @@ import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import { spe } from '../../../../utils/spe.js';
 import { odata } from '../../../../utils/odata.js';
@@ -88,8 +87,7 @@ class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRecycleBinItemRestoreCommand();

package/dist/m365/spe/commands/container/container-remove.js

@@ -4,7 +4,6 @@ import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import { spe } from '../../../../utils/spe.js';
-import { spo } from '../../../../utils/spo.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { cli } from '../../../../cli/cli.js';
@@ -91,8 +90,7 @@ class SpeContainerRemoveCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
         }
-        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+        return spe.getContainerTypeIdByName(options.containerTypeName);
     }
 }
 export default new SpeContainerRemoveCommand();

package/dist/m365/spe/commands/containertype/containertype-add.js

@@ -1,115 +1,92 @@
-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 _SpeContainerTypeAddCommand_instances, _SpeContainerTypeAddCommand_initTelemetry, _SpeContainerTypeAddCommand_initOptions, _SpeContainerTypeAddCommand_initValidators;
-import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
-import SpoCommand from '../../../base/SpoCommand.js';
+import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
 import commands from '../../commands.js';
-class SpeContainerTypeAddCommand extends SpoCommand {
+import Auth from '../../../../Auth.js';
+const consumingTenantOverridablesOptions = ['urlTemplate', 'isDiscoverabilityEnabled', 'isSearchEnabled', 'isItemVersioningEnabled', 'itemMajorVersionLimit', 'maxStoragePerContainerInBytes'];
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    appId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    billingType: z.enum(['standard', 'trial', 'directToCustomer']).default('standard'),
+    consumingTenantOverridables: z.string()
+        .refine(values => values.split(',').every(v => consumingTenantOverridablesOptions.includes(v.trim())), values => ({
+        message: `'${values}' is not a valid value. Valid options are: ${consumingTenantOverridablesOptions.join(', ')}.`
+    })).optional(),
+    isDiscoverabilityEnabled: z.boolean().optional(),
+    isItemVersioningEnabled: z.boolean().optional(),
+    isSearchEnabled: z.boolean().optional(),
+    isSharingRestricted: z.boolean().optional(),
+    itemMajorVersionLimit: z.number()
+        .refine(n => validation.isValidPositiveInteger(n), n => ({
+        message: `'${n}' is not a valid positive integer.`
+    })).optional(),
+    maxStoragePerContainerInBytes: z.number()
+        .refine(n => validation.isValidPositiveInteger(n), n => ({
+        message: `'${n}' is not a valid positive integer.`
+    })).optional(),
+    sharingCapability: z.enum(['disabled', 'externalUserSharingOnly', 'externalUserAndGuestSharing', 'existingExternalUserSharingOnly']).optional(),
+    urlTemplate: z.string().optional()
+})
+    .strict();
+class SpeContainerTypeAddCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CONTAINERTYPE_ADD;
     }
     get description() {
-        return 'Creates a new Container Type for your app';
+        return 'Creates a new container type';
     }
-    constructor() {
-        super();
-        _SpeContainerTypeAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpeContainerTypeAddCommand_instances, "m", _SpeContainerTypeAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.itemMajorVersionLimit || options.isItemVersioningEnabled !== false, {
+            message: `Cannot set itemMajorVersionLimit when isItemVersioningEnabled is false.`
+        });
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Creating a new Container Type for your app with name ${args.options.name}`);
+                await logger.logToStderr(`Creating a new Container Type for your app with name '${args.options.name}'.`);
             }
-            const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestBody = this.getRequestBody(args.options);
-            const formDigestInfo = await spo.ensureFormDigest(adminUrl, logger, undefined, this.debug);
+            const appId = args.options.appId ?? Auth.connection.appId;
             const requestOptions = {
-                url: `${adminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${this.resource}/beta/storage/fileStorage/containerTypes`,
                 headers: {
-                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                    accept: 'application/json;odata.metadata=none'
                 },
-                data: requestBody
+                responseType: 'json',
+                data: {
+                    name: args.options.name,
+                    owningAppId: appId,
+                    billingClassification: args.options.billingType,
+                    settings: {
+                        consumingTenantOverridables: args.options.consumingTenantOverridables?.split(',').map(s => s.trim()).join(','),
+                        isDiscoverabilityEnabled: args.options.isDiscoverabilityEnabled,
+                        isItemVersioningEnabled: args.options.isItemVersioningEnabled,
+                        isSearchEnabled: args.options.isSearchEnabled,
+                        isSharingRestricted: args.options.isSharingRestricted,
+                        itemMajorVersionLimit: args.options.itemMajorVersionLimit,
+                        maxStoragePerContainerInBytes: args.options.maxStoragePerContainerInBytes,
+                        sharingCapability: args.options.sharingCapability,
+                        urlTemplate: args.options.urlTemplate
+                    }
+                }
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            const result = json.pop();
-            delete result._ObjectType_;
-            result.SPContainerTypeBillingClassification = args.options.trial ? 'Trial' : 'Standard';
-            result.AzureSubscriptionId = this.replaceString(result.AzureSubscriptionId);
-            result.OwningAppId = this.replaceString(result.OwningAppId);
-            result.OwningTenantId = this.replaceString(result.OwningTenantId);
-            result.ContainerTypeId = this.replaceString(result.ContainerTypeId);
-            await logger.log(result);
+            const response = await request.post(requestOptions);
+            await logger.log(response);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    replaceString(s) {
-        return s.replace('/Guid(', '').replace(')/', '');
-    }
-    getRequestBody(options) {
-        if (options.trial) {
-            return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="NewSPOContainerType" Id="5" ObjectPathId="3"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="Null" /><Property Name="ResourceGroup" Type="Null" /><Property Name="SPContainerTypeBillingClassification" Type="Enum">1</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
-        }
-        return `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="NewSPOContainerType" Id="4" ObjectPathId="1"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{${options.azureSubscriptionId}}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="String">${options.region}</Property><Property Name="ResourceGroup" Type="String">${options.resourceGroup}</Property><Property Name="SPContainerTypeBillingClassification" Type="Enum">0</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
-    }
 }
-_SpeContainerTypeAddCommand_instances = new WeakSet(), _SpeContainerTypeAddCommand_initTelemetry = function _SpeContainerTypeAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            trial: !!args.options.trial,
-            azureSubscriptionId: typeof args.options.azureSubscriptionId !== 'undefined',
-            resourceGroup: typeof args.options.resourceGroup !== 'undefined',
-            region: typeof args.options.region !== 'undefined'
-        });
-    });
-}, _SpeContainerTypeAddCommand_initOptions = function _SpeContainerTypeAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '--applicationId <applicationId>'
-    }, {
-        option: '--trial'
-    }, {
-        option: '--azureSubscriptionId [azureSubscriptionId]'
-    }, {
-        option: '--resourceGroup [resourceGroup]'
-    }, {
-        option: '--region [region]'
-    });
-}, _SpeContainerTypeAddCommand_initValidators = function _SpeContainerTypeAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.applicationId)) {
-            return `${args.options.applicationId} is not a valid GUID for option applicationId.`;
-        }
-        if (args.options.trial === undefined && !args.options.azureSubscriptionId) {
-            return 'You must specify the azureSubscriptionId when creating a non-trial environment.';
-        }
-        if (args.options.trial === undefined && !args.options.resourceGroup) {
-            return 'You must specify the resourceGroup when creating a non-trial environment.';
-        }
-        if (args.options.trial === undefined && !args.options.region) {
-            return 'You must specify the region when creating a non-trial environment.';
-        }
-        if (args.options.azureSubscriptionId && !validation.isValidGuid(args.options.azureSubscriptionId)) {
-            return `${args.options.azureSubscriptionId} is not a valid GUID for option azureSubscriptionId.`;
-        }
-        return true;
-    });
-};
 export default new SpeContainerTypeAddCommand();
 //# sourceMappingURL=containertype-add.js.map