azure-sdk
diff --git a/‎sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs‎
Lines changed: 108 additions & 4 deletions b/‎sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs‎
Lines changed: 108 additions & 4 deletions
diff --git a/‎sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs‎
Lines changed: 8 additions & 8 deletions b/‎sdk/storage/Azure.Storage.Blobs/src/BlockBlobClient.cs‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎sdk/storage/Azure.Storage.Blobs/src/BlobClientConfiguration.cs‎ renamed to ‎sdk/storage/Azure.Storage.Blobs/src/Shared/BlobClientConfiguration.cs‎
Lines changed: 31 additions & 0 deletions b/‎sdk/storage/Azure.Storage.Blobs/src/BlobClientConfiguration.cs‎ renamed to ‎sdk/storage/Azure.Storage.Blobs/src/Shared/BlobClientConfiguration.cs‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎sdk/storage/Azure.Storage.Blobs/src/BlobErrors.cs‎ renamed to ‎sdk/storage/Azure.Storage.Blobs/src/Shared/BlobErrors.cs‎ b/‎sdk/storage/Azure.Storage.Blobs/src/BlobErrors.cs‎ renamed to ‎sdk/storage/Azure.Storage.Blobs/src/Shared/BlobErrors.cs‎
diff --git a/‎sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs‎
Lines changed: 2 additions & 0 deletions b/‎sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs‎
Lines changed: 2 additions & 0 deletions
@@ -7,6 +7,7 @@
 using System.IO;
 using System.Linq;
 using System.Net.Http.Headers;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
@@ -21,6 +22,13 @@
 
 #pragma warning disable SA1402  // File may only contain a single type
 
