Skip to content

Fixed issue where Storage generated code and swagger didn't align #9946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanmcc-msft merged 1 commit into from
Feb 14, 2020
Merged

Fixed issue where Storage generated code and swagger didn't align #9946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,7 @@ private async Task<Response<BlobContainerInfo>> CreateInternal(
Uri,
access: publicAccessType,
defaultEncryptionScope: encryptionScopeOptions?.DefaultEncryptionScope,
denyEncryptionScopeOverride: encryptionScopeOptions?.PreventEncryptionScopeOverride ,
preventEncryptionScopeOverride: encryptionScopeOptions?.PreventEncryptionScopeOverride,
version: Version.ToVersionString(),
metadata: metadata,
async: async,
Expand Down
14 changes: 7 additions & 7 deletions sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ public static partial class Container
/// <param name="metadata">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.</param>
/// <param name="requestId">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.</param>
/// <param name="defaultEncryptionScope">Optional. Version 2019-07-07 and later. Specifies the default encryption scope to set on the container and use for all future writes.</param>
/// <param name="denyEncryptionScopeOverride">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.</param>
/// <param name="preventEncryptionScopeOverride">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.</param>
/// <param name="async">Whether to invoke the operation asynchronously. The default value is true.</param>
/// <param name="operationName">Operation name.</param>
/// <param name="cancellationToken">Cancellation token.</param>
Expand All @@ -1150,7 +1150,7 @@ public static partial class Container
System.Collections.Generic.IDictionary<string, string> 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)
Expand All @@ -1169,7 +1169,7 @@ public static partial class Container
metadata,
requestId,
defaultEncryptionScope,
denyEncryptionScopeOverride))
preventEncryptionScopeOverride))
{
if (async)
{
Expand Down Expand Up @@ -1209,7 +1209,7 @@ public static partial class Container
/// <param name="metadata">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.</param>
/// <param name="requestId">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.</param>
/// <param name="defaultEncryptionScope">Optional. Version 2019-07-07 and later. Specifies the default encryption scope to set on the container and use for all future writes.</param>
/// <param name="denyEncryptionScopeOverride">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.</param>
/// <param name="preventEncryptionScopeOverride">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.</param>
/// <returns>The Container.CreateAsync Message.</returns>
internal static Azure.Core.HttpMessage CreateAsync_CreateMessage(
Azure.Core.Pipeline.HttpPipeline pipeline,
Expand All @@ -1220,7 +1220,7 @@ internal static Azure.Core.HttpMessage CreateAsync_CreateMessage(
System.Collections.Generic.IDictionary<string, string> metadata = default,
string requestId = default,
string defaultEncryptionScope = default,
bool? denyEncryptionScopeOverride = default)
bool? preventEncryptionScopeOverride = default)
{
// Validation
if (resourceUri == null)
Expand Down Expand Up @@ -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
}

Expand Down