From eeafbea0921243a5868b81984e1083a07c1f75bc Mon Sep 17 00:00:00 2001 From: Dmitry Lukyanov Date: Sat, 4 Jun 2022 02:40:40 +0400 Subject: [PATCH] CSHARP-4188: Update expected FLE 2 find payloads in tests. (#811) --- src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj | 2 +- src/MongoDB.Driver/MongoDB.Driver.csproj | 2 +- tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs | 2 +- .../client-side-encryption/tests/fle2-Delete.json | 2 +- .../client-side-encryption/tests/fle2-Delete.yml | 2 +- .../tests/fle2-EncryptedFields-vs-jsonSchema.json | 2 +- .../tests/fle2-EncryptedFields-vs-jsonSchema.yml | 2 +- .../client-side-encryption/tests/fle2-FindOneAndUpdate.json | 4 ++-- .../client-side-encryption/tests/fle2-FindOneAndUpdate.yml | 4 ++-- .../client-side-encryption/tests/fle2-InsertFind-Indexed.json | 2 +- .../client-side-encryption/tests/fle2-InsertFind-Indexed.yml | 2 +- .../client-side-encryption/tests/fle2-Update.json | 4 ++-- .../client-side-encryption/tests/fle2-Update.yml | 4 ++-- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj b/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj index 665a58f4b4b..fe8d6eec28a 100644 --- a/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj +++ b/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj @@ -177,7 +177,7 @@ - + diff --git a/src/MongoDB.Driver/MongoDB.Driver.csproj b/src/MongoDB.Driver/MongoDB.Driver.csproj index 974cd06883c..31ddc558532 100644 --- a/src/MongoDB.Driver/MongoDB.Driver.csproj +++ b/src/MongoDB.Driver/MongoDB.Driver.csproj @@ -48,7 +48,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs b/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs index 04c847814a8..cf4bd70cbd4 100644 --- a/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs +++ b/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs @@ -38,7 +38,7 @@ public static void Libmongocrypt_library_should_provide_library_version() { var version = Library.Version; - version.Should().Be("1.5.0-rc0"); + version.Should().Be("1.5.0-rc1"); } [Fact] diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.json index 0e3e06396e5..790e8182952 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.json +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.json @@ -225,7 +225,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.yml index 6b6714233a7..ce36c1812c1 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.yml +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Delete.yml @@ -71,7 +71,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json index 1d3227ee7f0..69abfa7cfb7 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json @@ -230,7 +230,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.yml index 6b822ff7249..212a967b532 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.yml +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.yml @@ -72,7 +72,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.json index b31438876f9..b8088515caa 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.json +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.json @@ -230,7 +230,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } @@ -490,7 +490,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.yml index 96ce954bec1..0bb86346a87 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.yml +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-FindOneAndUpdate.yml @@ -70,7 +70,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } @@ -172,7 +172,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.json index 81a549590e7..142cacf2fd1 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.json +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.json @@ -226,7 +226,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.yml index 5b785d8cf23..5986c34b465 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.yml +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-InsertFind-Indexed.yml @@ -68,7 +68,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.json index 87830af32dd..66a291902a2 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.json +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.json @@ -232,7 +232,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } @@ -496,7 +496,7 @@ "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.yml index 19bb549b23b..41430e9748b 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.yml +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/fle2-Update.yml @@ -74,7 +74,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } } @@ -179,7 +179,7 @@ tests: "encryptedIndexed": { "$eq": { "$binary": { - "base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==", + "base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA", "subType": "06" } }