From dc239decc8dee24d34e2e9ccf6234f74afd0b76d Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 29 Jan 2021 03:38:34 +0000 Subject: [PATCH] CodeGen from PR 12686 in Azure/azure-rest-api-specs Merge 492053ced3b37b2536b4ede6c3bbb52e02636923 into 600fe4a991170239086afb698f5f9d82f286103c --- .../src/models/blobContainersMappers.ts | 7 +- .../models/blobInventoryPoliciesMappers.ts | 7 +- .../src/models/blobServicesMappers.ts | 7 +- .../src/models/deletedAccountsMappers.ts | 93 ----- .../src/models/encryptionScopesMappers.ts | 7 +- .../src/models/fileServicesMappers.ts | 7 +- .../src/models/fileSharesMappers.ts | 7 +- sdk/storage/arm-storage/src/models/index.ts | 355 +++++------------- .../src/models/managementPoliciesMappers.ts | 7 +- sdk/storage/arm-storage/src/models/mappers.ts | 319 +++++----------- ...ectReplicationPoliciesOperationsMappers.ts | 7 +- .../arm-storage/src/models/parameters.ts | 44 +-- .../privateEndpointConnectionsMappers.ts | 7 +- .../src/models/privateLinkResourcesMappers.ts | 7 +- .../arm-storage/src/models/queueMappers.ts | 7 +- .../src/models/queueServicesMappers.ts | 7 +- .../src/models/storageAccountsMappers.ts | 7 +- .../src/models/tableOperationsMappers.ts | 7 +- .../src/models/tableServicesMappers.ts | 7 +- .../src/operations/deletedAccounts.ts | 185 --------- .../src/operations/fileServices.ts | 26 +- .../arm-storage/src/operations/fileShares.ts | 17 +- .../arm-storage/src/operations/index.ts | 1 - .../src/operations/storageAccounts.ts | 53 --- .../src/storageManagementClient.ts | 2 - .../src/storageManagementClientContext.ts | 8 +- 26 files changed, 224 insertions(+), 984 deletions(-) delete mode 100644 sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts delete mode 100644 sdk/storage/arm-storage/src/operations/deletedAccounts.ts diff --git a/sdk/storage/arm-storage/src/models/blobContainersMappers.ts b/sdk/storage/arm-storage/src/models/blobContainersMappers.ts index 08b711a15db1..cdbc72e3bfa8 100644 --- a/sdk/storage/arm-storage/src/models/blobContainersMappers.ts +++ b/sdk/storage/arm-storage/src/models/blobContainersMappers.ts @@ -33,7 +33,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -41,7 +40,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -67,7 +65,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -76,15 +74,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts index ed2d658e0ac9..1a6773052ec0 100644 --- a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts +++ b/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts @@ -27,7 +27,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -37,7 +36,6 @@ export { Endpoints, ErrorResponse, ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -60,7 +58,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -69,15 +67,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/blobServicesMappers.ts b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts index be07a91403b0..9df9a5693278 100644 --- a/sdk/storage/arm-storage/src/models/blobServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts @@ -29,7 +29,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -37,7 +36,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts b/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts deleted file mode 100644 index c553a4339e8a..000000000000 --- a/sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. - * Licensed under the MIT License. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is regenerated. - */ - -export { - ActiveDirectoryProperties, - AzureEntityResource, - AzureFilesIdentityBasedAuthentication, - BaseResource, - BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, - BlobRestoreParameters, - BlobRestoreRange, - BlobRestoreStatus, - BlobServiceProperties, - ChangeFeed, - CorsRule, - CorsRules, - CustomDomain, - DateAfterCreation, - DateAfterModification, - DeletedAccount, - DeletedAccountListResult, - DeleteRetentionPolicy, - Encryption, - EncryptionScope, - EncryptionScopeKeyVaultProperties, - EncryptionService, - EncryptionServices, - Endpoints, - ErrorResponse, - ErrorResponseBody, - ExtendedLocation, - FileServiceProperties, - FileShare, - FileShareItem, - GeoReplicationStats, - Identity, - ImmutabilityPolicy, - ImmutabilityPolicyProperties, - IPRule, - KeyVaultProperties, - LastAccessTimeTrackingPolicy, - LegalHoldProperties, - ListContainerItem, - ListQueue, - ManagementPolicy, - ManagementPolicyAction, - ManagementPolicyBaseBlob, - ManagementPolicyDefinition, - ManagementPolicyFilter, - ManagementPolicyRule, - ManagementPolicySchema, - ManagementPolicySnapShot, - Multichannel, - NetworkRuleSet, - ObjectReplicationPolicy, - ObjectReplicationPolicyFilter, - ObjectReplicationPolicyRule, - PrivateEndpoint, - PrivateEndpointConnection, - PrivateLinkResource, - PrivateLinkServiceConnectionState, - ProtocolSettings, - ProxyResource, - QueueServiceProperties, - Resource, - ResourceAccessRule, - RestorePolicyProperties, - RoutingPreference, - Sku, - SmbSetting, - StorageAccount, - StorageAccountInternetEndpoints, - StorageAccountMicrosoftEndpoints, - StorageQueue, - SystemData, - Table, - TableServiceProperties, - TagFilter, - TagProperty, - TrackedResource, - UpdateHistoryProperty, - VirtualNetworkRule -} from "../models/mappers"; diff --git a/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts b/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts index 60573dfa4870..358e4101904b 100644 --- a/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts +++ b/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -39,7 +38,6 @@ export { Endpoints, ErrorResponse, ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -61,7 +59,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -70,15 +68,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts index c183aa65deba..db97b119c28e 100644 --- a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceItems, FileServiceProperties, FileShare, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts index 3e68926eb854..b1ba167c3645 100644 --- a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts +++ b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeletedShare, DeleteRetentionPolicy, Encryption, @@ -37,7 +36,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -60,7 +58,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -69,15 +67,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/index.ts b/sdk/storage/arm-storage/src/models/index.ts index 7a5201d4d413..2c96f30c98e9 100644 --- a/sdk/storage/arm-storage/src/models/index.ts +++ b/sdk/storage/arm-storage/src/models/index.ts @@ -353,20 +353,6 @@ export interface Encryption { keyVaultProperties?: KeyVaultProperties; } -/** - * Resource Access Rule. - */ -export interface ResourceAccessRule { - /** - * Tenant Id - */ - tenantId?: string; - /** - * Resource Id - */ - resourceId?: string; -} - /** * Virtual Network rule. */ @@ -412,7 +398,6 @@ export interface NetworkRuleSet { * 'AzureServices'. Default value: 'AzureServices'. */ bypass?: Bypass; - resourceAccessRules?: ResourceAccessRule[]; /** * Sets the virtual network rules */ @@ -508,20 +493,6 @@ export interface Identity { readonly tenantId?: string; } -/** - * The complex type of the extended location. - */ -export interface ExtendedLocation { - /** - * The name of the extended location. - */ - name?: string; - /** - * The type of the extended location. Possible values include: 'EdgeZone' - */ - type?: ExtendedLocationTypes; -} - /** * The SKU of the storage account. */ @@ -557,11 +528,6 @@ export interface StorageAccountCreateParameters { * on update, the request will succeed. */ location: string; - /** - * Optional. Set the extended location of the resource. If not set, the storage account will be - * created in Azure main region. Otherwise it will be created in the specified extended location - */ - extendedLocation?: ExtendedLocation; /** * Gets or sets a list of key value pairs that describe the resource. These tags can be used for * viewing and grouping this resource (across resource groups). A maximum of 15 tags can be @@ -625,6 +591,13 @@ export interface StorageAccountCreateParameters { * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2' */ minimumTlsVersion?: MinimumTlsVersion; + /** + * Indicates whether the storage account permits requests to be authorized with the account + * access key via Shared Key. If false, then all requests, including shared access signatures, + * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is + * equivalent to true. + */ + allowSharedKeyAccess?: boolean; } /** @@ -896,45 +869,6 @@ export interface PrivateEndpointConnection extends Resource { provisioningState?: PrivateEndpointConnectionProvisioningState; } -/** - * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags - * and a location - * @summary Proxy Resource - */ -export interface ProxyResource extends Resource { -} - -/** - * Deleted storage account - */ -export interface DeletedAccount extends ProxyResource { - /** - * Full resource id of the original storage account. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly storageAccountResourceId?: string; - /** - * Location of the deleted account. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly location?: string; - /** - * Can be used to attempt recovering this deleted account via PutStorageAccount API. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly restoreReference?: string; - /** - * Creation time of the deleted account. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly creationTime?: string; - /** - * Deletion time of the deleted account. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly deletionTime?: string; -} - /** * The resource model definition for an Azure Resource Manager tracked top level resource which has * 'tags' and a 'location' @@ -970,10 +904,6 @@ export interface StorageAccount extends TrackedResource { * The identity of the resource. */ identity?: Identity; - /** - * The extendedLocation of the resource. - */ - extendedLocation?: ExtendedLocation; /** * Gets the status of the storage account at the time the operation was called. Possible values * include: 'Creating', 'ResolvingDNS', 'Succeeded' @@ -1101,6 +1031,13 @@ export interface StorageAccount extends TrackedResource { * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2' */ minimumTlsVersion?: MinimumTlsVersion; + /** + * Indicates whether the storage account permits requests to be authorized with the account + * access key via Shared Key. If false, then all requests, including shared access signatures, + * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is + * equivalent to true. + */ + allowSharedKeyAccess?: boolean; } /** @@ -1213,6 +1150,13 @@ export interface StorageAccountUpdateParameters { * is TLS 1.0 for this property. Possible values include: 'TLS1_0', 'TLS1_1', 'TLS1_2' */ minimumTlsVersion?: MinimumTlsVersion; + /** + * Indicates whether the storage account permits requests to be authorized with the account + * access key via Shared Key. If false, then all requests, including shared access signatures, + * must be authorized with Azure Active Directory (Azure AD). The default value is null, which is + * equivalent to true. + */ + allowSharedKeyAccess?: boolean; /** * Optional. Indicates the type of storage account. Currently only StorageV2 value supported by * server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', @@ -1415,7 +1359,8 @@ export interface ListServiceSasResponse { } /** - * Object to define the number of days after last modification. + * Object to define the number of days after object last modification Or last access. Properties + * daysAfterModificationGreaterThan and daysAfterLastAccessTimeGreaterThan are mutually exclusive. */ export interface DateAfterModification { /** @@ -1466,12 +1411,41 @@ export interface DateAfterCreation { * Management policy action for snapshot. */ export interface ManagementPolicySnapShot { + /** + * The function to tier blob snapshot to cool storage. Support blob snapshot currently at Hot + * tier + */ + tierToCool?: DateAfterCreation; + /** + * The function to tier blob snapshot to archive storage. Support blob snapshot currently at Hot + * or Cool tier + */ + tierToArchive?: DateAfterCreation; /** * The function to delete the blob snapshot */ deleteProperty?: DateAfterCreation; } +/** + * Management policy action for blob version. + */ +export interface ManagementPolicyVersion { + /** + * The function to tier blob version to cool storage. Support blob version currently at Hot tier + */ + tierToCool?: DateAfterCreation; + /** + * The function to tier blob version to archive storage. Support blob version currently at Hot or + * Cool tier + */ + tierToArchive?: DateAfterCreation; + /** + * The function to delete the blob version + */ + deleteProperty?: DateAfterCreation; +} + /** * Actions are applied to the filtered blobs when the execution condition is met. */ @@ -1484,6 +1458,10 @@ export interface ManagementPolicyAction { * The management policy action for snapshot */ snapshot?: ManagementPolicySnapShot; + /** + * The management policy action for version + */ + version?: ManagementPolicyVersion; } /** @@ -1516,7 +1494,8 @@ export interface ManagementPolicyFilter { */ prefixMatch?: string[]; /** - * An array of predefined enum values. Only blockBlob is supported. + * An array of predefined enum values. Currently blockBlob supports all tiering and delete + * actions. Only delete actions are supported for appendBlob. */ blobTypes: string[]; /** @@ -1844,6 +1823,14 @@ export interface ErrorResponse { error?: ErrorResponseBody; } +/** + * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags + * and a location + * @summary Proxy Resource + */ +export interface ProxyResource extends Resource { +} + /** * The resource model definition for an Azure Resource Manager resource with an etag. * @summary Entity Resource @@ -2290,6 +2277,12 @@ export interface ChangeFeed { * Indicates whether change feed event logging is enabled for the Blob service. */ enabled?: boolean; + /** + * Indicates the duration of changeFeed retention in days. Minimum value is 1 day and maximum + * value is 146000 days (400 years). A null value indicates an infinite retention of the change + * feed. + */ + retentionInDays?: number; } /** @@ -2437,36 +2430,6 @@ export interface LeaseContainerResponse { leaseTimeSeconds?: string; } -/** - * Multichannel setting. Applies to Premium FileStorage only. - */ -export interface Multichannel { - /** - * Indicates whether multichannel is enabled - */ - enabled?: boolean; -} - -/** - * Setting for SMB protocol - */ -export interface SmbSetting { - /** - * Multichannel setting. Applies to Premium FileStorage only. - */ - multichannel?: Multichannel; -} - -/** - * Protocol settings for file service - */ -export interface ProtocolSettings { - /** - * Setting for SMB protocol - */ - smb?: SmbSetting; -} - /** * The properties of File services in storage account. */ @@ -2481,10 +2444,6 @@ export interface FileServiceProperties extends Resource { * The file service properties for share soft delete. */ shareDeleteRetentionPolicy?: DeleteRetentionPolicy; - /** - * Protocol settings for file service - */ - protocolSettings?: ProtocolSettings; /** * Sku name and tier. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -2573,12 +2532,6 @@ export interface FileShare extends AzureEntityResource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly shareUsageBytes?: number; - /** - * Creation time of share snapshot returned in the response of list shares with expand param - * "snapshots". - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly snapshotTime?: Date; } /** @@ -2665,12 +2618,6 @@ export interface FileShareItem extends AzureEntityResource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly shareUsageBytes?: number; - /** - * Creation time of share snapshot returned in the response of list shares with expand param - * "snapshots". - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly snapshotTime?: Date; } /** @@ -2886,6 +2833,22 @@ export interface BlobContainersListNextOptionalParams extends msRest.RequestOpti include?: ListContainersInclude; } +/** + * Optional Parameters. + */ +export interface FileServicesSetServicePropertiesOptionalParams extends msRest.RequestOptionsBase { + /** + * Specifies CORS rules for the File service. You can include up to five CorsRule elements in the + * request. If no CorsRule elements are included in the request body, all CORS rules will be + * deleted, and CORS will be disabled for the File service. + */ + cors?: CorsRules; + /** + * The file service properties for share soft delete. + */ + shareDeleteRetentionPolicy?: DeleteRetentionPolicy; +} + /** * Optional Parameters. */ @@ -2900,21 +2863,11 @@ export interface FileSharesListOptionalParams extends msRest.RequestOptionsBase filter?: string; /** * Optional, used to expand the properties within share's properties. Possible values include: - * 'deleted', 'snapshots' + * 'deleted' */ expand?: ListSharesExpand; } -/** - * Optional Parameters. - */ -export interface FileSharesCreateOptionalParams extends msRest.RequestOptionsBase { - /** - * Optional, used to create a snapshot. Possible values include: 'snapshots' - */ - expand?: PutSharesExpand; -} - /** * Optional Parameters. */ @@ -2924,20 +2877,6 @@ export interface FileSharesGetOptionalParams extends msRest.RequestOptionsBase { * 'stats' */ expand?: GetShareExpand; - /** - * Optional, used to retrieve properties of a snapshot. - */ - xMsSnapshot?: string; -} - -/** - * Optional Parameters. - */ -export interface FileSharesDeleteMethodOptionalParams extends msRest.RequestOptionsBase { - /** - * Optional, used to delete a snapshot. - */ - xMsSnapshot?: string; } /** @@ -2954,7 +2893,7 @@ export interface FileSharesListNextOptionalParams extends msRest.RequestOptionsB filter?: string; /** * Optional, used to expand the properties within share's properties. Possible values include: - * 'deleted', 'snapshots' + * 'deleted' */ expand?: ListSharesExpand; } @@ -3131,20 +3070,6 @@ export interface StorageAccountListResult extends Array { readonly nextLink?: string; } -/** - * @interface - * The response from the List Deleted Accounts operation. - * @extends Array - */ -export interface DeletedAccountListResult extends Array { - /** - * Request URL that can be used to query next page of deleted accounts. Returned when total - * number of requested deleted accounts exceed maximum page size. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly nextLink?: string; -} - /** * @interface * The response from the List Usages operation. @@ -3387,14 +3312,6 @@ export type RoutingChoice = 'MicrosoftRouting' | 'InternetRouting'; */ export type MinimumTlsVersion = 'TLS1_0' | 'TLS1_1' | 'TLS1_2'; -/** - * Defines values for ExtendedLocationTypes. - * Possible values include: 'EdgeZone' - * @readonly - * @enum {string} - */ -export type ExtendedLocationTypes = 'EdgeZone'; - /** * Defines values for GeoReplicationStatus. * Possible values include: 'Live', 'Bootstrap', 'Unavailable' @@ -3630,19 +3547,11 @@ export type ListContainersInclude = 'deleted'; /** * Defines values for ListSharesExpand. - * Possible values include: 'deleted', 'snapshots' - * @readonly - * @enum {string} - */ -export type ListSharesExpand = 'deleted' | 'snapshots'; - -/** - * Defines values for PutSharesExpand. - * Possible values include: 'snapshots' + * Possible values include: 'deleted' * @readonly * @enum {string} */ -export type PutSharesExpand = 'snapshots'; +export type ListSharesExpand = 'deleted'; /** * Defines values for GetShareExpand. @@ -3980,86 +3889,6 @@ export type StorageAccountsListNextResponse = StorageAccountListResult & { }; }; -/** - * Contains response data for the listByResourceGroupNext operation. - */ -export type StorageAccountsListByResourceGroupNextResponse = StorageAccountListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: StorageAccountListResult; - }; -}; - -/** - * Contains response data for the list operation. - */ -export type DeletedAccountsListResponse = DeletedAccountListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: DeletedAccountListResult; - }; -}; - -/** - * Contains response data for the get operation. - */ -export type DeletedAccountsGetResponse = DeletedAccount & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: DeletedAccount; - }; -}; - -/** - * Contains response data for the listNext operation. - */ -export type DeletedAccountsListNextResponse = DeletedAccountListResult & { - /** - * The underlying HTTP response. - */ - _response: msRest.HttpResponse & { - /** - * The response body as text (string format) - */ - bodyAsText: string; - - /** - * The response body as parsed JSON or XML - */ - parsedBody: DeletedAccountListResult; - }; -}; - /** * Contains response data for the listByLocation operation. */ diff --git a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts index 7f9a841cfa77..783c302440d2 100644 --- a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts +++ b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -58,7 +56,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -67,15 +65,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/mappers.ts b/sdk/storage/arm-storage/src/models/mappers.ts index adbc5ce36d2c..18930107bcc6 100644 --- a/sdk/storage/arm-storage/src/models/mappers.ts +++ b/sdk/storage/arm-storage/src/models/mappers.ts @@ -564,28 +564,6 @@ export const Encryption: msRest.CompositeMapper = { } }; -export const ResourceAccessRule: msRest.CompositeMapper = { - serializedName: "ResourceAccessRule", - type: { - name: "Composite", - className: "ResourceAccessRule", - modelProperties: { - tenantId: { - serializedName: "tenantId", - type: { - name: "String" - } - }, - resourceId: { - serializedName: "resourceId", - type: { - name: "String" - } - } - } - } -}; - export const VirtualNetworkRule: msRest.CompositeMapper = { serializedName: "VirtualNetworkRule", type: { @@ -666,18 +644,6 @@ export const NetworkRuleSet: msRest.CompositeMapper = { name: "String" } }, - resourceAccessRules: { - serializedName: "resourceAccessRules", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "ResourceAccessRule" - } - } - } - }, virtualNetworkRules: { serializedName: "virtualNetworkRules", type: { @@ -855,28 +821,6 @@ export const Identity: msRest.CompositeMapper = { } }; -export const ExtendedLocation: msRest.CompositeMapper = { - serializedName: "ExtendedLocation", - type: { - name: "Composite", - className: "ExtendedLocation", - modelProperties: { - name: { - serializedName: "name", - type: { - name: "String" - } - }, - type: { - serializedName: "type", - type: { - name: "String" - } - } - } - } -}; - export const Sku: msRest.CompositeMapper = { serializedName: "Sku", type: { @@ -932,13 +876,6 @@ export const StorageAccountCreateParameters: msRest.CompositeMapper = { name: "String" } }, - extendedLocation: { - serializedName: "extendedLocation", - type: { - name: "Composite", - className: "ExtendedLocation" - } - }, tags: { serializedName: "tags", type: { @@ -1031,6 +968,12 @@ export const StorageAccountCreateParameters: msRest.CompositeMapper = { type: { name: "String" } + }, + allowSharedKeyAccess: { + serializedName: "properties.allowSharedKeyAccess", + type: { + name: "Boolean" + } } } } @@ -1424,63 +1367,6 @@ export const PrivateEndpointConnection: msRest.CompositeMapper = { } }; -export const ProxyResource: msRest.CompositeMapper = { - serializedName: "ProxyResource", - type: { - name: "Composite", - className: "ProxyResource", - modelProperties: { - ...Resource.type.modelProperties - } - } -}; - -export const DeletedAccount: msRest.CompositeMapper = { - serializedName: "DeletedAccount", - type: { - name: "Composite", - className: "DeletedAccount", - modelProperties: { - ...ProxyResource.type.modelProperties, - storageAccountResourceId: { - readOnly: true, - serializedName: "properties.storageAccountResourceId", - type: { - name: "String" - } - }, - location: { - readOnly: true, - serializedName: "properties.location", - type: { - name: "String" - } - }, - restoreReference: { - readOnly: true, - serializedName: "properties.restoreReference", - type: { - name: "String" - } - }, - creationTime: { - readOnly: true, - serializedName: "properties.creationTime", - type: { - name: "String" - } - }, - deletionTime: { - readOnly: true, - serializedName: "properties.deletionTime", - type: { - name: "String" - } - } - } - } -}; - export const TrackedResource: msRest.CompositeMapper = { serializedName: "TrackedResource", type: { @@ -1539,13 +1425,6 @@ export const StorageAccount: msRest.CompositeMapper = { className: "Identity" } }, - extendedLocation: { - serializedName: "extendedLocation", - type: { - name: "Composite", - className: "ExtendedLocation" - } - }, provisioningState: { readOnly: true, serializedName: "properties.provisioningState", @@ -1738,6 +1617,12 @@ export const StorageAccount: msRest.CompositeMapper = { type: { name: "String" } + }, + allowSharedKeyAccess: { + serializedName: "properties.allowSharedKeyAccess", + type: { + name: "Boolean" + } } } } @@ -1918,6 +1803,12 @@ export const StorageAccountUpdateParameters: msRest.CompositeMapper = { name: "String" } }, + allowSharedKeyAccess: { + serializedName: "properties.allowSharedKeyAccess", + type: { + name: "Boolean" + } + }, kind: { serializedName: "kind", type: { @@ -2319,6 +2210,51 @@ export const ManagementPolicySnapShot: msRest.CompositeMapper = { name: "Composite", className: "ManagementPolicySnapShot", modelProperties: { + tierToCool: { + serializedName: "tierToCool", + type: { + name: "Composite", + className: "DateAfterCreation" + } + }, + tierToArchive: { + serializedName: "tierToArchive", + type: { + name: "Composite", + className: "DateAfterCreation" + } + }, + deleteProperty: { + serializedName: "delete", + type: { + name: "Composite", + className: "DateAfterCreation" + } + } + } + } +}; + +export const ManagementPolicyVersion: msRest.CompositeMapper = { + serializedName: "ManagementPolicyVersion", + type: { + name: "Composite", + className: "ManagementPolicyVersion", + modelProperties: { + tierToCool: { + serializedName: "tierToCool", + type: { + name: "Composite", + className: "DateAfterCreation" + } + }, + tierToArchive: { + serializedName: "tierToArchive", + type: { + name: "Composite", + className: "DateAfterCreation" + } + }, deleteProperty: { serializedName: "delete", type: { @@ -2349,6 +2285,13 @@ export const ManagementPolicyAction: msRest.CompositeMapper = { name: "Composite", className: "ManagementPolicySnapShot" } + }, + version: { + serializedName: "version", + type: { + name: "Composite", + className: "ManagementPolicyVersion" + } } } } @@ -2987,6 +2930,17 @@ export const ErrorResponse: msRest.CompositeMapper = { } }; +export const ProxyResource: msRest.CompositeMapper = { + serializedName: "ProxyResource", + type: { + name: "Composite", + className: "ProxyResource", + modelProperties: { + ...Resource.type.modelProperties + } + } +}; + export const AzureEntityResource: msRest.CompositeMapper = { serializedName: "AzureEntityResource", type: { @@ -3688,6 +3642,16 @@ export const ChangeFeed: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + retentionInDays: { + serializedName: "retentionInDays", + constraints: { + InclusiveMaximum: 146000, + InclusiveMinimum: 1 + }, + type: { + name: "Number" + } } } } @@ -3916,56 +3880,6 @@ export const LeaseContainerResponse: msRest.CompositeMapper = { } }; -export const Multichannel: msRest.CompositeMapper = { - serializedName: "Multichannel", - type: { - name: "Composite", - className: "Multichannel", - modelProperties: { - enabled: { - serializedName: "enabled", - type: { - name: "Boolean" - } - } - } - } -}; - -export const SmbSetting: msRest.CompositeMapper = { - serializedName: "SmbSetting", - type: { - name: "Composite", - className: "SmbSetting", - modelProperties: { - multichannel: { - serializedName: "multichannel", - type: { - name: "Composite", - className: "Multichannel" - } - } - } - } -}; - -export const ProtocolSettings: msRest.CompositeMapper = { - serializedName: "ProtocolSettings", - type: { - name: "Composite", - className: "ProtocolSettings", - modelProperties: { - smb: { - serializedName: "smb", - type: { - name: "Composite", - className: "SmbSetting" - } - } - } - } -}; - export const FileServiceProperties: msRest.CompositeMapper = { serializedName: "FileServiceProperties", type: { @@ -3987,13 +3901,6 @@ export const FileServiceProperties: msRest.CompositeMapper = { className: "DeleteRetentionPolicy" } }, - protocolSettings: { - serializedName: "properties.protocolSettings", - type: { - name: "Composite", - className: "ProtocolSettings" - } - }, sku: { readOnly: true, serializedName: "sku", @@ -4130,13 +4037,6 @@ export const FileShare: msRest.CompositeMapper = { type: { name: "Number" } - }, - snapshotTime: { - readOnly: true, - serializedName: "properties.snapshotTime", - type: { - name: "DateTime" - } } } } @@ -4267,13 +4167,6 @@ export const FileShareItem: msRest.CompositeMapper = { type: { name: "Number" } - }, - snapshotTime: { - readOnly: true, - serializedName: "properties.snapshotTime", - type: { - name: "DateTime" - } } } } @@ -4585,36 +4478,6 @@ export const StorageAccountListResult: msRest.CompositeMapper = { } }; -export const DeletedAccountListResult: msRest.CompositeMapper = { - serializedName: "DeletedAccountListResult", - type: { - name: "Composite", - className: "DeletedAccountListResult", - modelProperties: { - value: { - readOnly: true, - serializedName: "", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "DeletedAccount" - } - } - } - }, - nextLink: { - readOnly: true, - serializedName: "nextLink", - type: { - name: "String" - } - } - } - } -}; - export const UsageListResult: msRest.CompositeMapper = { serializedName: "UsageListResult", type: { diff --git a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts index 1eb0feab8616..498ad39f7d49 100644 --- a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts +++ b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts @@ -27,7 +27,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -37,7 +36,6 @@ export { Endpoints, ErrorResponse, ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicies, ObjectReplicationPolicy, @@ -69,15 +67,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/parameters.ts b/sdk/storage/arm-storage/src/models/parameters.ts index 06a29cb5a893..7287d0e72379 100644 --- a/sdk/storage/arm-storage/src/models/parameters.ts +++ b/sdk/storage/arm-storage/src/models/parameters.ts @@ -84,20 +84,6 @@ export const containerName: msRest.OperationURLParameter = { } } }; -export const deletedAccountName: msRest.OperationURLParameter = { - parameterPath: "deletedAccountName", - mapper: { - required: true, - serializedName: "deletedAccountName", - constraints: { - MaxLength: 24, - MinLength: 3 - }, - type: { - name: "String" - } - } -}; export const encryptionScopeName: msRest.OperationURLParameter = { parameterPath: "encryptionScopeName", mapper: { @@ -153,28 +139,12 @@ export const expand2: msRest.OperationQueryParameter = { type: { name: "Enum", allowedValues: [ - "deleted", - "snapshots" + "deleted" ] } } }; export const expand3: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "expand" - ], - mapper: { - serializedName: "$expand", - type: { - name: "Enum", - allowedValues: [ - "snapshots" - ] - } - } -}; -export const expand4: msRest.OperationQueryParameter = { parameterPath: [ "options", "expand" @@ -423,15 +393,3 @@ export const tableServiceName: msRest.OperationURLParameter = { } } }; -export const xMsSnapshot: msRest.OperationParameter = { - parameterPath: [ - "options", - "xMsSnapshot" - ], - mapper: { - serializedName: "x-ms-snapshot", - type: { - name: "String" - } - } -}; diff --git a/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts b/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts index 324962a3b15e..295dca37ce1b 100644 --- a/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -38,7 +37,6 @@ export { Endpoints, ErrorResponse, ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -60,7 +58,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -70,15 +68,12 @@ export { PrivateEndpointConnectionListResult, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts index 2e06299b9e40..5c394c3d7749 100644 --- a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts +++ b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -58,7 +56,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateLinkResource, PrivateLinkResourceListResult, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/queueMappers.ts b/sdk/storage/arm-storage/src/models/queueMappers.ts index 92f1856cf5e2..3f328fb8d1a7 100644 --- a/sdk/storage/arm-storage/src/models/queueMappers.ts +++ b/sdk/storage/arm-storage/src/models/queueMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts index 5c2e50448417..30871ef57eee 100644 --- a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts index fe4578e8b20e..6cef4a19b229 100644 --- a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts +++ b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts @@ -30,7 +30,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -38,7 +37,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -62,7 +60,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -71,16 +69,13 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, ServiceSasParameters, Sku, - SmbSetting, StorageAccount, StorageAccountCheckNameAvailabilityParameters, StorageAccountCreateParameters, diff --git a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts index ef76967c4ccc..80361908f963 100644 --- a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts +++ b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts index ebbb07423ad7..be618f0a9303 100644 --- a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts @@ -28,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -59,7 +57,7 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, + ManagementPolicyVersion, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,15 +66,12 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, diff --git a/sdk/storage/arm-storage/src/operations/deletedAccounts.ts b/sdk/storage/arm-storage/src/operations/deletedAccounts.ts deleted file mode 100644 index 271d23c7b922..000000000000 --- a/sdk/storage/arm-storage/src/operations/deletedAccounts.ts +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. - * Licensed under the MIT License. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. - */ - -import * as msRest from "@azure/ms-rest-js"; -import * as Models from "../models"; -import * as Mappers from "../models/deletedAccountsMappers"; -import * as Parameters from "../models/parameters"; -import { StorageManagementClientContext } from "../storageManagementClientContext"; - -/** Class representing a DeletedAccounts. */ -export class DeletedAccounts { - private readonly client: StorageManagementClientContext; - - /** - * Create a DeletedAccounts. - * @param {StorageManagementClientContext} client Reference to the service client. - */ - constructor(client: StorageManagementClientContext) { - this.client = client; - } - - /** - * Lists deleted accounts under the subscription. - * @param [options] The optional parameters - * @returns Promise - */ - list(options?: msRest.RequestOptionsBase): Promise; - /** - * @param callback The callback - */ - list(callback: msRest.ServiceCallback): void; - /** - * @param options The optional parameters - * @param callback The callback - */ - list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - options - }, - listOperationSpec, - callback) as Promise; - } - - /** - * Get properties of specified deleted account resource. - * @param deletedAccountName Name of the deleted storage account. - * @param location The location of the deleted storage account. - * @param [options] The optional parameters - * @returns Promise - */ - get(deletedAccountName: string, location: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param deletedAccountName Name of the deleted storage account. - * @param location The location of the deleted storage account. - * @param callback The callback - */ - get(deletedAccountName: string, location: string, callback: msRest.ServiceCallback): void; - /** - * @param deletedAccountName Name of the deleted storage account. - * @param location The location of the deleted storage account. - * @param options The optional parameters - * @param callback The callback - */ - get(deletedAccountName: string, location: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(deletedAccountName: string, location: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - deletedAccountName, - location, - options - }, - getOperationSpec, - callback) as Promise; - } - - /** - * Lists deleted accounts under the subscription. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @returns Promise - */ - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - */ - listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - */ - listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listNextOperationSpec, - callback) as Promise; - } -} - -// Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const listOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.Storage/deletedAccounts", - urlParameters: [ - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.DeletedAccountListResult - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - -const getOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.Storage/locations/{location}/deletedAccounts/{deletedAccountName}", - urlParameters: [ - Parameters.deletedAccountName, - Parameters.location, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.DeletedAccount - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - -const listNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.DeletedAccountListResult - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; diff --git a/sdk/storage/arm-storage/src/operations/fileServices.ts b/sdk/storage/arm-storage/src/operations/fileServices.ts index 839f168ce7a9..ab90f465e3c3 100644 --- a/sdk/storage/arm-storage/src/operations/fileServices.ts +++ b/sdk/storage/arm-storage/src/operations/fileServices.ts @@ -74,41 +74,34 @@ export class FileServices { * @param accountName The name of the storage account within the specified resource group. Storage * account names must be between 3 and 24 characters in length and use numbers and lower-case * letters only. - * @param parameters The properties of file services in storage accounts, including CORS - * (Cross-Origin Resource Sharing) rules. * @param [options] The optional parameters * @returns Promise */ - setServiceProperties(resourceGroupName: string, accountName: string, parameters: Models.FileServiceProperties, options?: msRest.RequestOptionsBase): Promise; + setServiceProperties(resourceGroupName: string, accountName: string, options?: Models.FileServicesSetServicePropertiesOptionalParams): Promise; /** * @param resourceGroupName The name of the resource group within the user's subscription. The name * is case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage * account names must be between 3 and 24 characters in length and use numbers and lower-case * letters only. - * @param parameters The properties of file services in storage accounts, including CORS - * (Cross-Origin Resource Sharing) rules. * @param callback The callback */ - setServiceProperties(resourceGroupName: string, accountName: string, parameters: Models.FileServiceProperties, callback: msRest.ServiceCallback): void; + setServiceProperties(resourceGroupName: string, accountName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group within the user's subscription. The name * is case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage * account names must be between 3 and 24 characters in length and use numbers and lower-case * letters only. - * @param parameters The properties of file services in storage accounts, including CORS - * (Cross-Origin Resource Sharing) rules. * @param options The optional parameters * @param callback The callback */ - setServiceProperties(resourceGroupName: string, accountName: string, parameters: Models.FileServiceProperties, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - setServiceProperties(resourceGroupName: string, accountName: string, parameters: Models.FileServiceProperties, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + setServiceProperties(resourceGroupName: string, accountName: string, options: Models.FileServicesSetServicePropertiesOptionalParams, callback: msRest.ServiceCallback): void; + setServiceProperties(resourceGroupName: string, accountName: string, options?: Models.FileServicesSetServicePropertiesOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, accountName, - parameters, options }, setServicePropertiesOperationSpec, @@ -201,7 +194,16 @@ const setServicePropertiesOperationSpec: msRest.OperationSpec = { Parameters.acceptLanguage ], requestBody: { - parameterPath: "parameters", + parameterPath: { + cors: [ + "options", + "cors" + ], + shareDeleteRetentionPolicy: [ + "options", + "shareDeleteRetentionPolicy" + ] + }, mapper: { ...Mappers.FileServiceProperties, required: true diff --git a/sdk/storage/arm-storage/src/operations/fileShares.ts b/sdk/storage/arm-storage/src/operations/fileShares.ts index 796ed41d265e..e7e39a0df0a4 100644 --- a/sdk/storage/arm-storage/src/operations/fileShares.ts +++ b/sdk/storage/arm-storage/src/operations/fileShares.ts @@ -83,7 +83,7 @@ export class FileShares { * @param [options] The optional parameters * @returns Promise */ - create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options?: Models.FileSharesCreateOptionalParams): Promise; + create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group within the user's subscription. The name * is case insensitive. @@ -112,8 +112,8 @@ export class FileShares { * @param options The optional parameters * @param callback The callback */ - create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options: Models.FileSharesCreateOptionalParams, callback: msRest.ServiceCallback): void; - create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options?: Models.FileSharesCreateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, accountName: string, shareName: string, fileShare: Models.FileShare, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -253,7 +253,7 @@ export class FileShares { * @param [options] The optional parameters * @returns Promise */ - deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options?: Models.FileSharesDeleteMethodOptionalParams): Promise; + deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group within the user's subscription. The name * is case insensitive. @@ -280,8 +280,8 @@ export class FileShares { * @param options The optional parameters * @param callback The callback */ - deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options: Models.FileSharesDeleteMethodOptionalParams, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options?: Models.FileSharesDeleteMethodOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, accountName: string, shareName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -427,7 +427,6 @@ const createOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.expand3, Parameters.apiVersion ], headerParameters: [ @@ -498,10 +497,9 @@ const getOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.expand4 + Parameters.expand3 ], headerParameters: [ - Parameters.xMsSnapshot, Parameters.acceptLanguage ], responses: { @@ -528,7 +526,6 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { Parameters.apiVersion ], headerParameters: [ - Parameters.xMsSnapshot, Parameters.acceptLanguage ], responses: { diff --git a/sdk/storage/arm-storage/src/operations/index.ts b/sdk/storage/arm-storage/src/operations/index.ts index ed804e748b3f..448094f2ae3b 100644 --- a/sdk/storage/arm-storage/src/operations/index.ts +++ b/sdk/storage/arm-storage/src/operations/index.ts @@ -10,7 +10,6 @@ export * from "./operations"; export * from "./skus"; export * from "./storageAccounts"; -export * from "./deletedAccounts"; export * from "./usages"; export * from "./managementPolicies"; export * from "./blobInventoryPolicies"; diff --git a/sdk/storage/arm-storage/src/operations/storageAccounts.ts b/sdk/storage/arm-storage/src/operations/storageAccounts.ts index 9a30517e64dd..d8f3e84d61dd 100644 --- a/sdk/storage/arm-storage/src/operations/storageAccounts.ts +++ b/sdk/storage/arm-storage/src/operations/storageAccounts.ts @@ -623,35 +623,6 @@ export class StorageAccounts { listNextOperationSpec, callback) as Promise; } - - /** - * Lists all the storage accounts available under the given resource group. Note that storage keys - * are not returned; use the ListKeys operation for this. - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @returns Promise - */ - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - */ - listByResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - */ - listByResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - nextPageLink, - options - }, - listByResourceGroupNextOperationSpec, - callback) as Promise; - } } // Operation Specifications @@ -1082,27 +1053,3 @@ const listNextOperationSpec: msRest.OperationSpec = { }, serializer }; - -const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.StorageAccountListResult - }, - default: { - bodyMapper: Mappers.CloudError - } - }, - serializer -}; diff --git a/sdk/storage/arm-storage/src/storageManagementClient.ts b/sdk/storage/arm-storage/src/storageManagementClient.ts index 243688c40ba2..acc7ca24b1c2 100644 --- a/sdk/storage/arm-storage/src/storageManagementClient.ts +++ b/sdk/storage/arm-storage/src/storageManagementClient.ts @@ -19,7 +19,6 @@ class StorageManagementClient extends StorageManagementClientContext { operations: operations.Operations; skus: operations.Skus; storageAccounts: operations.StorageAccounts; - deletedAccounts: operations.DeletedAccounts; usages: operations.Usages; managementPolicies: operations.ManagementPolicies; blobInventoryPolicies: operations.BlobInventoryPolicies; @@ -47,7 +46,6 @@ class StorageManagementClient extends StorageManagementClientContext { this.operations = new operations.Operations(this); this.skus = new operations.Skus(this); this.storageAccounts = new operations.StorageAccounts(this); - this.deletedAccounts = new operations.DeletedAccounts(this); this.usages = new operations.Usages(this); this.managementPolicies = new operations.ManagementPolicies(this); this.blobInventoryPolicies = new operations.BlobInventoryPolicies(this); diff --git a/sdk/storage/arm-storage/src/storageManagementClientContext.ts b/sdk/storage/arm-storage/src/storageManagementClientContext.ts index 6ad950defd43..61513ba2fb55 100644 --- a/sdk/storage/arm-storage/src/storageManagementClientContext.ts +++ b/sdk/storage/arm-storage/src/storageManagementClientContext.ts @@ -36,14 +36,14 @@ export class StorageManagementClientContext extends msRestAzure.AzureServiceClie if (!options) { options = {}; } - if (!options.userAgent) { + if(!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2020-08-01-preview'; + this.apiVersion = '2019-06-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -51,10 +51,10 @@ export class StorageManagementClientContext extends msRestAzure.AzureServiceClie this.credentials = credentials; this.subscriptionId = subscriptionId; - if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } }