CSHARP-3252: AutoEncryptionOptions.ToString should handle guids correctly.

Author: rstam

src/MongoDB.Bson/IO/JsonWriter.cs

@@ -886,14 +886,24 @@ private string GuidToString(BsonBinarySubType subType, byte[] bytes, GuidReprese
                 var message = string.Format("Length of binary subtype {0} must be 16, not {1}.", subType, bytes.Length);
                 throw new ArgumentException(message);
             }
-            if (subType == BsonBinarySubType.UuidLegacy && guidRepresentation == GuidRepresentation.Standard)
+            if (subType == BsonBinarySubType.UuidLegacy)
             {
-                throw new ArgumentException("GuidRepresentation for binary subtype UuidLegacy must not be Standard.");
+                if (guidRepresentation == GuidRepresentation.Standard)
+                {
+                    throw new ArgumentException("GuidRepresentation for binary subtype UuidLegacy must not be Standard.");
+                }
             }
-            if (subType == BsonBinarySubType.UuidStandard && guidRepresentation != GuidRepresentation.Standard)
+            if (subType == BsonBinarySubType.UuidStandard)
             {
-                var message = string.Format("GuidRepresentation for binary subtype UuidStandard must be Standard, not {0}.", guidRepresentation);
-                throw new ArgumentException(message);
+                if (guidRepresentation == GuidRepresentation.Unspecified)
+                {
+                    guidRepresentation = GuidRepresentation.Standard;
+                }
+                if (guidRepresentation != GuidRepresentation.Standard)
+                {
+                    var message = string.Format("GuidRepresentation for binary subtype UuidStandard must be Standard, not {0}.", guidRepresentation);
+                    throw new ArgumentException(message);
+                }
             }
 
             if (guidRepresentation == GuidRepresentation.Unspecified)

src/MongoDB.Driver/Encryption/AutoEncryptionOptions.cs

@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Text;
 using MongoDB.Bson;
+using MongoDB.Bson.IO;
 using MongoDB.Driver.Core.Misc;
 using MongoDB.Shared;
 
@@ -172,20 +173,28 @@ public override int GetHashCode()
         public override string ToString()
         {
             var sb = new StringBuilder();
+            var jsonWriterSettings = new JsonWriterSettings();
+#pragma warning disable 618
+            if (BsonDefaults.GuidRepresentationMode == GuidRepresentationMode.V2)
+            {
+                jsonWriterSettings.GuidRepresentation = GuidRepresentation.Unspecified;
+            }
+#pragma warning restore 618
+
             sb.Append("{ ");
             sb.AppendFormat("BypassAutoEncryption : {0}, ", _bypassAutoEncryption);
-            sb.AppendFormat("KmsProviders : {0}, ", _kmsProviders.ToJson());
+            sb.AppendFormat("KmsProviders : {0}, ", _kmsProviders.ToJson(jsonWriterSettings));
             if (_keyVaultNamespace != null)
             {
                 sb.AppendFormat("KeyVaultNamespace : \"{0}\", ", _keyVaultNamespace.FullName);
             }
             if (_extraOptions != null)
             {
-                sb.AppendFormat("ExtraOptions : {0}, ", _extraOptions.ToJson());
+                sb.AppendFormat("ExtraOptions : {0}, ", _extraOptions.ToJson(jsonWriterSettings));
             }
             if (_schemaMap != null)
             {
-                sb.AppendFormat("SchemaMap : {0}, ", _schemaMap.ToJson());
+                sb.AppendFormat("SchemaMap : {0}, ", _schemaMap.ToJson(jsonWriterSettings));
             }
             sb.Remove(sb.Length - 2, 2);
             sb.Append(" }");

tests/MongoDB.Bson.Tests/IO/JsonWriterTests.cs

@@ -511,6 +511,22 @@ public void TestGuid(
 #pragma warning restore 618, 1062
         }
 
+        [Fact]
+        public void TestUuidStandardWhenGuidRepresentationIsUnspecified()
+        {
+            var guid = new Guid("00112233445566778899aabbccddeeff");
+            var guidBytes = GuidConverter.ToBytes(guid, GuidRepresentation.Standard);
+
+            var binary = new BsonBinaryData(guidBytes, BsonBinarySubType.UuidStandard); // GuidRepresentation is Unspecified
+            var result = binary.ToJson(writerSettings: new JsonWriterSettings()
+            {
+#pragma warning disable CS0618 // Type or member is obsolete
+                GuidRepresentation = GuidRepresentation.Unspecified
+#pragma warning restore CS0618 // Type or member is obsolete
+            });
+            result.Should().Be("UUID(\"00112233-4455-6677-8899-aabbccddeeff\")");
+        }
+
         [Fact]
         public void TestMaxKey()
         {

tests/MongoDB.Driver.Tests/AutoEncryptionOptionsTests.cs

@@ -0,0 +1,60 @@
+/* Copyright 2020–present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using MongoDB.Bson;
+using MongoDB.Driver.Encryption;
+using Xunit;
+
+namespace MongoDB.Driver.Tests
+{
+    public class AutoEncryptionOptionsTests
+    {
+        [Fact]
+        public void ToString_should_return_expected_result()
+        {
+            var guid = new Guid("00112233445566778899aabbccddeeff");
+            var guidBytes = GuidConverter.ToBytes(guid, GuidRepresentation.Standard);
+            var binary = new BsonBinaryData(guidBytes, BsonBinarySubType.UuidStandard);
+
+            var extraOptions = new Dictionary<string, object>()
+            {
+                { "mongocryptdURI", "testURI" },
+            };
+            var kmsProviders = new Dictionary<string, IReadOnlyDictionary<string, object>>()
+            {
+                { "provider1", new Dictionary<string, object>() { { "string", "test" } } },
+                { "provider2", new Dictionary<string, object>() { { "binary", binary.Bytes } } }
+            };
+            var schemaMap = new Dictionary<string, BsonDocument>()
+            {
+                { "coll1", new BsonDocument("string", "test") },
+                { "coll2", new BsonDocument("binary", binary) },
+            };
+
+            var subject = new AutoEncryptionOptions(
+                keyVaultNamespace: CollectionNamespace.FromFullName("db.coll"),
+                kmsProviders: kmsProviders,
+                bypassAutoEncryption: true,
+                extraOptions: extraOptions,
+                schemaMap: schemaMap);
+
+            var result = subject.ToString();
+            result.Should().Be("{ BypassAutoEncryption : True, KmsProviders : { \"provider1\" : { \"string\" : \"test\" }, \"provider2\" : { \"binary\" : { \"_t\" : \"System.Byte[]\", \"_v\" : new BinData(0, \"ABEiM0RVZneImaq7zN3u/w==\") } } }, KeyVaultNamespace : \"db.coll\", ExtraOptions : { \"mongocryptdURI\" : \"testURI\" }, SchemaMap : { \"coll1\" : { \"string\" : \"test\" }, \"coll2\" : { \"binary\" : UUID(\"00112233-4455-6677-8899-aabbccddeeff\") } } }");
+        }
+    }
+}