From f0c4e9d1e1821eadbd589cc42210a83f2147996d Mon Sep 17 00:00:00 2001 From: seanmcc-msft Date: Wed, 12 Feb 2020 20:39:20 -0800 Subject: [PATCH] Fixed issue where Storage generated code and swagger didn't align --- .../Azure.Storage.Blobs/src/BlobContainerClient.cs | 2 +- .../src/Generated/BlobRestClient.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs index 3465555a3932..e5a278d39d8b 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs @@ -919,7 +919,7 @@ private async Task> CreateInternal( Uri, access: publicAccessType, defaultEncryptionScope: encryptionScopeOptions?.DefaultEncryptionScope, - denyEncryptionScopeOverride: encryptionScopeOptions?.PreventEncryptionScopeOverride , + preventEncryptionScopeOverride: encryptionScopeOptions?.PreventEncryptionScopeOverride, version: Version.ToVersionString(), metadata: metadata, async: async, diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs index f36f6d8c3b83..2b83efa4156f 100644 --- a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs +++ b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs @@ -1135,7 +1135,7 @@ public static partial class Container /// Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information. /// Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled. /// Optional. Version 2019-07-07 and later. Specifies the default encryption scope to set on the container and use for all future writes. - /// Optional. Version 2019-07-07 and newer. If true, prevents any request from specifying a different encryption scope than the scope set on the container. + /// Optional. Version 2019-07-07 and newer. If true, prevents any request from specifying a different encryption scope than the scope set on the container. /// Whether to invoke the operation asynchronously. The default value is true. /// Operation name. /// Cancellation token. @@ -1150,7 +1150,7 @@ public static partial class Container System.Collections.Generic.IDictionary metadata = default, string requestId = default, string defaultEncryptionScope = default, - bool? denyEncryptionScopeOverride = default, + bool? preventEncryptionScopeOverride = default, bool async = true, string operationName = "ContainerClient.Create", System.Threading.CancellationToken cancellationToken = default) @@ -1169,7 +1169,7 @@ public static partial class Container metadata, requestId, defaultEncryptionScope, - denyEncryptionScopeOverride)) + preventEncryptionScopeOverride)) { if (async) { @@ -1209,7 +1209,7 @@ public static partial class Container /// Optional. Specifies a user-defined name-value pair associated with the blob. If no name-value pairs are specified, the operation will copy the metadata from the source blob or file to the destination blob. If one or more name-value pairs are specified, the destination blob is created with the specified metadata, and metadata is not copied from the source blob or file. Note that beginning with version 2009-09-19, metadata names must adhere to the naming rules for C# identifiers. See Naming and Referencing Containers, Blobs, and Metadata for more information. /// Provides a client-generated, opaque value with a 1 KB character limit that is recorded in the analytics logs when storage analytics logging is enabled. /// Optional. Version 2019-07-07 and later. Specifies the default encryption scope to set on the container and use for all future writes. - /// Optional. Version 2019-07-07 and newer. If true, prevents any request from specifying a different encryption scope than the scope set on the container. + /// Optional. Version 2019-07-07 and newer. If true, prevents any request from specifying a different encryption scope than the scope set on the container. /// The Container.CreateAsync Message. internal static Azure.Core.HttpMessage CreateAsync_CreateMessage( Azure.Core.Pipeline.HttpPipeline pipeline, @@ -1220,7 +1220,7 @@ internal static Azure.Core.HttpMessage CreateAsync_CreateMessage( System.Collections.Generic.IDictionary metadata = default, string requestId = default, string defaultEncryptionScope = default, - bool? denyEncryptionScopeOverride = default) + bool? preventEncryptionScopeOverride = default) { // Validation if (resourceUri == null) @@ -1253,9 +1253,9 @@ internal static Azure.Core.HttpMessage CreateAsync_CreateMessage( } if (requestId != null) { _request.Headers.SetValue("x-ms-client-request-id", requestId); } if (defaultEncryptionScope != null) { _request.Headers.SetValue("x-ms-default-encryption-scope", defaultEncryptionScope); } - if (denyEncryptionScopeOverride != null) { + if (preventEncryptionScopeOverride != null) { #pragma warning disable CA1308 // Normalize strings to uppercase - _request.Headers.SetValue("x-ms-deny-encryption-scope-override", denyEncryptionScopeOverride.Value.ToString(System.Globalization.CultureInfo.InvariantCulture).ToLowerInvariant()); + _request.Headers.SetValue("x-ms-deny-encryption-scope-override", preventEncryptionScopeOverride.Value.ToString(System.Globalization.CultureInfo.InvariantCulture).ToLowerInvariant()); #pragma warning restore CA1308 // Normalize strings to uppercase }