From f5220308c673148244b42aec688a67b23f010219 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 29 Jan 2021 02:55:58 +0000 Subject: [PATCH] CodeGen from PR 11756 in Azure/azure-rest-api-specs [SRP] Add allowSharedKeyAccess property support (#11756) * Add allowSharedKeyAccess property support * Remove x-ms-clientname as it cannot be same as property name as per new ARM rules * backfill June19 and April19 Api versions with allowsharedkeyaccess --- .../src/models/blobContainersMappers.ts | 13 - .../models/blobInventoryPoliciesMappers.ts | 93 --- .../src/models/blobServicesMappers.ts | 13 - .../src/models/deletedAccountsMappers.ts | 93 --- .../src/models/encryptionScopesMappers.ts | 14 - .../src/models/fileServicesMappers.ts | 13 - .../src/models/fileSharesMappers.ts | 13 - sdk/storage/arm-storage/src/models/index.ts | 566 ++--------------- .../src/models/managementPoliciesMappers.ts | 13 - sdk/storage/arm-storage/src/models/mappers.ts | 574 +----------------- ...ectReplicationPoliciesOperationsMappers.ts | 14 - .../arm-storage/src/models/parameters.ts | 56 +- .../privateEndpointConnectionsMappers.ts | 14 - .../src/models/privateLinkResourcesMappers.ts | 13 - .../arm-storage/src/models/queueMappers.ts | 13 - .../src/models/queueServicesMappers.ts | 13 - .../src/models/storageAccountsMappers.ts | 13 - .../src/models/tableOperationsMappers.ts | 13 - .../src/models/tableServicesMappers.ts | 13 - .../src/operations/blobInventoryPolicies.ts | 312 ---------- .../src/operations/deletedAccounts.ts | 185 ------ .../src/operations/fileServices.ts | 26 +- .../arm-storage/src/operations/fileShares.ts | 17 +- .../arm-storage/src/operations/index.ts | 2 - .../src/operations/storageAccounts.ts | 53 -- .../src/storageManagementClient.ts | 4 - .../src/storageManagementClientContext.ts | 8 +- 27 files changed, 100 insertions(+), 2074 deletions(-) delete mode 100644 sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts delete mode 100644 sdk/storage/arm-storage/src/models/deletedAccountsMappers.ts delete mode 100644 sdk/storage/arm-storage/src/operations/blobInventoryPolicies.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..6fb2e28fda4a 100644 --- a/sdk/storage/arm-storage/src/models/blobContainersMappers.ts +++ b/sdk/storage/arm-storage/src/models/blobContainersMappers.ts @@ -17,11 +17,6 @@ export { BlobContainersExtendImmutabilityPolicyHeaders, BlobContainersGetImmutabilityPolicyHeaders, BlobContainersLockImmutabilityPolicyHeaders, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -33,7 +28,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -41,7 +35,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -51,7 +44,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LeaseContainerRequest, LeaseContainerResponse, LegalHold, @@ -67,7 +59,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -76,20 +67,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.ts deleted file mode 100644 index ed2d658e0ac9..000000000000 --- a/sdk/storage/arm-storage/src/models/blobInventoryPoliciesMappers.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, - DeleteRetentionPolicy, - Encryption, - EncryptionScope, - EncryptionScopeKeyVaultProperties, - EncryptionService, - EncryptionServices, - Endpoints, - ErrorResponse, - ErrorResponseBody, - ExtendedLocation, - FileServiceProperties, - FileShare, - FileShareItem, - GeoReplicationStats, - Identity, - ImmutabilityPolicy, - ImmutabilityPolicyProperties, - IPRule, - KeyVaultProperties, - LastAccessTimeTrackingPolicy, - LegalHoldProperties, - ListBlobInventoryPolicy, - 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/blobServicesMappers.ts b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts index be07a91403b0..a6de87dd17b6 100644 --- a/sdk/storage/arm-storage/src/models/blobServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/blobServicesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -29,7 +24,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -37,7 +31,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -47,7 +40,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, 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..af0e2df2d05c 100644 --- a/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts +++ b/sdk/storage/arm-storage/src/models/encryptionScopesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -38,8 +32,6 @@ export { EncryptionServices, Endpoints, ErrorResponse, - ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -49,7 +41,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -61,7 +52,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -70,20 +60,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts index c183aa65deba..8172b990a22c 100644 --- a/sdk/storage/arm-storage/src/models/fileServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/fileServicesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceItems, FileServiceProperties, FileShare, @@ -47,7 +40,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts index 3e68926eb854..a2ad44519cb5 100644 --- a/sdk/storage/arm-storage/src/models/fileSharesMappers.ts +++ b/sdk/storage/arm-storage/src/models/fileSharesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeletedShare, DeleteRetentionPolicy, Encryption, @@ -37,7 +31,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -48,7 +41,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -60,7 +52,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -69,20 +60,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/index.ts b/sdk/storage/arm-storage/src/models/index.ts index 7a5201d4d413..adbfeea6efad 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', @@ -1421,12 +1365,7 @@ export interface DateAfterModification { /** * Value indicating the age in days after last modification */ - daysAfterModificationGreaterThan?: number; - /** - * Value indicating the age in days after last blob access. This property can only be used in - * conjunction with last access time tracking policy - */ - daysAfterLastAccessTimeGreaterThan?: number; + daysAfterModificationGreaterThan: number; } /** @@ -1445,11 +1384,6 @@ export interface ManagementPolicyBaseBlob { * The function to delete the blob */ deleteProperty?: DateAfterModification; - /** - * This property enables auto tiering of a blob from cool to hot on a blob access. This property - * requires tierToCool.daysAfterLastAccessTimeGreaterThan. - */ - enableAutoTierToHotFromCool?: boolean; } /** @@ -1702,127 +1636,9 @@ export interface ObjectReplicationPolicy extends Resource { } /** - * An object that defines the blob inventory rule filter conditions. - */ -export interface BlobInventoryPolicyFilter { - /** - * An array of strings for blob prefixes to be matched. - */ - prefixMatch?: string[]; - /** - * An array of predefined enum values. Valid values include blockBlob, appendBlob, pageBlob. Hns - * accounts does not support pageBlobs. - */ - blobTypes: string[]; - /** - * Includes blob versions in blob inventory when value set to true. - */ - includeBlobVersions?: boolean; - /** - * Includes blob snapshots in blob inventory when value set to true. - */ - includeSnapshots?: boolean; -} - -/** - * An object that defines the blob inventory rule. Each definition consists of a set of filters. - */ -export interface BlobInventoryPolicyDefinition { - /** - * An object that defines the filter set. - */ - filters: BlobInventoryPolicyFilter; -} - -/** - * An object that wraps the blob inventory rule. Each rule is uniquely defined by name. - */ -export interface BlobInventoryPolicyRule { - /** - * Rule is enabled when set to true. - */ - enabled: boolean; - /** - * A rule name can contain any combination of alpha numeric characters. Rule name is - * case-sensitive. It must be unique within a policy. - */ - name: string; - /** - * An object that defines the blob inventory policy rule. - */ - definition: BlobInventoryPolicyDefinition; -} - -/** - * The storage account blob inventory policy rules. - */ -export interface BlobInventoryPolicySchema { - /** - * Policy is enabled if set to true. - */ - enabled: boolean; - /** - * Container name where blob inventory files are stored. Must be pre-created. - */ - destination: string; - /** - * The storage account blob inventory policy rules. The rule is applied when it is enabled. - */ - rules: BlobInventoryPolicyRule[]; -} - -/** - * Metadata pertaining to creation and last modification of the resource. - */ -export interface SystemData { - /** - * The identity that created the resource. - */ - createdBy?: string; - /** - * The type of identity that created the resource. Possible values include: 'User', - * 'Application', 'ManagedIdentity', 'Key' - */ - createdByType?: CreatedByType; - /** - * The timestamp of resource creation (UTC). - */ - createdAt?: Date; - /** - * The identity that last modified the resource. - */ - lastModifiedBy?: string; - /** - * The type of identity that last modified the resource. Possible values include: 'User', - * 'Application', 'ManagedIdentity', 'Key' - */ - lastModifiedByType?: CreatedByType; - /** - * The type of identity that last modified the resource. - */ - lastModifiedAt?: Date; -} - -/** - * The storage account blob inventory policy. - */ -export interface BlobInventoryPolicy extends Resource { - /** - * Returns the last modified date and time of the blob inventory policy. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly lastModifiedTime?: Date; - /** - * The storage account blob inventory policy object. It is composed of policy rules. - */ - policy: BlobInventoryPolicySchema; - systemData?: SystemData; -} - -/** - * Error response body contract. + * An error response from the storage resource provider. */ -export interface ErrorResponseBody { +export interface ErrorResponse { /** * An identifier for the error. Codes are invariant and are intended to be consumed * programmatically. @@ -1835,13 +1651,11 @@ export interface ErrorResponseBody { } /** - * An error response from the storage resource provider. + * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags + * and a location + * @summary Proxy Resource */ -export interface ErrorResponse { - /** - * Azure Storage Resource Provider error response body. - */ - error?: ErrorResponseBody; +export interface ProxyResource extends Resource { } /** @@ -2317,31 +2131,6 @@ export interface RestorePolicyProperties { readonly minRestoreTime?: Date; } -/** - * The blob service properties for Last access time based tracking policy. - */ -export interface LastAccessTimeTrackingPolicy { - /** - * When set to true last access time based tracking is enabled. - */ - enable: boolean; - /** - * Name of the policy. The valid value is AccessTimeTracking. This field is currently read only. - * Possible values include: 'AccessTimeTracking' - */ - name?: Name; - /** - * The field specifies blob object tracking granularity in days, typically how often the blob - * object should be tracked.This field is currently read only with value as 1 - */ - trackingGranularityInDays?: number; - /** - * An array of predefined supported blob types. Only blockBlob is the supported value. This field - * is currently read only - */ - blobType?: string[]; -} - /** * The properties of a storage account’s Blob service. */ @@ -2382,10 +2171,6 @@ export interface BlobServiceProperties extends Resource { * The blob service properties for container soft delete. */ containerDeleteRetentionPolicy?: DeleteRetentionPolicy; - /** - * The blob service property to configure last access time based tracking policy. - */ - lastAccessTimeTrackingPolicy?: LastAccessTimeTrackingPolicy; /** * Sku name and tier. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -2437,36 +2222,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 +2236,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 +2324,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 +2410,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; } /** @@ -2779,13 +2518,6 @@ export interface StorageAccountsListKeysOptionalParams extends msRest.RequestOpt expand?: ListKeyExpand; } -/** - * Optional Parameters. - */ -export interface BlobInventoryPoliciesCreateOrUpdateOptionalParams extends msRest.RequestOptionsBase { - systemData?: SystemData; -} - /** * Optional Parameters. */ @@ -2886,6 +2618,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 +2648,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 +2662,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 +2678,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 +2855,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. @@ -3153,14 +2863,6 @@ export interface DeletedAccountListResult extends Array { export interface UsageListResult extends Array { } -/** - * @interface - * List of blob inventory policies returned. - * @extends Array - */ -export interface ListBlobInventoryPolicy extends Array { -} - /** * @interface * List of private endpoint connection associated with the specified storage account @@ -3387,14 +3089,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' @@ -3516,14 +3210,6 @@ export type EncryptionScopeSource = 'Microsoft.Storage' | 'Microsoft.KeyVault'; */ export type EncryptionScopeState = 'Enabled' | 'Disabled'; -/** - * Defines values for CreatedByType. - * Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key' - * @readonly - * @enum {string} - */ -export type CreatedByType = 'User' | 'Application' | 'ManagedIdentity' | 'Key'; - /** * Defines values for PublicAccess. * Possible values include: 'Container', 'Blob', 'None' @@ -3572,14 +3258,6 @@ export type ImmutabilityPolicyState = 'Locked' | 'Unlocked'; */ export type ImmutabilityPolicyUpdateType = 'put' | 'lock' | 'extend'; -/** - * Defines values for Name. - * Possible values include: 'AccessTimeTracking' - * @readonly - * @enum {string} - */ -export type Name = 'AccessTimeTracking'; - /** * Defines values for EnabledProtocols. * Possible values include: 'SMB', 'NFS' @@ -3630,19 +3308,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 +3650,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. */ @@ -4120,66 +3710,6 @@ export type ManagementPoliciesCreateOrUpdateResponse = ManagementPolicy & { }; }; -/** - * Contains response data for the get operation. - */ -export type BlobInventoryPoliciesGetResponse = BlobInventoryPolicy & { - /** - * 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: BlobInventoryPolicy; - }; -}; - -/** - * Contains response data for the createOrUpdate operation. - */ -export type BlobInventoryPoliciesCreateOrUpdateResponse = BlobInventoryPolicy & { - /** - * 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: BlobInventoryPolicy; - }; -}; - -/** - * Contains response data for the list operation. - */ -export type BlobInventoryPoliciesListResponse = ListBlobInventoryPolicy & { - /** - * 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: ListBlobInventoryPolicy; - }; -}; - /** * Contains response data for the list operation. */ diff --git a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts index 7f9a841cfa77..aaba04535587 100644 --- a/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts +++ b/sdk/storage/arm-storage/src/models/managementPoliciesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -58,7 +50,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -67,20 +58,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/mappers.ts b/sdk/storage/arm-storage/src/models/mappers.ts index adbc5ce36d2c..65a117f82665 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: { @@ -2232,6 +2123,7 @@ export const DateAfterModification: msRest.CompositeMapper = { className: "DateAfterModification", modelProperties: { daysAfterModificationGreaterThan: { + required: true, serializedName: "daysAfterModificationGreaterThan", constraints: { InclusiveMinimum: 0, @@ -2240,16 +2132,6 @@ export const DateAfterModification: msRest.CompositeMapper = { type: { name: "Number" } - }, - daysAfterLastAccessTimeGreaterThan: { - serializedName: "daysAfterLastAccessTimeGreaterThan", - constraints: { - InclusiveMinimum: 0, - MultipleOf: 1 - }, - type: { - name: "Number" - } } } } @@ -2281,12 +2163,6 @@ export const ManagementPolicyBaseBlob: msRest.CompositeMapper = { name: "Composite", className: "DateAfterModification" } - }, - enableAutoTierToHotFromCool: { - serializedName: "enableAutoTierToHotFromCool", - type: { - name: "Boolean" - } } } } @@ -2727,232 +2603,11 @@ export const ObjectReplicationPolicy: msRest.CompositeMapper = { } }; -export const BlobInventoryPolicyFilter: msRest.CompositeMapper = { - serializedName: "BlobInventoryPolicyFilter", - type: { - name: "Composite", - className: "BlobInventoryPolicyFilter", - modelProperties: { - prefixMatch: { - serializedName: "prefixMatch", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - }, - blobTypes: { - required: true, - serializedName: "blobTypes", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - }, - includeBlobVersions: { - serializedName: "includeBlobVersions", - type: { - name: "Boolean" - } - }, - includeSnapshots: { - serializedName: "includeSnapshots", - type: { - name: "Boolean" - } - } - } - } -}; - -export const BlobInventoryPolicyDefinition: msRest.CompositeMapper = { - serializedName: "BlobInventoryPolicyDefinition", - type: { - name: "Composite", - className: "BlobInventoryPolicyDefinition", - modelProperties: { - filters: { - required: true, - serializedName: "filters", - type: { - name: "Composite", - className: "BlobInventoryPolicyFilter" - } - } - } - } -}; - -export const BlobInventoryPolicyRule: msRest.CompositeMapper = { - serializedName: "BlobInventoryPolicyRule", - type: { - name: "Composite", - className: "BlobInventoryPolicyRule", - modelProperties: { - enabled: { - required: true, - serializedName: "enabled", - type: { - name: "Boolean" - } - }, - name: { - required: true, - serializedName: "name", - type: { - name: "String" - } - }, - definition: { - required: true, - serializedName: "definition", - type: { - name: "Composite", - className: "BlobInventoryPolicyDefinition" - } - } - } - } -}; - -export const BlobInventoryPolicySchema: msRest.CompositeMapper = { - serializedName: "BlobInventoryPolicySchema", - type: { - name: "Composite", - className: "BlobInventoryPolicySchema", - modelProperties: { - enabled: { - required: true, - serializedName: "enabled", - type: { - name: "Boolean" - } - }, - destination: { - required: true, - serializedName: "destination", - type: { - name: "String" - } - }, - type: { - required: true, - isConstant: true, - serializedName: "type", - defaultValue: 'Inventory', - type: { - name: "String" - } - }, - rules: { - required: true, - serializedName: "rules", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "BlobInventoryPolicyRule" - } - } - } - } - } - } -}; - -export const SystemData: msRest.CompositeMapper = { - serializedName: "systemData", - type: { - name: "Composite", - className: "SystemData", - modelProperties: { - createdBy: { - serializedName: "createdBy", - type: { - name: "String" - } - }, - createdByType: { - serializedName: "createdByType", - type: { - name: "String" - } - }, - createdAt: { - serializedName: "createdAt", - type: { - name: "DateTime" - } - }, - lastModifiedBy: { - serializedName: "lastModifiedBy", - type: { - name: "String" - } - }, - lastModifiedByType: { - serializedName: "lastModifiedByType", - type: { - name: "String" - } - }, - lastModifiedAt: { - serializedName: "lastModifiedAt", - type: { - name: "DateTime" - } - } - } - } -}; - -export const BlobInventoryPolicy: msRest.CompositeMapper = { - serializedName: "BlobInventoryPolicy", - type: { - name: "Composite", - className: "BlobInventoryPolicy", - modelProperties: { - ...Resource.type.modelProperties, - lastModifiedTime: { - readOnly: true, - serializedName: "properties.lastModifiedTime", - type: { - name: "DateTime" - } - }, - policy: { - required: true, - serializedName: "properties.policy", - defaultValue: {}, - type: { - name: "Composite", - className: "BlobInventoryPolicySchema" - } - }, - systemData: { - serializedName: "systemData", - type: { - name: "Composite", - className: "SystemData" - } - } - } - } -}; - -export const ErrorResponseBody: msRest.CompositeMapper = { - serializedName: "ErrorResponseBody", +export const ErrorResponse: msRest.CompositeMapper = { + serializedName: "ErrorResponse", type: { name: "Composite", - className: "ErrorResponseBody", + className: "ErrorResponse", modelProperties: { code: { serializedName: "code", @@ -2970,19 +2625,13 @@ export const ErrorResponseBody: msRest.CompositeMapper = { } }; -export const ErrorResponse: msRest.CompositeMapper = { - serializedName: "ErrorResponse", +export const ProxyResource: msRest.CompositeMapper = { + serializedName: "ProxyResource", type: { name: "Composite", - className: "ErrorResponse", + className: "ProxyResource", modelProperties: { - error: { - serializedName: "error", - type: { - name: "Composite", - className: "ErrorResponseBody" - } - } + ...Resource.type.modelProperties } } }; @@ -3734,46 +3383,6 @@ export const RestorePolicyProperties: msRest.CompositeMapper = { } }; -export const LastAccessTimeTrackingPolicy: msRest.CompositeMapper = { - serializedName: "LastAccessTimeTrackingPolicy", - type: { - name: "Composite", - className: "LastAccessTimeTrackingPolicy", - modelProperties: { - enable: { - required: true, - serializedName: "enable", - type: { - name: "Boolean" - } - }, - name: { - serializedName: "name", - type: { - name: "String" - } - }, - trackingGranularityInDays: { - serializedName: "trackingGranularityInDays", - type: { - name: "Number" - } - }, - blobType: { - serializedName: "blobType", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - } - } - } -}; - export const BlobServiceProperties: msRest.CompositeMapper = { serializedName: "BlobServiceProperties", type: { @@ -3834,13 +3443,6 @@ export const BlobServiceProperties: msRest.CompositeMapper = { className: "DeleteRetentionPolicy" } }, - lastAccessTimeTrackingPolicy: { - serializedName: "properties.lastAccessTimeTrackingPolicy", - type: { - name: "Composite", - className: "LastAccessTimeTrackingPolicy" - } - }, sku: { readOnly: true, serializedName: "sku", @@ -3916,56 +3518,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 +3539,6 @@ export const FileServiceProperties: msRest.CompositeMapper = { className: "DeleteRetentionPolicy" } }, - protocolSettings: { - serializedName: "properties.protocolSettings", - type: { - name: "Composite", - className: "ProtocolSettings" - } - }, sku: { readOnly: true, serializedName: "sku", @@ -4130,13 +3675,6 @@ export const FileShare: msRest.CompositeMapper = { type: { name: "Number" } - }, - snapshotTime: { - readOnly: true, - serializedName: "properties.snapshotTime", - type: { - name: "DateTime" - } } } } @@ -4267,13 +3805,6 @@ export const FileShareItem: msRest.CompositeMapper = { type: { name: "Number" } - }, - snapshotTime: { - readOnly: true, - serializedName: "properties.snapshotTime", - type: { - name: "DateTime" - } } } } @@ -4585,36 +4116,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: { @@ -4637,29 +4138,6 @@ export const UsageListResult: msRest.CompositeMapper = { } }; -export const ListBlobInventoryPolicy: msRest.CompositeMapper = { - serializedName: "ListBlobInventoryPolicy", - type: { - name: "Composite", - className: "ListBlobInventoryPolicy", - modelProperties: { - value: { - readOnly: true, - serializedName: "", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "BlobInventoryPolicy" - } - } - } - } - } - } -}; - export const PrivateEndpointConnectionListResult: msRest.CompositeMapper = { serializedName: "PrivateEndpointConnectionListResult", type: { diff --git a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts index 1eb0feab8616..9a0b5ef0415e 100644 --- a/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts +++ b/sdk/storage/arm-storage/src/models/objectReplicationPoliciesOperationsMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -27,7 +22,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,8 +30,6 @@ export { EncryptionServices, Endpoints, ErrorResponse, - ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -47,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +50,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicies, ObjectReplicationPolicy, @@ -69,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/parameters.ts b/sdk/storage/arm-storage/src/models/parameters.ts index 06a29cb5a893..a22e2890558c 100644 --- a/sdk/storage/arm-storage/src/models/parameters.ts +++ b/sdk/storage/arm-storage/src/models/parameters.ts @@ -46,18 +46,6 @@ export const apiVersion: msRest.OperationQueryParameter = { } } }; -export const blobInventoryPolicyName: msRest.OperationURLParameter = { - parameterPath: "blobInventoryPolicyName", - mapper: { - required: true, - isConstant: true, - serializedName: "blobInventoryPolicyName", - defaultValue: 'default', - type: { - name: "String" - } - } -}; export const blobServicesName: msRest.OperationURLParameter = { parameterPath: "blobServicesName", mapper: { @@ -84,20 +72,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 +127,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 +381,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..cdc76be83f06 100644 --- a/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/storage/arm-storage/src/models/privateEndpointConnectionsMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -37,8 +31,6 @@ export { EncryptionServices, Endpoints, ErrorResponse, - ErrorResponseBody, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -48,7 +40,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -60,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -70,20 +60,16 @@ export { PrivateEndpointConnectionListResult, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts index 2e06299b9e40..23900a57efbb 100644 --- a/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts +++ b/sdk/storage/arm-storage/src/models/privateLinkResourcesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -58,7 +50,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateLinkResource, PrivateLinkResourceListResult, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/queueMappers.ts b/sdk/storage/arm-storage/src/models/queueMappers.ts index 92f1856cf5e2..65b494bcacc8 100644 --- a/sdk/storage/arm-storage/src/models/queueMappers.ts +++ b/sdk/storage/arm-storage/src/models/queueMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts index 5c2e50448417..ba691c9a1c35 100644 --- a/sdk/storage/arm-storage/src/models/queueServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/queueServicesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts index fe4578e8b20e..b142c3666110 100644 --- a/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts +++ b/sdk/storage/arm-storage/src/models/storageAccountsMappers.ts @@ -13,11 +13,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -30,7 +25,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -38,7 +32,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -48,7 +41,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListAccountSasResponse, ListContainerItem, @@ -62,7 +54,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -71,16 +62,13 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, ServiceSasParameters, Sku, - SmbSetting, StorageAccount, StorageAccountCheckNameAvailabilityParameters, StorageAccountCreateParameters, @@ -92,7 +80,6 @@ export { StorageAccountRegenerateKeyParameters, StorageAccountUpdateParameters, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts index ef76967c4ccc..a74924ec04e9 100644 --- a/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts +++ b/sdk/storage/arm-storage/src/models/tableOperationsMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts index ebbb07423ad7..2b3d7a145d7d 100644 --- a/sdk/storage/arm-storage/src/models/tableServicesMappers.ts +++ b/sdk/storage/arm-storage/src/models/tableServicesMappers.ts @@ -12,11 +12,6 @@ export { AzureFilesIdentityBasedAuthentication, BaseResource, BlobContainer, - BlobInventoryPolicy, - BlobInventoryPolicyDefinition, - BlobInventoryPolicyFilter, - BlobInventoryPolicyRule, - BlobInventoryPolicySchema, BlobRestoreParameters, BlobRestoreRange, BlobRestoreStatus, @@ -28,7 +23,6 @@ export { CustomDomain, DateAfterCreation, DateAfterModification, - DeletedAccount, DeleteRetentionPolicy, Encryption, EncryptionScope, @@ -36,7 +30,6 @@ export { EncryptionService, EncryptionServices, Endpoints, - ExtendedLocation, FileServiceProperties, FileShare, FileShareItem, @@ -46,7 +39,6 @@ export { ImmutabilityPolicyProperties, IPRule, KeyVaultProperties, - LastAccessTimeTrackingPolicy, LegalHoldProperties, ListContainerItem, ListQueue, @@ -59,7 +51,6 @@ export { ManagementPolicyRule, ManagementPolicySchema, ManagementPolicySnapShot, - Multichannel, NetworkRuleSet, ObjectReplicationPolicy, ObjectReplicationPolicyFilter, @@ -68,20 +59,16 @@ export { PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, - ProtocolSettings, ProxyResource, QueueServiceProperties, Resource, - ResourceAccessRule, RestorePolicyProperties, RoutingPreference, Sku, - SmbSetting, StorageAccount, StorageAccountInternetEndpoints, StorageAccountMicrosoftEndpoints, StorageQueue, - SystemData, Table, TableServiceProperties, TagFilter, diff --git a/sdk/storage/arm-storage/src/operations/blobInventoryPolicies.ts b/sdk/storage/arm-storage/src/operations/blobInventoryPolicies.ts deleted file mode 100644 index f7266b8d885c..000000000000 --- a/sdk/storage/arm-storage/src/operations/blobInventoryPolicies.ts +++ /dev/null @@ -1,312 +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/blobInventoryPoliciesMappers"; -import * as Parameters from "../models/parameters"; -import { StorageManagementClientContext } from "../storageManagementClientContext"; - -/** Class representing a BlobInventoryPolicies. */ -export class BlobInventoryPolicies { - private readonly client: StorageManagementClientContext; - - /** - * Create a BlobInventoryPolicies. - * @param {StorageManagementClientContext} client Reference to the service client. - */ - constructor(client: StorageManagementClientContext) { - this.client = client; - } - - /** - * Gets the blob inventory policy associated with the specified storage account. - * @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 [options] The optional parameters - * @returns Promise - */ - get(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase): 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 callback The callback - */ - get(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 options The optional parameters - * @param callback The callback - */ - get(resourceGroupName: string, accountName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - accountName, - options - }, - getOperationSpec, - callback) as Promise; - } - - /** - * Sets the blob inventory policy to the specified storage account. - * @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 policy The storage account blob inventory policy object. It is composed of policy rules. - * @param [options] The optional parameters - * @returns Promise - */ - createOrUpdate(resourceGroupName: string, accountName: string, policy: Models.BlobInventoryPolicySchema, options?: Models.BlobInventoryPoliciesCreateOrUpdateOptionalParams): 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 policy The storage account blob inventory policy object. It is composed of policy rules. - * @param callback The callback - */ - createOrUpdate(resourceGroupName: string, accountName: string, policy: Models.BlobInventoryPolicySchema, 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 policy The storage account blob inventory policy object. It is composed of policy rules. - * @param options The optional parameters - * @param callback The callback - */ - createOrUpdate(resourceGroupName: string, accountName: string, policy: Models.BlobInventoryPolicySchema, options: Models.BlobInventoryPoliciesCreateOrUpdateOptionalParams, callback: msRest.ServiceCallback): void; - createOrUpdate(resourceGroupName: string, accountName: string, policy: Models.BlobInventoryPolicySchema, options?: Models.BlobInventoryPoliciesCreateOrUpdateOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - accountName, - policy, - options - }, - createOrUpdateOperationSpec, - callback) as Promise; - } - - /** - * Deletes the blob inventory policy associated with the specified storage account. - * @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 [options] The optional parameters - * @returns Promise - */ - deleteMethod(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase): 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 callback The callback - */ - deleteMethod(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 options The optional parameters - * @param callback The callback - */ - deleteMethod(resourceGroupName: string, accountName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - deleteMethod(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - accountName, - options - }, - deleteMethodOperationSpec, - callback); - } - - /** - * Gets the blob inventory policy associated with the specified storage account. - * @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 [options] The optional parameters - * @returns Promise - */ - list(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase): 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 callback The callback - */ - list(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 options The optional parameters - * @param callback The callback - */ - list(resourceGroupName: string, accountName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - list(resourceGroupName: string, accountName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - accountName, - options - }, - listOperationSpec, - callback) as Promise; - } -} - -// Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const getOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}", - urlParameters: [ - Parameters.resourceGroupName, - Parameters.accountName, - Parameters.subscriptionId, - Parameters.blobInventoryPolicyName - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.BlobInventoryPolicy - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - -const createOrUpdateOperationSpec: msRest.OperationSpec = { - httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}", - urlParameters: [ - Parameters.resourceGroupName, - Parameters.accountName, - Parameters.subscriptionId, - Parameters.blobInventoryPolicyName - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - requestBody: { - parameterPath: { - policy: "policy", - systemData: [ - "options", - "systemData" - ] - }, - mapper: { - ...Mappers.BlobInventoryPolicy, - required: true - } - }, - responses: { - 200: { - bodyMapper: Mappers.BlobInventoryPolicy - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - -const deleteMethodOperationSpec: msRest.OperationSpec = { - httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies/{blobInventoryPolicyName}", - urlParameters: [ - Parameters.resourceGroupName, - Parameters.accountName, - Parameters.subscriptionId, - Parameters.blobInventoryPolicyName - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: {}, - 204: {}, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; - -const listOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/inventoryPolicies", - urlParameters: [ - Parameters.resourceGroupName, - Parameters.accountName, - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.ListBlobInventoryPolicy - }, - default: { - bodyMapper: Mappers.ErrorResponse - } - }, - serializer -}; 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..4c98a4ba1aff 100644 --- a/sdk/storage/arm-storage/src/operations/index.ts +++ b/sdk/storage/arm-storage/src/operations/index.ts @@ -10,10 +10,8 @@ export * from "./operations"; export * from "./skus"; export * from "./storageAccounts"; -export * from "./deletedAccounts"; export * from "./usages"; export * from "./managementPolicies"; -export * from "./blobInventoryPolicies"; export * from "./privateEndpointConnections"; export * from "./privateLinkResources"; export * from "./objectReplicationPoliciesOperations"; 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..55c955904613 100644 --- a/sdk/storage/arm-storage/src/storageManagementClient.ts +++ b/sdk/storage/arm-storage/src/storageManagementClient.ts @@ -19,10 +19,8 @@ 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; privateEndpointConnections: operations.PrivateEndpointConnections; privateLinkResources: operations.PrivateLinkResources; objectReplicationPolicies: operations.ObjectReplicationPoliciesOperations; @@ -47,10 +45,8 @@ 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); this.privateEndpointConnections = new operations.PrivateEndpointConnections(this); this.privateLinkResources = new operations.PrivateLinkResources(this); this.objectReplicationPolicies = new operations.ObjectReplicationPoliciesOperations(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; } }