Migrated Data Lake to the new generator. (Azure#18366)

Author: seanmcc-msft

sdk/storage/Azure.Storage.Blobs/src/BlobBaseClient.cs

@@ -375,6 +375,7 @@ internal BlobBaseClient(
                 customerProvidedKey: options.CustomerProvidedKey,
                 encryptionScope: options.EncryptionScope);
 
+            _clientSideEncryption = options._clientSideEncryptionOptions?.Clone();
             _blobRestClient = BuildBlobRestClient(blobUri);
 
             BlobErrors.VerifyHttpsCustomerProvidedKey(_uri, _clientConfiguration.CustomerProvidedKey);

sdk/storage/Azure.Storage.Common/src/Shared/ClientDiagnostics.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Text.Json;
 using System.Xml;
 using System.Xml.Linq;
 using Azure.Storage;
@@ -37,24 +38,49 @@ ref IDictionary<string, string>? additionalInfo
 
             if (content != null)
             {
-                XDocument xml = XDocument.Parse(content);
-                errorCode = xml.Root.Element(Constants.ErrorCode).Value;
-                message = xml.Root.Element(Constants.ErrorMessage).Value;
+                // XML body
+                if (responseHeaders.ContentType.Contains(Constants.ContentTypeApplicationXml))
+                {
+                    XDocument xml = XDocument.Parse(content);
+                    errorCode = xml.Root.Element(Constants.ErrorCode).Value;
+                    message = xml.Root.Element(Constants.ErrorMessage).Value;
 
-                foreach (XElement element in xml.Root.Elements())
+                    foreach (XElement element in xml.Root.Elements())
+                    {
+                        switch (element.Name.LocalName)
+                        {
+                            case Constants.ErrorCode:
+                            case Constants.ErrorMessage:
+                                continue;
+                            default:
+                                additionalInfo[element.Name.LocalName] = element.Value;
+                                break;
+                        }
+                    }
+                }
+
+                // Json body
+                else if (responseHeaders.ContentType.Contains(Constants.ContentTypeApplicationJson))
                 {
-                    switch (element.Name.LocalName)
+                    JsonDocument json = JsonDocument.Parse(content);
+                    JsonElement error = json.RootElement.GetProperty(Constants.ErrorPropertyKey);
+
+                    IDictionary<string, string> details = default;
+                    if (error.TryGetProperty(Constants.DetailPropertyKey, out JsonElement detail))
                     {
-                        case Constants.ErrorCode:
-                        case Constants.ErrorMessage:
-                            continue;
-                        default:
-                            additionalInfo[element.Name.LocalName] = element.Value;
-                            break;
+                        details = new Dictionary<string, string>();
+                        foreach (JsonProperty property in detail.EnumerateObject())
+                        {
+                            details[property.Name] = property.Value.GetString();
+                        }
                     }
+
+                    message = error.GetProperty(Constants.MessagePropertyKey).GetString();
+                    errorCode = error.GetProperty(Constants.CodePropertyKey).GetString();
+                    additionalInfo = details;
                 }
             }
-            // Error response does not have a content body.
+            // No response body.
             else
             {
                 // The other headers will appear in the "Headers" section of the Exception message.

sdk/storage/Azure.Storage.Common/src/Shared/Constants.cs

@@ -94,6 +94,14 @@ internal static class Constants
         public const string CommaString = ",";
         public const char CommaChar = ',';
 
+        public const string ContentTypeApplicationXml = "application/xml";
+        public const string ContentTypeApplicationJson = "application/json";
+
+        public const string ErrorPropertyKey = "error";
+        public const string DetailPropertyKey = "detail";
+        public const string MessagePropertyKey = "message";
+        public const string CodePropertyKey = "code";
+
         public const string Iso8601Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ";
 
         /// <summary>

sdk/storage/Azure.Storage.Files.DataLake/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.7.0-beta.2 (Unreleased)
-
+- Changed error codes from numerical (404) to descriptive (PathNotFound).
 
 ## 12.7.0-beta.1 (2021-02-09)
 - Added support for service version 2020-06-12.

sdk/storage/Azure.Storage.Files.DataLake/src/Azure.Storage.Files.DataLake.csproj

@@ -42,6 +42,7 @@
     <Compile Include="..\..\Azure.Storage.Blobs\src\Sas\SasQueryParametersExtensions.cs" Link="Shared\Sas\KeySasQueryParametersExtensions.cs" />
     <Compile Include="$(AzureStorageSharedSources)AggregatingProgressIncrementer.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)Constants.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Compile Include="$(AzureStorageSharedSources)ClientDiagnostics.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)Errors.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)Errors.Clients.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)GeoRedundantReadPolicy.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
@@ -54,6 +55,7 @@
     <Compile Include="$(AzureStorageSharedSources)SasQueryParametersInternals.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)SharedAccessSignatureCredentials.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)SlicedStream.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Compile Include="$(AzureStorageSharedSources)StorageClientConfiguration.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)StorageClientOptions.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)StorageConnectionString.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
     <Compile Include="$(AzureStorageSharedSources)StorageCollectionEnumerator.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />

sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeClientConfiguration.cs

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core.Pipeline;
+using Azure.Storage.Shared;
+
+namespace Azure.Storage.Files.DataLake
+{
+    internal class DataLakeClientConfiguration : StorageClientConfiguration
+    {
+        public DataLakeClientOptions.ServiceVersion Version { get; internal set; }
+
+        public DataLakeClientConfiguration(
+            HttpPipeline pipeline,
+            StorageSharedKeyCredential sharedKeyCredential,
+            ClientDiagnostics clientDiagnostics,
+            DataLakeClientOptions.ServiceVersion version)
+            : base(pipeline, sharedKeyCredential, clientDiagnostics)
+        {
+            Version = version;
+        }
+    }
+}