merge?

Microsoft.Azure.Cosmos.Encryption.Custom/src/AeadAes/AeAesEncryptionProcessor.cs

@@ -13,6 +13,8 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
+#pragma warning disable IDE0057 // Use range operator
+#pragma warning disable VSTHRD103 // Call async methods when in an async method
     internal static class AeAesEncryptionProcessor
     {
         public static async Task<Stream> EncryptAsync(
@@ -65,6 +67,7 @@ public static async Task<Stream> EncryptAsync(
                     encryptionOptions.PathsToEncrypt);
 
             itemJObj.Add(Constants.EncryptedInfo, JObject.FromObject(encryptionProperties));
+
             input.Dispose();
             return EncryptionProcessor.BaseSerializer.ToStream(itemJObj);
         }
@@ -113,4 +116,7 @@ internal static async Task<DecryptionContext> DecryptContentAsync(
             return decryptionContext;
         }
     }
+
+#pragma warning restore IDE0057 // Use range operator
+#pragma warning restore VSTHRD103 // Call async methods when in an async method
 }

Microsoft.Azure.Cosmos.Encryption.Custom/src/AeadAes/AeadAes256CbcHmac256Algorithm.cs

@@ -10,6 +10,8 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
     using System.IO;
     using System.Security.Cryptography;
 
+#pragma warning disable SYSLIB0021 // Type or member is obsolete
+
     /// <summary>
     /// This class implements authenticated encryption algorithm with associated data as described in
     /// http://tools.ietf.org/html/draft-mcgrew-aead-aes-cbc-hmac-sha2-05 - specifically this implements
@@ -483,4 +485,6 @@ private static int GetCipherTextLength(int inputSize)
             return ((inputSize / BlockSizeInBytes) + 1) * BlockSizeInBytes;
         }
     }
+
+#pragma warning restore SYSLIB0021 // Type or member is obsolete
 }

Microsoft.Azure.Cosmos.Encryption.Custom/src/Common/CosmosJsonDotNetSerializer.cs

@@ -40,10 +40,14 @@ internal CosmosJsonDotNetSerializer(JsonSerializerSettings jsonSerializerSetting
         /// <returns>The object representing the deserialized stream</returns>
         public T FromStream<T>(Stream stream)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(stream);
+#else
             if (stream == null)
             {
                 throw new ArgumentNullException(nameof(stream));
             }
+#endif
 
             if (typeof(Stream).IsAssignableFrom(typeof(T)))
             {

Microsoft.Azure.Cosmos.Encryption.Custom/src/CompressionOptions.cs

@@ -0,0 +1,48 @@
+// ------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// ------------------------------------------------------------
+
+namespace Microsoft.Azure.Cosmos.Encryption.Custom
+{
+    using System.IO.Compression;
+
+    /// <summary>
+    /// Options for payload compression
+    /// </summary>
+    public class CompressionOptions
+    {
+        /// <summary>
+        /// Supported compression algorithms
+        /// </summary>
+        /// <remarks>Compression is only supported with .NET8.0+.</remarks>
+        public enum CompressionAlgorithm
+        {
+            /// <summary>
+            /// No compression
+            /// </summary>
+            None = 0,
+#if NET8_0_OR_GREATER
+
+            /// <summary>
+            /// Brotli compression
+            /// </summary>
+            Brotli = 1,
+#endif
+        }
+
+        /// <summary>
+        /// Gets or sets compression algorithm.
+        /// </summary>
+        public CompressionAlgorithm Algorithm { get; set; } = CompressionAlgorithm.None;
+
+        /// <summary>
+        /// Gets or sets compression level.
+        /// </summary>
+        public CompressionLevel CompressionLevel { get; set; } = CompressionLevel.Fastest;
+
+        /// <summary>
+        /// Gets or sets minimal property size for compression.
+        /// </summary>
+        public int MinimalCompressedLength { get; set; } = 128;
+    }
+}

Microsoft.Azure.Cosmos.Encryption.Custom/src/Constants.cs

@@ -13,6 +13,8 @@ internal static class Constants
         public const string EncryptionDekId = "_en";
         public const string EncryptionFormatVersion = "_ef";
         public const string EncryptedPaths = "_ep";
+        public const string CompressionAlgorithm = "_ce";
+        public const string CompressedEncryptedPaths = "_cp";
         public const int DekPropertiesDefaultTTLInMinutes = 120;
     }
 }

