expect-continue header compat switch (Azure#43888)

jaschrep-msft · web-flow · commit 28cd2f878202 · 2024-05-09T13:36:52.000-04:00
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/CompatSwitches.cs b/sdk/storage/Azure.Storage.Common/src/Shared/CompatSwitches.cs
@@ -11,5 +11,10 @@ internal static class CompatSwitches
 
         public static bool DisableRequestConditionsValidation => _disableRequestConditionsValidation
             ??= AppContextSwitchHelper.GetConfigValue(Constants.DisableRequestConditionsValidationSwitchName, Constants.DisableRequestConditionsValidationEnvVar);
+
+        private static bool? _disableExpectContinueHeader;
+
+        public static bool DisableExpectContinueHeader => _disableExpectContinueHeader
+            ??= AppContextSwitchHelper.GetConfigValue(Constants.DisableExpectContinueHeaderSwitchName, Constants.DisableExpectContinueHeaderEnvVar);
     }
 }
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs b/sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs
@@ -123,6 +123,9 @@ internal static class Constants
         public const string DisableRequestConditionsValidationSwitchName = "Azure.Storage.DisableRequestConditionsValidation";
         public const string DisableRequestConditionsValidationEnvVar = "AZURE_STORAGE_DISABLE_REQUEST_CONDITIONS_VALIDATION";
 
+        public const string DisableExpectContinueHeaderSwitchName = "Azure.Storage.DisableExpectContinueHeader";
+        public const string DisableExpectContinueHeaderEnvVar = "AZURE_STORAGE_DISABLE_EXPECT_CONTINUE_HEADER";
+
         public const string DefaultScope = "/.default";
 
         /// <summary>
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/ExpectContinueOnThrottlePolicy.cs b/sdk/storage/Azure.Storage.Common/src/Shared/ExpectContinueOnThrottlePolicy.cs
@@ -24,7 +24,8 @@ public TimeSpan ThrottleInterval
     public override void OnSendingRequest(HttpMessage message)
     {
         if (message.Request.Content == null ||
-            (message.Request.Content.TryComputeLength(out long contentLength) && contentLength < ContentLengthThreshold))
+            (message.Request.Content.TryComputeLength(out long contentLength) && contentLength < ContentLengthThreshold) ||
+            CompatSwitches.DisableExpectContinueHeader)
         {
             return;
         }
diff --git a/sdk/storage/Azure.Storage.Common/src/Shared/ExpectContinuePolicy.cs b/sdk/storage/Azure.Storage.Common/src/Shared/ExpectContinuePolicy.cs
@@ -12,7 +12,7 @@ internal class ExpectContinuePolicy : HttpPipelineSynchronousPolicy
 
     public override void OnSendingRequest(HttpMessage message)
     {
-        if (message.Request.Content == null)
+        if (message.Request.Content == null || CompatSwitches.DisableExpectContinueHeader)
         {
             return;
         }
diff --git a/sdk/storage/Azure.Storage.Common/tests/Azure.Storage.Common.Tests.csproj b/sdk/storage/Azure.Storage.Common/tests/Azure.Storage.Common.Tests.csproj
@@ -29,6 +29,7 @@
     <Compile Include="$(AzureStorageSharedSources)BufferExtensions.cs" LinkBase="Shared" />
     <Compile Include="$(AzureStorageSharedSources)ChecksumCalculatingStream.cs" LinkBase="Shared" />
     <Compile Include="$(AzureStorageSharedSources)ContentHasher.cs" LinkBase="Shared" />
+    <Compile Include="$(AzureStorageSharedSources)CompatSwitches.cs" LinkBase="Shared" />
     <Compile Include="$(AzureStorageSharedSources)DisposableBucket.cs" LinkBase="Shared" />
     <Compile Include="$(AzureStorageSharedSources)ExpectContinuePolicy.cs" LinkBase="Shared" />
     <Compile Include="$(AzureStorageSharedSources)ExpectContinueOnThrottlePolicy.cs" LinkBase="Shared" />

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,10 @@ internal static class CompatSwitches`
`11`	`11`
`12`	`12`	`public static bool DisableRequestConditionsValidation => _disableRequestConditionsValidation`
`13`	`13`	`??= AppContextSwitchHelper.GetConfigValue(Constants.DisableRequestConditionsValidationSwitchName, Constants.DisableRequestConditionsValidationEnvVar);`
	`14`	`+`
	`15`	`+ private static bool? _disableExpectContinueHeader;`
	`16`	`+`
	`17`	`+ public static bool DisableExpectContinueHeader => _disableExpectContinueHeader`
	`18`	`+ ??= AppContextSwitchHelper.GetConfigValue(Constants.DisableExpectContinueHeaderSwitchName, Constants.DisableExpectContinueHeaderEnvVar);`
`14`	`19`	`}`
`15`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ public TimeSpan ThrottleInterval`
`24`	`24`	`public override void OnSendingRequest(HttpMessage message)`
`25`	`25`	`{`
`26`	`26`	`if (message.Request.Content == null \|\|`
`27`		`- (message.Request.Content.TryComputeLength(out long contentLength) && contentLength < ContentLengthThreshold))`
	`27`	`+ (message.Request.Content.TryComputeLength(out long contentLength) && contentLength < ContentLengthThreshold) \|\|`
	`28`	`+ CompatSwitches.DisableExpectContinueHeader)`
`28`	`29`	`{`
`29`	`30`	`return;`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ internal class ExpectContinuePolicy : HttpPipelineSynchronousPolicy`
`12`	`12`
`13`	`13`	`public override void OnSendingRequest(HttpMessage message)`
`14`	`14`	`{`
`15`		`- if (message.Request.Content == null)`
	`15`	`+ if (message.Request.Content == null \|\| CompatSwitches.DisableExpectContinueHeader)`
`16`	`16`	`{`
`17`	`17`	`return;`
`18`	`18`	`}`