+[assembly: InternalsVisibleTo("Azure.Storage.DataMovement.Blobs, PublicKey=" +
+    "0024000004800000940000000602000000240000525341310004000001000100d15ddcb2968829" +
+    "5338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc" +
+    "012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265" +
+    "e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593d" +
+    "aa7b11b4")]
+
 namespace Azure.Storage.Blobs.Specialized
 {
     /// <summary>
@@ -240,7 +248,7 @@ public BlobBaseClient(string connectionString, string blobContainerName, string
         /// every request.
         /// </param>
         public BlobBaseClient(Uri blobUri, BlobClientOptions options = default)
-            : this(blobUri, (HttpPipelinePolicy)null, options, null)
+            : this(blobUri, (HttpPipelinePolicy)null, options, storageSharedKeyCredential: null)
         {
         }
 
@@ -263,7 +271,7 @@ public BlobBaseClient(Uri blobUri, BlobClientOptions options = default)
         /// every request.
         /// </param>
         public BlobBaseClient(Uri blobUri, StorageSharedKeyCredential credential, BlobClientOptions options = default)
-            : this(blobUri, credential.AsPolicy(), options, credential)
+            : this(blobUri, credential.AsPolicy(), options, storageSharedKeyCredential: credential)
         {
         }
 
@@ -290,7 +298,7 @@ public BlobBaseClient(Uri blobUri, StorageSharedKeyCredential credential, BlobCl
         /// This constructor should only be used when shared access signature needs to be updated during lifespan of this client.
         /// </remarks>
         public BlobBaseClient(Uri blobUri, AzureSasCredential credential, BlobClientOptions options = default)
-            : this(blobUri, credential.AsPolicy<BlobUriBuilder>(blobUri), options, null)
+            : this(blobUri, credential.AsPolicy<BlobUriBuilder>(blobUri), options, storageSharedKeyCredential: null)
         {
         }
 
@@ -313,11 +321,71 @@ public BlobBaseClient(Uri blobUri, AzureSasCredential credential, BlobClientOpti
         /// every request.
         /// </param>
         public BlobBaseClient(Uri blobUri, TokenCredential credential, BlobClientOptions options = default)
-            : this(blobUri, credential.AsPolicy(options), options, null)
+            : this(blobUri, credential.AsPolicy(options), options, credential)
         {
             Errors.VerifyHttpsTokenAuth(blobUri);
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BlobBaseClient"/>
+        /// class.
+        /// </summary>
+        /// <param name="blobUri">
+        /// A <see cref="Uri"/> referencing the blob that includes the
+        /// name of the account, the name of the container, and the name of
+        /// the blob.
+        /// This is likely to be similar to "https://{account_name}.blob.core.windows.net/{container_name}/{blob_name}".
+        /// </param>
+        /// <param name="authentication">
+        /// An optional authentication policy used to sign requests.
+        /// </param>
+        /// <param name="options">
+        /// Optional client options that define the transport pipeline
+        /// policies for authentication, retries, etc., that are applied to
+        /// every request.
+        /// </param>
+        /// <param name="tokenCredential">
+        /// The token credential used to sign requests.
+        /// </param>
+        internal BlobBaseClient(
+            Uri blobUri,
+            HttpPipelinePolicy authentication,
+            BlobClientOptions options,
+            TokenCredential tokenCredential)
+        {
+            Argument.AssertNotNull(blobUri, nameof(blobUri));
+            options ??= new BlobClientOptions();
+            _uri = blobUri;
+            if (!string.IsNullOrEmpty(blobUri.Query))
+            {
+                UriQueryParamsCollection queryParamsCollection = new UriQueryParamsCollection(blobUri.Query);
+                if (queryParamsCollection.ContainsKey(Constants.SnapshotParameterName))
+                {
+                    _snapshot = System.Web.HttpUtility.ParseQueryString(blobUri.Query).Get(Constants.SnapshotParameterName);
+                }
+                if (queryParamsCollection.ContainsKey(Constants.VersionIdParameterName))
+                {
+                    _blobVersionId = System.Web.HttpUtility.ParseQueryString(blobUri.Query).Get(Constants.VersionIdParameterName);
+                }
+            }
+
+            _clientConfiguration = new BlobClientConfiguration(
+                pipeline: options.Build(authentication),
+                tokenCredential: tokenCredential,
+                clientDiagnostics: new StorageClientDiagnostics(options),
+                version: options.Version,
+                customerProvidedKey: options.CustomerProvidedKey,
+                transferValidation: options.TransferValidation,
+                encryptionScope: options.EncryptionScope,
+                trimBlobNameSlashes: options.TrimBlobNameSlashes);
+
+            _clientSideEncryption = options._clientSideEncryptionOptions?.Clone();
+            _blobRestClient = BuildBlobRestClient(blobUri);
+
+            BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _clientConfiguration.CustomerProvidedKey);
+            BlobErrors.VerifyCpkAndEncryptionScopeNotBothSet(_clientConfiguration.CustomerProvidedKey, _clientConfiguration.EncryptionScope);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BlobBaseClient"/>
         /// class.
@@ -574,6 +642,42 @@ private void SetNameFieldsIfNull()
             }
         }
 
+        #region internal static accessors for Azure.Storage.DataMovement.Blobs
+        /// <summary>
+        /// Get a <see cref="BlobBaseClient"/>'s <see cref="TokenCredential"/>
+        /// for passing the authorization when performing service to service copy
+        /// where OAuth is necessary to authenticate the source.
+        /// </summary>
+        /// <param name="client">The BlobServiceClient.</param>
+        /// <returns>The BlobServiceClient's HttpPipeline.</returns>
+        internal static TokenCredential GetTokenCredential(BlobBaseClient client) =>
+            client.ClientConfiguration.OAuthTokenCredential;
+
+        /// <summary>
+        /// Get a <see cref="BlobBaseClient"/>'s <see cref="BlobClientOptions"/>
+        /// for creating child clients.
+        /// </summary>
+        /// <param name="client">The BlobServiceClient.</param>
+        /// <returns>The BlobServiceClient's BlobClientOptions.</returns>
+        internal static BlobClientOptions GetClientOptions(BlobBaseClient client) =>
+            new BlobClientOptions(client.ClientConfiguration.Version)
+            {
+                // We only use this for communicating diagnostics, at the moment
+                Diagnostics =
+                {
+                    IsDistributedTracingEnabled = client.ClientConfiguration.ClientDiagnostics.IsActivityEnabled
+                }
+            };
+
+        /// <summary>
+        /// Get a <see cref="BlobBaseClient"/>'s <see cref="BlobClientOptions"/>
+        /// for creating child clients.
+        /// </summary>
+        /// <param name="client">The BlobServiceClient.</param>
+        /// <returns>The BlobServiceClient's BlobClientOptions.</returns>
+        internal static bool GetUsingClientSideEncryption(BlobBaseClient client) => client.UsingClientSideEncryption;
+        #endregion protected static accessors for Azure.Storage.DataMovement.Blobs
+
         ///// <summary>
         ///// Creates a clone of this instance that references a version ID rather than the base blob.
         ///// </summary>
 
@@ -351,14 +351,14 @@ protected static BlockBlobClient CreateClient(Uri blobUri, BlobClientOptions opt
             return new BlockBlobClient(
                 blobUri,
                 new BlobClientConfiguration(
-                    pipeline,
-                    null,
-                    new StorageClientDiagnostics(options),
-                    options.Version,
-                    options.CustomerProvidedKey,
-                    options.TransferValidation,
-                    null,
-                    options.TrimBlobNameSlashes));
+                    pipeline: pipeline,
+                    sharedKeyCredential: null,
+                    clientDiagnostics: new StorageClientDiagnostics(options),
+                    version: options.Version,
+                    customerProvidedKey: options.CustomerProvidedKey,
+                    transferValidation: options.TransferValidation,
+                    encryptionScope: null,
+                    trimBlobNameSlashes: options.TrimBlobNameSlashes));
         }
 
         private static void AssertNoClientSideEncryption(BlobClientOptions options)
 
@@ -4,16 +4,29 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Azure.Core;
 using Azure.Core.Pipeline;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Shared;
 
 namespace Azure.Storage.Blobs
 {
+    /// <summary>
+    /// Provides the configurations to connecting to the Blob Service and to create the Blob Clients
+    /// </summary>
     internal class BlobClientConfiguration : StorageClientConfiguration
     {
+        /// <summary>
+        /// The versions of Azure Blob Storage supported by this client
+        /// library.  For more, see
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/versioning-for-the-azure-storage-services">
+        /// Versioning for Azure Storage Services</see>.
+        /// </summary>
         public virtual BlobClientOptions.ServiceVersion Version { get; internal set; }
 
+        /// <summary>
+        /// The encryption key to be used with client provided key server-side encryption.
+        /// </summary>
         public virtual CustomerProvidedKey? CustomerProvidedKey { get; internal set; }
 
         public virtual TransferValidationOptions TransferValidation { get; internal set; }
@@ -22,6 +35,24 @@ internal class BlobClientConfiguration : StorageClientConfiguration
 
         public bool TrimBlobNameSlashes { get; internal set; }
 
+        public BlobClientConfiguration(
+            HttpPipeline pipeline,
+            TokenCredential tokenCredential,
+            ClientDiagnostics clientDiagnostics,
+            BlobClientOptions.ServiceVersion version,
+            CustomerProvidedKey? customerProvidedKey,
+            TransferValidationOptions transferValidation,
+            string encryptionScope,
+            bool trimBlobNameSlashes)
+            : base(pipeline, tokenCredential, clientDiagnostics)
+        {
+            Version = version;
+            CustomerProvidedKey = customerProvidedKey;
+            TransferValidation = transferValidation;
+            EncryptionScope = encryptionScope;
+            TrimBlobNameSlashes = trimBlobNameSlashes;
+        }
+
         public BlobClientConfiguration(
             HttpPipeline pipeline,
             StorageSharedKeyCredential sharedKeyCredential,
 
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using System;
 using System.Collections.Generic;
 
 namespace Azure.Storage
@@ -231,6 +232,7 @@ internal static class Block
             internal static class Page
             {
                 public const int PageSizeBytes = 512;
+                public const int MaxPageBlockBytes = 4 * Constants.MB; // 4MB
             }
 
             internal static class Container
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
	`4`	`+using System;`
`4`	`5`	`using System.Collections.Generic;`
`5`	`6`
`6`	`7`	`namespace Azure.Storage`
`@@ -231,6 +232,7 @@ internal static class Block`
`231`	`232`	`internal static class Page`
`232`	`233`	`{`
`233`	`234`	`public const int PageSizeBytes = 512;`
	`235`	`+ public const int MaxPageBlockBytes = 4 * Constants.MB; // 4MB`
`234`	`236`	`}`
`235`	`237`
`236`	`238`	`internal static class Container`