diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperations.cs index 006215618a44..a95d61c87d2d 100644 --- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperations.cs +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperations.cs @@ -71,6 +71,10 @@ internal BlobContainersOperations(StorageManagementClient client) /// Optional. When specified, only container names starting with the filter /// will be listed. /// + /// + /// Optional, used to include the properties for soft deleted blob containers. + /// Possible values include: 'deleted' + /// /// /// Headers that will be added to request. /// @@ -92,7 +96,7 @@ internal BlobContainersOperations(StorageManagementClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), string include = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (resourceGroupName == null) { @@ -161,6 +165,7 @@ internal BlobContainersOperations(StorageManagementClient client) tracingParameters.Add("accountName", accountName); tracingParameters.Add("maxpagesize", maxpagesize); tracingParameters.Add("filter", filter); + tracingParameters.Add("include", include); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -183,6 +188,10 @@ internal BlobContainersOperations(StorageManagementClient client) { _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter))); } + if (include != null) + { + _queryParameters.Add(string.Format("$include={0}", System.Uri.EscapeDataString(include))); + } if (_queryParameters.Count > 0) { _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperationsExtensions.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperationsExtensions.cs index cd5e5fbf95a4..5b05657ebdca 100644 --- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperationsExtensions.cs +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/BlobContainersOperationsExtensions.cs @@ -47,9 +47,13 @@ public static partial class BlobContainersOperationsExtensions /// Optional. When specified, only container names starting with the filter /// will be listed. /// - public static IPage List(this IBlobContainersOperations operations, string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string)) + /// + /// Optional, used to include the properties for soft deleted blob containers. + /// Possible values include: 'deleted' + /// + public static IPage List(this IBlobContainersOperations operations, string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), string include = default(string)) { - return operations.ListAsync(resourceGroupName, accountName, maxpagesize, filter).GetAwaiter().GetResult(); + return operations.ListAsync(resourceGroupName, accountName, maxpagesize, filter, include).GetAwaiter().GetResult(); } /// @@ -76,12 +80,16 @@ public static partial class BlobContainersOperationsExtensions /// Optional. When specified, only container names starting with the filter /// will be listed. /// + /// + /// Optional, used to include the properties for soft deleted blob containers. + /// Possible values include: 'deleted' + /// /// /// The cancellation token. /// - public static async Task> ListAsync(this IBlobContainersOperations operations, string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListAsync(this IBlobContainersOperations operations, string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), string include = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, accountName, maxpagesize, filter, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, accountName, maxpagesize, filter, include, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IBlobContainersOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IBlobContainersOperations.cs index 984326429ec0..c17a5034526c 100644 --- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IBlobContainersOperations.cs +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IBlobContainersOperations.cs @@ -44,6 +44,10 @@ public partial interface IBlobContainersOperations /// Optional. When specified, only container names starting with the /// filter will be listed. /// + /// + /// Optional, used to include the properties for soft deleted blob + /// containers. Possible values include: 'deleted' + /// /// /// The headers that will be added to request. /// @@ -59,7 +63,7 @@ public partial interface IBlobContainersOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string accountName, string maxpagesize = default(string), string filter = default(string), string include = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Creates a new container under the specified account as described by /// request body. The container resource includes metadata and diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobContainer.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobContainer.cs index de3052db40ad..d7ac750f08e0 100644 --- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobContainer.cs +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobContainer.cs @@ -42,6 +42,13 @@ public BlobContainer() /// Microsoft.Compute/virtualMachines or /// Microsoft.Storage/storageAccounts. /// Resource Etag. + /// The version of the deleted blob + /// container. + /// Indicates whether the blob container was + /// deleted. + /// Blob container deletion time. + /// Remaining retention days for + /// soft deleted blob container. /// Default the container to use /// specified encryption scope for all writes. /// Block override of @@ -75,9 +82,13 @@ public BlobContainer() /// been created for this container. The hasImmutabilityPolicy public /// property is set to false by SRP if ImmutabilityPolicy has not been /// created for this container. - public BlobContainer(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string defaultEncryptionScope = default(string), bool? denyEncryptionScopeOverride = default(bool?), PublicAccess? publicAccess = default(PublicAccess?), System.DateTime? lastModifiedTime = default(System.DateTime?), string leaseStatus = default(string), string leaseState = default(string), string leaseDuration = default(string), IDictionary metadata = default(IDictionary), ImmutabilityPolicyProperties immutabilityPolicy = default(ImmutabilityPolicyProperties), LegalHoldProperties legalHold = default(LegalHoldProperties), bool? hasLegalHold = default(bool?), bool? hasImmutabilityPolicy = default(bool?)) + public BlobContainer(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string version = default(string), bool? deleted = default(bool?), System.DateTime? deletedTime = default(System.DateTime?), int? remainingRetentionDays = default(int?), string defaultEncryptionScope = default(string), bool? denyEncryptionScopeOverride = default(bool?), PublicAccess? publicAccess = default(PublicAccess?), System.DateTime? lastModifiedTime = default(System.DateTime?), string leaseStatus = default(string), string leaseState = default(string), string leaseDuration = default(string), IDictionary metadata = default(IDictionary), ImmutabilityPolicyProperties immutabilityPolicy = default(ImmutabilityPolicyProperties), LegalHoldProperties legalHold = default(LegalHoldProperties), bool? hasLegalHold = default(bool?), bool? hasImmutabilityPolicy = default(bool?)) : base(id, name, type, etag) { + Version = version; + Deleted = deleted; + DeletedTime = deletedTime; + RemainingRetentionDays = remainingRetentionDays; DefaultEncryptionScope = defaultEncryptionScope; DenyEncryptionScopeOverride = denyEncryptionScopeOverride; PublicAccess = publicAccess; @@ -98,6 +109,30 @@ public BlobContainer() /// partial void CustomInit(); + /// + /// Gets the version of the deleted blob container. + /// + [JsonProperty(PropertyName = "properties.version")] + public string Version { get; private set; } + + /// + /// Gets indicates whether the blob container was deleted. + /// + [JsonProperty(PropertyName = "properties.deleted")] + public bool? Deleted { get; private set; } + + /// + /// Gets blob container deletion time. + /// + [JsonProperty(PropertyName = "properties.deletedTime")] + public System.DateTime? DeletedTime { get; private set; } + + /// + /// Gets remaining retention days for soft deleted blob container. + /// + [JsonProperty(PropertyName = "properties.remainingRetentionDays")] + public int? RemainingRetentionDays { get; private set; } + /// /// Gets or sets default the container to use specified encryption /// scope for all writes. diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainerItem.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainerItem.cs index c3a4fdcf07a7..60adffe0a221 100644 --- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainerItem.cs +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainerItem.cs @@ -41,6 +41,13 @@ public ListContainerItem() /// Microsoft.Compute/virtualMachines or /// Microsoft.Storage/storageAccounts. /// Resource Etag. + /// The version of the deleted blob + /// container. + /// Indicates whether the blob container was + /// deleted. + /// Blob container deletion time. + /// Remaining retention days for + /// soft deleted blob container. /// Default the container to use /// specified encryption scope for all writes. /// Block override of @@ -74,9 +81,13 @@ public ListContainerItem() /// been created for this container. The hasImmutabilityPolicy public /// property is set to false by SRP if ImmutabilityPolicy has not been /// created for this container. - public ListContainerItem(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string defaultEncryptionScope = default(string), bool? denyEncryptionScopeOverride = default(bool?), PublicAccess? publicAccess = default(PublicAccess?), System.DateTime? lastModifiedTime = default(System.DateTime?), string leaseStatus = default(string), string leaseState = default(string), string leaseDuration = default(string), IDictionary metadata = default(IDictionary), ImmutabilityPolicyProperties immutabilityPolicy = default(ImmutabilityPolicyProperties), LegalHoldProperties legalHold = default(LegalHoldProperties), bool? hasLegalHold = default(bool?), bool? hasImmutabilityPolicy = default(bool?)) + public ListContainerItem(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string version = default(string), bool? deleted = default(bool?), System.DateTime? deletedTime = default(System.DateTime?), int? remainingRetentionDays = default(int?), string defaultEncryptionScope = default(string), bool? denyEncryptionScopeOverride = default(bool?), PublicAccess? publicAccess = default(PublicAccess?), System.DateTime? lastModifiedTime = default(System.DateTime?), string leaseStatus = default(string), string leaseState = default(string), string leaseDuration = default(string), IDictionary metadata = default(IDictionary), ImmutabilityPolicyProperties immutabilityPolicy = default(ImmutabilityPolicyProperties), LegalHoldProperties legalHold = default(LegalHoldProperties), bool? hasLegalHold = default(bool?), bool? hasImmutabilityPolicy = default(bool?)) : base(id, name, type, etag) { + Version = version; + Deleted = deleted; + DeletedTime = deletedTime; + RemainingRetentionDays = remainingRetentionDays; DefaultEncryptionScope = defaultEncryptionScope; DenyEncryptionScopeOverride = denyEncryptionScopeOverride; PublicAccess = publicAccess; @@ -97,6 +108,30 @@ public ListContainerItem() /// partial void CustomInit(); + /// + /// Gets the version of the deleted blob container. + /// + [JsonProperty(PropertyName = "properties.version")] + public string Version { get; private set; } + + /// + /// Gets indicates whether the blob container was deleted. + /// + [JsonProperty(PropertyName = "properties.deleted")] + public bool? Deleted { get; private set; } + + /// + /// Gets blob container deletion time. + /// + [JsonProperty(PropertyName = "properties.deletedTime")] + public System.DateTime? DeletedTime { get; private set; } + + /// + /// Gets remaining retention days for soft deleted blob container. + /// + [JsonProperty(PropertyName = "properties.remainingRetentionDays")] + public int? RemainingRetentionDays { get; private set; } + /// /// Gets or sets default the container to use specified encryption /// scope for all writes. diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainersInclude.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainersInclude.cs new file mode 100644 index 000000000000..40bcfc5f11c7 --- /dev/null +++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ListContainersInclude.cs @@ -0,0 +1,21 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Storage.Models +{ + + /// + /// Defines values for ListContainersInclude. + /// + public static class ListContainersInclude + { + public const string Deleted = "deleted"; + } +}