Storage API Changes (Part 2 - Simplify the Storage user experience) (#…

…6749) Add simple Upload, Download, and BlobClient
Azure · Jul 2, 2019 · 96877bd · 96877bd
1 parent bc7c784
commit 96877bd
Show file tree

Hide file tree

Showing 564 changed files with 118,105 additions and 4,486 deletions.
diff --git a/sdk/core/Azure.Core/tests/ClientTestBaseTests.cs b/sdk/core/Azure.Core/tests/ClientTestBaseTests.cs
@@ -56,7 +56,7 @@ public void ThrowsForSyncCallsInAsyncContext()
             {
                 var client = InstrumentClient(new TestClient());
                 var exception = Assert.Throws<InvalidOperationException>(() => client.Method(123));
-                Assert.AreEqual("Async method call expected", exception.Message);
+                Assert.AreEqual("Async method call expected for Method", exception.Message);
             }
         }
 

diff --git a/sdk/core/Azure.Core/tests/TestFramework/ClientTestBase.cs b/sdk/core/Azure.Core/tests/TestFramework/ClientTestBase.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using Castle.DynamicProxy;
 using NUnit.Framework;
@@ -32,6 +33,8 @@ public virtual TClient CreateClient<TClient>(params object[] args) where TClient
 
         public virtual TClient InstrumentClient<TClient>(TClient client) where TClient: class
         {
+            Debug.Assert(!client.GetType().Name.EndsWith("Proxy"), $"{nameof(client)} was already instrumented");
+
             if (ClientValidation<TClient>.Validated == false)
             {
                 foreach (var methodInfo in typeof(TClient).GetMethods(BindingFlags.Instance | BindingFlags.Public))

diff --git a/sdk/core/Azure.Core/tests/TestFramework/UseSyncMethodsInterceptor.cs b/sdk/core/Azure.Core/tests/TestFramework/UseSyncMethodsInterceptor.cs
@@ -48,7 +48,7 @@ public void Intercept(IInvocation invocation)
                 // Check if there is an async alternative to sync call
                 if (asyncAlternative != null)
                 {
-                    throw new InvalidOperationException("Async method call expected");
+                    throw new InvalidOperationException($"Async method call expected for {methodName}");
                 }
                 else
                 {

diff --git a/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs b/sdk/storage/Azure.Storage.Blobs/src/AppendBlobClient.cs
@@ -30,7 +30,7 @@ namespace Azure.Storage.Blobs.Specialized
     /// maximum size of an append blob is therefore slightly more than 195 GB
     /// (4 MB X 50,000 blocks).
     /// </summary>
-    public class AppendBlobClient : BlobClient
+    public class AppendBlobClient : BlobBaseClient
     {
         /// <summary>
         /// <see cref="AppendBlobMaxAppendBlockBytes"/> indicates the maximum
@@ -546,15 +546,16 @@ private async Task<Response<BlobAppendInfo>> AppendBlockAsync(
                 {
                     content = content.WithNoDispose().WithProgress(progressHandler);
                     var appendAttempt = 0;
-                    return await ReliableOperation.DoAsync(
+                    return await ReliableOperation.DoSyncOrAsync(
+                        async,
                         reset: () => content.Seek(0, SeekOrigin.Begin),
                         predicate: e => true,
                         maximumRetries: Constants.MaxReliabilityRetries,
                         operation:
-                            async () =>
+                            () =>
                             {
                                 this.Pipeline.LogTrace($"Append attempt {++appendAttempt}");
-                                return await BlobRestClient.AppendBlob.AppendBlockAsync(
+                                return BlobRestClient.AppendBlob.AppendBlockAsync(
                                     this.Pipeline,
                                     this.Uri,
                                     body: content,
@@ -568,8 +569,7 @@ private async Task<Response<BlobAppendInfo>> AppendBlockAsync(
                                     ifMatch: accessConditions?.HttpAccessConditions?.IfMatch,
                                     ifNoneMatch: accessConditions?.HttpAccessConditions?.IfNoneMatch,                                    
                                     async: async,
-                                    cancellationToken: cancellationToken)
-                                    .ConfigureAwait(false);
+                                    cancellationToken: cancellationToken);
                             },
                         cleanup: () => { })
                         .ConfigureAwait(false);
@@ -854,6 +854,6 @@ public static partial class SpecializedBlobExtensions
         public static AppendBlobClient GetAppendBlobClient(
             this BlobContainerClient client,
             string blobName)
-            => new AppendBlobClient(client.Uri.AppendToPath(blobName), client._pipeline);
+            => new AppendBlobClient(client.Uri.AppendToPath(blobName), client.Pipeline);
     }
 }