[Internal] Msdata/Direct: Refactors msdata/direct branch with latest v3 master and Cosmos.Direct v3.31.2

Directory.Build.props

@@ -1,9 +1,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
-		<ClientOfficialVersion>3.34.0</ClientOfficialVersion>
-		<ClientPreviewVersion>3.34.0</ClientPreviewVersion>
+		<ClientOfficialVersion>3.35.0</ClientOfficialVersion>
+		<ClientPreviewVersion>3.35.0</ClientPreviewVersion>
 		<ClientPreviewSuffixVersion>preview</ClientPreviewSuffixVersion>
-		<DirectVersion>3.31.0</DirectVersion>
+		<DirectVersion>3.31.2</DirectVersion>
 		<EncryptionOfficialVersion>2.0.2</EncryptionOfficialVersion>
 		<EncryptionPreviewVersion>2.0.2</EncryptionPreviewVersion>
 		<EncryptionPreviewSuffixVersion>preview</EncryptionPreviewSuffixVersion>

Microsoft.Azure.Cosmos.Encryption.Custom/tests/Microsoft.Azure.Cosmos.Encryption.Custom.Tests/Contracts/DotNetSDKEncryptionCustomAPI.json

@@ -51,6 +51,13 @@
           ],
           "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
         },
+        "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken)[System.Runtime.CompilerServices.AsyncStateMachineAttribute(typeof(Microsoft.Azure.Cosmos.Encryption.Custom.CosmosDataEncryptionKeyProvider+<FetchDataEncryptionKeyWithoutRawKeyAsync>))]": {
+          "Type": "Method",
+          "Attributes": [
+            "AsyncStateMachineAttribute"
+          ],
+          "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
+        },
         "Void .ctor(Microsoft.Azure.Cosmos.Encryption.Custom.EncryptionKeyWrapProvider, Microsoft.Data.Encryption.Cryptography.EncryptionKeyStoreProvider, System.Nullable`1[System.TimeSpan])[System.ObsoleteAttribute(\"Please use the constructor with EncryptionKeyStoreProvider only.\")]": {
           "Type": "Constructor",
           "Attributes": [
@@ -398,6 +405,13 @@
               ],
               "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
             },
+            "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken)[System.Runtime.CompilerServices.AsyncStateMachineAttribute(typeof(Microsoft.Azure.Cosmos.Encryption.Custom.CosmosDataEncryptionKeyProvider+<FetchDataEncryptionKeyWithoutRawKeyAsync>))]": {
+              "Type": "Method",
+              "Attributes": [
+                "AsyncStateMachineAttribute"
+              ],
+              "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:False;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
+            },
             "Void .ctor(Microsoft.Azure.Cosmos.Encryption.Custom.EncryptionKeyWrapProvider, Microsoft.Data.Encryption.Cryptography.EncryptionKeyStoreProvider, System.Nullable`1[System.TimeSpan])[System.ObsoleteAttribute(\"Please use the constructor with EncryptionKeyStoreProvider only.\")]": {
               "Type": "Constructor",
               "Attributes": [
@@ -426,6 +440,11 @@
           "Type": "Method",
           "Attributes": [],
           "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:True;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
+        },
+        "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken)": {
+          "Type": "Method",
+          "Attributes": [],
+          "MethodInfo": "System.Threading.Tasks.Task`1[Microsoft.Azure.Cosmos.Encryption.Custom.DataEncryptionKey] FetchDataEncryptionKeyWithoutRawKeyAsync(System.String, System.String, System.Threading.CancellationToken);IsAbstract:True;IsStatic:False;IsVirtual:True;IsGenericMethod:False;IsConstructor:False;IsFinal:False;"
         }
       },
       "NestedTypes": {}

Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs

@@ -837,47 +837,6 @@ internal async Task ThrowIfRequestNeedsARetryPostPolicyRefreshAsync(
             }
         }
 