Microsoft.Azure.Cosmos.Encryption.Custom/src/CosmosDataEncryptionKeyProvider.cs

@@ -148,10 +148,14 @@ public async Task InitializeAsync(
                 throw new InvalidOperationException($"{nameof(CosmosDataEncryptionKeyProvider)} has already been initialized.");
             }
 
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(database);
+#else
             if (database == null)
             {
                 throw new ArgumentNullException(nameof(database));
             }
+#endif
 
             ContainerResponse containerResponse = await database.CreateContainerIfNotExistsAsync(
                 containerId,

Microsoft.Azure.Cosmos.Encryption.Custom/src/CosmosEncryptionAlgorithm.cs

@@ -21,7 +21,7 @@ public static class CosmosEncryptionAlgorithm
         /// MDE(Microsoft.Data.Encryption) Randomized AEAD_AES_256_CBC_HMAC_SHA256 Algorithm.
         /// As described <see href="http://tools.ietf.org/html/draft-mcgrew-aead-aes-cbc-hmac-sha2-05">here</see>.
         /// </summary>
-        public const string MdeAeadAes256CbcHmac256Randomized = "MdeAeadAes256CbcHmac256Randomized";
+        public const string MdeAeadAes256CbcHmac256Randomized = @"MdeAeadAes256CbcHmac256Randomized";
 
         /// <summary>
         /// Verify if the Encryption Algorithm is supported by Cosmos.

Microsoft.Azure.Cosmos.Encryption.Custom/src/DataEncryptionKey.cs

@@ -102,10 +102,14 @@ public static DataEncryptionKey Create(
             byte[] rawKey,
             string encryptionAlgorithm)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(rawKey);
+#else
             if (rawKey == null)
             {
                 throw new ArgumentNullException(nameof(rawKey));
             }
+#endif
 
 #pragma warning disable CS0618 // Type or member is obsolete
             if (!string.Equals(encryptionAlgorithm, CosmosEncryptionAlgorithm.AEAes256CbcHmacSha256Randomized))

Microsoft.Azure.Cosmos.Encryption.Custom/src/DataEncryptionKeyContainerCore.cs

@@ -67,10 +67,14 @@ public override async Task<ItemResponse<DataEncryptionKeyProperties>> CreateData
                 throw new ArgumentException(string.Format("Unsupported Encryption Algorithm {0}", encryptionAlgorithm), nameof(encryptionAlgorithm));
             }
 
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(encryptionKeyWrapMetadata);
+#else
             if (encryptionKeyWrapMetadata == null)
             {
                 throw new ArgumentNullException(nameof(encryptionKeyWrapMetadata));
             }
+#endif
 
             CosmosDiagnosticsContext diagnosticsContext = CosmosDiagnosticsContext.Create(requestOptions);
 
@@ -155,10 +159,14 @@ public override async Task<ItemResponse<DataEncryptionKeyProperties>> RewrapData
            ItemRequestOptions requestOptions = null,
            CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(newWrapMetadata);
+#else
             if (newWrapMetadata == null)
             {
                 throw new ArgumentNullException(nameof(newWrapMetadata));
             }
+#endif
 
             CosmosDiagnosticsContext diagnosticsContext = CosmosDiagnosticsContext.Create(requestOptions);
 

Microsoft.Azure.Cosmos.Encryption.Custom/src/DataEncryptionKeyContainerInlineCore.cs

@@ -78,10 +78,14 @@ public override Task<ItemResponse<DataEncryptionKeyProperties>> RewrapDataEncryp
                 throw new ArgumentNullException(nameof(id));
             }
 
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(newWrapMetadata);
+#else
             if (newWrapMetadata == null)
             {
                 throw new ArgumentNullException(nameof(newWrapMetadata));
             }
+#endif
 
             return TaskHelper.RunInlineIfNeededAsync(() =>
                 this.dataEncryptionKeyContainerCore.RewrapDataEncryptionKeyAsync(id, newWrapMetadata, encryptionAlgorithm, requestOptions, cancellationToken));

Microsoft.Azure.Cosmos.Encryption.Custom/src/DataEncryptionKeyFeedIterator{T}.cs

@@ -13,7 +13,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
 
     internal sealed class DataEncryptionKeyFeedIterator<T> : FeedIterator<T>
     {
-        private readonly FeedIterator feedIterator;
+        private readonly DataEncryptionKeyFeedIterator feedIterator;
         private readonly CosmosResponseFactory responseFactory;
 
         public DataEncryptionKeyFeedIterator(
@@ -57,7 +57,7 @@ public override async Task<FeedResponse<T>> ReadNextAsync(CancellationToken canc
 
                 if (responseMessage.IsSuccessStatusCode && responseMessage.Content != null)
                 {
-                    dataEncryptionKeyPropertiesList = this.ConvertResponseToDataEncryptionKeyPropertiesList(
+                    dataEncryptionKeyPropertiesList = DataEncryptionKeyFeedIterator<T>.ConvertResponseToDataEncryptionKeyPropertiesList(
                         responseMessage.Content);
 
                     return (responseMessage, dataEncryptionKeyPropertiesList);
@@ -67,7 +67,7 @@ public override async Task<FeedResponse<T>> ReadNextAsync(CancellationToken canc
             }
         }
 
-        private List<T> ConvertResponseToDataEncryptionKeyPropertiesList(
+        private static List<T> ConvertResponseToDataEncryptionKeyPropertiesList(
             Stream content)
         {
             JObject contentJObj = EncryptionProcessor.BaseSerializer.FromStream<JObject>(content);

Microsoft.Azure.Cosmos.Encryption.Custom/src/DecryptableFeedResponse.cs

@@ -45,10 +45,14 @@ internal static DecryptableFeedResponse<T> CreateResponse(
             ResponseMessage responseMessage,
             IReadOnlyCollection<T> resource)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(responseMessage);
+#else
             if (responseMessage == null)
             {
                 throw new ArgumentNullException(nameof(responseMessage));
             }
+#endif
 
             using (responseMessage)
             {

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

@@ -122,10 +122,14 @@ public override async Task<ResponseMessage> CreateItemStreamAsync(
             ItemRequestOptions requestOptions = null,
             CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(streamPayload);
+#else
             if (streamPayload == null)
             {
                 throw new ArgumentNullException(nameof(streamPayload));
             }
+#endif
 
             CosmosDiagnosticsContext diagnosticsContext = CosmosDiagnosticsContext.Create(requestOptions);
             using (diagnosticsContext.CreateScope("CreateItemStream"))
@@ -304,6 +308,10 @@ public override async Task<ItemResponse<T>> ReplaceItemAsync<T>(
             ItemRequestOptions requestOptions = null,
             CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(id);
+            ArgumentNullException.ThrowIfNull(item);
+#else
             if (id == null)
             {
                 throw new ArgumentNullException(nameof(id));
@@ -313,6 +321,7 @@ public override async Task<ItemResponse<T>> ReplaceItemAsync<T>(
             {
                 throw new ArgumentNullException(nameof(item));
             }
+#endif
 
             if (requestOptions is not EncryptionItemRequestOptions encryptionItemRequestOptions ||
                 encryptionItemRequestOptions.EncryptionOptions == null)
@@ -384,6 +393,10 @@ public override async Task<ResponseMessage> ReplaceItemStreamAsync(
             ItemRequestOptions requestOptions = null,
             CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(id);
+            ArgumentNullException.ThrowIfNull(streamPayload);
+#else
             if (id == null)
             {
                 throw new ArgumentNullException(nameof(id));
@@ -393,6 +406,7 @@ public override async Task<ResponseMessage> ReplaceItemStreamAsync(
             {
                 throw new ArgumentNullException(nameof(streamPayload));
             }
+#endif
 
             CosmosDiagnosticsContext diagnosticsContext = CosmosDiagnosticsContext.Create(requestOptions);
             using (diagnosticsContext.CreateScope("ReplaceItemStream"))
@@ -428,11 +442,6 @@ private async Task<ResponseMessage> ReplaceItemHelperAsync(
                     cancellationToken);
             }
 
-            if (partitionKey == null)
-            {
-                throw new NotSupportedException($"{nameof(partitionKey)} cannot be null for operations using {nameof(EncryptionContainer)}.");
-            }
-
             streamPayload = await EncryptionProcessor.EncryptAsync(
                 streamPayload,
                 this.Encryptor,
@@ -536,10 +545,14 @@ public override async Task<ResponseMessage> UpsertItemStreamAsync(
             ItemRequestOptions requestOptions = null,
             CancellationToken cancellationToken = default)
         {
+#if NET8_0_OR_GREATER
+            ArgumentNullException.ThrowIfNull(streamPayload);
+#else
             if (streamPayload == null)
             {
                 throw new ArgumentNullException(nameof(streamPayload));
             }
+#endif
 
             CosmosDiagnosticsContext diagnosticsContext = CosmosDiagnosticsContext.Create(requestOptions);
             using (diagnosticsContext.CreateScope("UpsertItemStream"))
@@ -572,11 +585,6 @@ private async Task<ResponseMessage> UpsertItemHelperAsync(
                     cancellationToken);
             }
 
-            if (partitionKey == null)
-            {
-                throw new NotSupportedException($"{nameof(partitionKey)} cannot be null for operations using {nameof(EncryptionContainer)}.");
-            }
-
             streamPayload = await EncryptionProcessor.EncryptAsync(
                 streamPayload,
                 this.Encryptor,

Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionExceptionFactory.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
 
     internal static class EncryptionExceptionFactory
     {
+#pragma warning disable CA2208 // Instantiate argument exceptions correctly
         internal static ArgumentException InvalidKeySize(string algorithmName, int actualKeylength, int expectedLength)
         {
             return new ArgumentException(
@@ -28,6 +29,7 @@ internal static ArgumentException InvalidAlgorithmVersion(byte actual, byte expe
                 $"Invalid encryption algorithm version; actual: {actual:X2}, expected: {expected:X2}.",
                 "cipherText");
         }
+#pragma warning restore CA2208 // Instantiate argument exceptions correctly
 
         internal static ArgumentException InvalidAuthenticationTag()
         {

Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionFeedIterator{T}.cs

@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
 
     internal sealed class EncryptionFeedIterator<T> : FeedIterator<T>
     {
-        private readonly FeedIterator feedIterator;
+        private readonly EncryptionFeedIterator feedIterator;
         private readonly CosmosResponseFactory responseFactory;
 
         public EncryptionFeedIterator(
@@ -31,8 +31,7 @@ public override async Task<FeedResponse<T>> ReadNextAsync(CancellationToken canc
             if (typeof(T) == typeof(DecryptableItem))
             {
                 IReadOnlyCollection<T> resource;
-                EncryptionFeedIterator encryptionFeedIterator = this.feedIterator as EncryptionFeedIterator;
-                (responseMessage, resource) = await encryptionFeedIterator.ReadNextWithoutDecryptionAsync<T>(cancellationToken);
+                (responseMessage, resource) = await this.feedIterator.ReadNextWithoutDecryptionAsync<T>(cancellationToken);
 
                 return DecryptableFeedResponse<T>.CreateResponse(
                     responseMessage,

Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionKeyWrapMetadata.cs

@@ -114,18 +114,5 @@ public bool Equals(EncryptionKeyWrapMetadata other)
                    this.Value == other.Value &&
                    this.Name == other.Name;
         }
-
-        internal string GetName(EncryptionKeyWrapMetadata encryptionKeyWrapMetadata)
-        {
-            /* A legacy DEK may not have a Name value in meta-data*/
-            if (string.IsNullOrWhiteSpace(encryptionKeyWrapMetadata.Name))
-            {
-                return encryptionKeyWrapMetadata.Value;
-            }
-            else
-            {
-                return encryptionKeyWrapMetadata.Name;
-            }
-        }
     }
 }