-        /// <summary>
-        /// This function handles the scenario where a container is deleted(say from different Client) and recreated with same Id but with different client encryption policy.
-        /// The idea is to have the container Rid cached and sent out as part of RequestOptions with Container Rid set in "x-ms-cosmos-intended-collection-rid" header.
-        /// So when the container being referenced here gets recreated we would end up with a stale encryption settings and container Rid and this would result in BadRequest( and a substatus 1024).
-        /// This would allow us to refresh the encryption settings and Container Rid, on the premise that the container recreated could possibly be configured with a new encryption policy.
-        /// </summary>
-        /// <param name="responseMessage"> Response message to validate. </param>
-        /// <param name="encryptionSettings"> Current cached encryption settings to refresh if required. </param>
-        /// <param name="encryptionDiagnosticsContext"> Encryption specific diagnostics. </param>
-        /// <param name="cancellationToken"> Cancellation token. </param>
-        internal async Task ThrowIfRequestNeedsARetryPostPolicyRefreshAsync(
-            ResponseMessage responseMessage,
-            EncryptionSettings encryptionSettings,
-            EncryptionDiagnosticsContext encryptionDiagnosticsContext,
-            CancellationToken cancellationToken)
-        {
-            if (responseMessage.StatusCode == HttpStatusCode.BadRequest &&
-                string.Equals(responseMessage.Headers.Get(Constants.SubStatusHeader), Constants.IncorrectContainerRidSubStatus))
-            {
-                // get the latest encryption settings.
-                await this.GetOrUpdateEncryptionSettingsFromCacheAsync(
-                   obsoleteEncryptionSettings: encryptionSettings,
-                   cancellationToken: cancellationToken);
-
-                if (encryptionDiagnosticsContext == null)
-                {
-                    throw new ArgumentNullException(nameof(encryptionDiagnosticsContext));
-                }
-
-                encryptionDiagnosticsContext.AddEncryptionDiagnosticsToResponseMessage(responseMessage);
-
-                throw new EncryptionCosmosException(
-                    "Operation has failed due to a possible mismatch in Client Encryption Policy configured on the container. Retrying may fix the issue. Please refer to https://aka.ms/CosmosClientEncryption for more details. " + responseMessage.ErrorMessage,
-                    HttpStatusCode.BadRequest,
-                    int.Parse(Constants.IncorrectContainerRidSubStatus),
-                    responseMessage.Headers.ActivityId,
-                    responseMessage.Headers.RequestCharge,
-                    responseMessage.Diagnostics);
-            }
-        }
-
         internal async Task<List<PatchOperation>> EncryptPatchOperationsAsync(
             IReadOnlyList<PatchOperation> patchOperations,
             EncryptionSettings encryptionSettings,

Microsoft.Azure.Cosmos.Encryption/src/EncryptionDatabaseExtensions.cs

@@ -121,7 +121,7 @@ public static async Task<ClientEncryptionKeyResponse> CreateClientEncryptionKeyA
 
             ClientEncryptionKeyProperties clientEncryptionKeyProperties = new ClientEncryptionKeyProperties(
                 clientEncryptionKeyId,
-                dataEncryptionKeyAlgorithm,
+                encryptionAlgorithm,
                 wrappedDataEncryptionKey,
                 encryptionKeyWrapMetadata);
 

Microsoft.Azure.Cosmos.Encryption/src/EncryptionType.cs

@@ -5,22 +5,10 @@
 namespace Microsoft.Azure.Cosmos.Encryption
 {
     /// <summary>
-<<<<<<<< HEAD:Microsoft.Azure.Cosmos.Encryption/src/MdeSupport/EncryptionType.cs
-    /// Represents the encryption algorithms supported for data encryption.
-    /// </summary>
-    /// <summary>
-    /// The type of data encryption.
-    /// </summary>
-    /// <remarks>
-    /// The two encryption types are Deterministic and Randomized.
-    /// Deterministic encryption always generates the same encrypted value for any given plain text value.
-    /// Randomized encryption uses a method that encrypts data in a less predictable manner. Randomized encryption is more secure.
-========
     /// Encryption types supported for data encryption.
     /// </summary>
     /// <remarks>
     /// See <see href="https://aka.ms/CosmosClientEncryption">client-side encryption documentation</see> for more details.
->>>>>>>> master:Microsoft.Azure.Cosmos.Encryption/src/EncryptionType.cs
     /// </remarks>
     public static class EncryptionType
     {