CSHARP-4281: Update key material for Azure and KMIP datakeys in RewrapManyDataKey. (#857)

DmitryLukyanov · JamesKovacs · commit 8f99c97a1d5f · 2022-07-29T18:10:32.000-06:00
diff --git a/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj b/src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj
@@ -177,7 +177,7 @@
   <ItemGroup>
     <PackageReference Include="DnsClient" Version="1.6.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="All" />
-    <PackageReference Include="MongoDB.Libmongocrypt" Version="1.5.4" />
+    <PackageReference Include="MongoDB.Libmongocrypt" Version="1.5.5" />
     <PackageReference Include="SharpCompress" Version="0.30.1" />
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
diff --git a/src/MongoDB.Driver/MongoDB.Driver.csproj b/src/MongoDB.Driver/MongoDB.Driver.csproj
@@ -48,7 +48,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" PrivateAssets="All" />
-    <PackageReference Include="MongoDB.Libmongocrypt" Version="1.5.4" />
+    <PackageReference Include="MongoDB.Libmongocrypt" Version="1.5.5" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs b/tests/MongoDB.Driver.Tests/Packaging/PackagingTests.cs
@@ -30,6 +30,7 @@ namespace MongoDB.Driver.Tests.Packaging
     /// Also, use only public classes or reflection here.
     /// </summary>
     [Trait("Category", "Packaging")]
+    [Trait("Category", "CSFLE")]
     public class PackagingTests
     {
         // keep these tests in sync with CONSOLE_TEST's Main method
@@ -38,7 +39,7 @@ public static void Libmongocrypt_library_should_provide_library_version()
         {
             var version = Library.Version;
 
-            version.Should().Be("1.5.1");
+            version.Should().Be("1.5.2");
         }
 
         [Fact]
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionUnifiedTestRunner.cs
@@ -42,7 +42,7 @@ public void Run(JsonDrivenTestCase testCase)
             var testCaseNameLower = testCase.Name.ToLower();
 
             if (testCaseNameLower.Contains("kmip") ||
-                testCase.Shared.ToString().ToLower().Contains("kmip")) // also calls kmip kms
+                testCase.Shared.ToString().ToLower().Contains("kmip"))
             {
                 // kmip requires configuring kms mock server
                 RequireEnvironment.Check().EnvironmentVariable("KMS_MOCK_SERVERS_ENABLED");
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/createDataKey-kms_providers-invalid.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/createDataKey-kms_providers-invalid.json
@@ -1,5 +1,5 @@
 {
-  "description": "createDataKey-provider-invalid",
+  "description": "createDataKey-kms_providers-invalid",
   "schemaVersion": "1.8",
   "runOnRequirements": [
     {
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/createDataKey-kms_providers-invalid.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/createDataKey-kms_providers-invalid.yml
@@ -1,4 +1,4 @@
-description: createDataKey-provider-invalid
+description: createDataKey-kms_providers-invalid
 
 schemaVersion: "1.8"
 
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/rewrapManyDataKey.json b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/rewrapManyDataKey.json
@@ -1,5 +1,5 @@
 {
-  "description": "rewrapManyDataKey-kms_providers",
+  "description": "rewrapManyDataKey",
   "schemaVersion": "1.8",
   "runOnRequirements": [
     {
@@ -128,7 +128,7 @@
           ],
           "keyMaterial": {
             "$binary": {
-              "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEGkNTybTc7Eyif0f+qqE0lAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDB2j78AeuIQxcRh8cQIBEIB7vj9buHEaT7XHFIsKBJiyzZRmNnjvqMK5LSdzonKdx97jlqauvPvTDXSsdQDcspUs5oLrGmAXpbFResscxmbwZoKgUtWiuIOpeAcYuszCiMKt15s1WIMLDXUhYtfCmhRhekvgHnRAaK4HJMlGE+lKJXYI84E0b86Cd/g+",
+              "base64": "pr01l7qDygUkFE/0peFwpnNlv3iIy8zrQK38Q9i12UCN2jwZHDmfyx8wokiIKMb9kAleeY+vnt3Cf1MKu9kcDmI+KxbNDd+V3ytAAGzOVLDJr77CiWjF9f8ntkXRHrAY9WwnVDANYkDwXlyU0Y2GQFTiW65jiQhUtYLYH63Tk48SsJuQvnWw1Q+PzY8ga+QeVec8wbcThwtm+r2IHsCFnc72Gv73qq7weISw+O4mN08z3wOp5FOS2ZM3MK7tBGmPdBcktW7F8ODGsOQ1FU53OrWUnyX2aTi2ftFFFMWVHqQo7EYuBZHru8RRODNKMyQk0BFfKovAeTAVRv9WH9QU7g==",
               "subType": "00"
             }
           },
@@ -196,7 +196,7 @@
           ],
           "keyMaterial": {
             "$binary": {
-              "base64": "VoI9J8HusQ3u2gT9i8Awgg/6W4/igvLwRzn3SRDGx0Dl/1ayDMubphOw0ONPVKfuvS6HL3e4gAoCJ/uEz2KLFTVsEqYCpMhfAhgXxm8Ena8vDcOkCzFX+euvN/N2ES3wpzAD18b3qIH0MbBwKJP82d5GQ4pVfGnPW8Ujp9aO1qC/s0EqNqYyzJ1SyzhV9lAjHHGIENYJx+bBrekg2EeZBA==",
+              "base64": "CklVctHzke4mcytd0TxGqvepkdkQN8NUF4+jV7aZQITAKdz6WjdDpq3lMt9nSzWGG2vAEfvRb3mFEVjV57qqGqxjq2751gmiMRHXz0btStbIK3mQ5xbY9kdye4tsixlCryEwQONr96gwlwKKI9Nubl9/8+uRF6tgYjje7Q7OjauEf1SrJwKcoQ3WwnjZmEqAug0kImCpJ/irhdqPzivRiA==",
               "subType": "00"
             }
           },
diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/rewrapManyDataKey.yml b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/tests/unified/rewrapManyDataKey.yml
@@ -2,7 +2,7 @@
 # commands sort the resulting documents in ascending order by the single-element
 # keyAltNames array to ensure alphabetic order by original KMS provider as
 # defined in initialData.
-description: rewrapManyDataKey-kms_providers
+description: rewrapManyDataKey
 
 schemaVersion: "1.8"
 
@@ -50,7 +50,7 @@ initialData:
           region: us-east-1
       - _id: &azure_key_id { $binary: { base64: YXp1cmVhenVyZWF6dXJlYQ==, subType: "04" } }
         keyAltNames: ["azure_key"]
-        keyMaterial: { $binary: { base64: AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEGkNTybTc7Eyif0f+qqE0lAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDB2j78AeuIQxcRh8cQIBEIB7vj9buHEaT7XHFIsKBJiyzZRmNnjvqMK5LSdzonKdx97jlqauvPvTDXSsdQDcspUs5oLrGmAXpbFResscxmbwZoKgUtWiuIOpeAcYuszCiMKt15s1WIMLDXUhYtfCmhRhekvgHnRAaK4HJMlGE+lKJXYI84E0b86Cd/g+, subType: "00" } }
+        keyMaterial: { $binary: { base64: pr01l7qDygUkFE/0peFwpnNlv3iIy8zrQK38Q9i12UCN2jwZHDmfyx8wokiIKMb9kAleeY+vnt3Cf1MKu9kcDmI+KxbNDd+V3ytAAGzOVLDJr77CiWjF9f8ntkXRHrAY9WwnVDANYkDwXlyU0Y2GQFTiW65jiQhUtYLYH63Tk48SsJuQvnWw1Q+PzY8ga+QeVec8wbcThwtm+r2IHsCFnc72Gv73qq7weISw+O4mN08z3wOp5FOS2ZM3MK7tBGmPdBcktW7F8ODGsOQ1FU53OrWUnyX2aTi2ftFFFMWVHqQo7EYuBZHru8RRODNKMyQk0BFfKovAeTAVRv9WH9QU7g==, subType: "00" } }
         creationDate: { $date: { $numberLong: "1641024000000" } }
         updateDate: { $date: { $numberLong: "1641024000000" } }
         status: 1
@@ -72,7 +72,7 @@ initialData:
           keyName: key-name-csfle
       - _id: &kmip_key_id { $binary: { base64: a21pcGttaXBrbWlwa21pcA==, subType: "04" } }
         keyAltNames: ["kmip_key"]
-        keyMaterial: { $binary: { base64: VoI9J8HusQ3u2gT9i8Awgg/6W4/igvLwRzn3SRDGx0Dl/1ayDMubphOw0ONPVKfuvS6HL3e4gAoCJ/uEz2KLFTVsEqYCpMhfAhgXxm8Ena8vDcOkCzFX+euvN/N2ES3wpzAD18b3qIH0MbBwKJP82d5GQ4pVfGnPW8Ujp9aO1qC/s0EqNqYyzJ1SyzhV9lAjHHGIENYJx+bBrekg2EeZBA==, subType: "00" } }
+        keyMaterial: { $binary: { base64: CklVctHzke4mcytd0TxGqvepkdkQN8NUF4+jV7aZQITAKdz6WjdDpq3lMt9nSzWGG2vAEfvRb3mFEVjV57qqGqxjq2751gmiMRHXz0btStbIK3mQ5xbY9kdye4tsixlCryEwQONr96gwlwKKI9Nubl9/8+uRF6tgYjje7Q7OjauEf1SrJwKcoQ3WwnjZmEqAug0kImCpJ/irhdqPzivRiA==, subType: "00" } }
         creationDate: { $date: { $numberLong: "1641024000000" } }
         updateDate: { $date: { $numberLong: "1641024000000" } }
         status: 1

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ namespace MongoDB.Driver.Tests.Packaging`
`30`	`30`	`/// Also, use only public classes or reflection here.`
`31`	`31`	`/// </summary>`
`32`	`32`	`[Trait("Category", "Packaging")]`
	`33`	`+ [Trait("Category", "CSFLE")]`
`33`	`34`	`public class PackagingTests`
`34`	`35`	`{`
`35`	`36`	`// keep these tests in sync with CONSOLE_TEST's Main method`
`@@ -38,7 +39,7 @@ public static void Libmongocrypt_library_should_provide_library_version()`
`38`	`39`	`{`
`39`	`40`	`var version = Library.Version;`
`40`	`41`
`41`		`- version.Should().Be("1.5.1");`
	`42`	`+ version.Should().Be("1.5.2");`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void Run(JsonDrivenTestCase testCase)`
`42`	`42`	`var testCaseNameLower = testCase.Name.ToLower();`
`43`	`43`
`44`	`44`	`if (testCaseNameLower.Contains("kmip") \|\|`
`45`		`- testCase.Shared.ToString().ToLower().Contains("kmip")) // also calls kmip kms`
	`45`	`+ testCase.Shared.ToString().ToLower().Contains("kmip"))`
`46`	`46`	`{`
`47`	`47`	`// kmip requires configuring kms mock server`
`48`	`48`	`RequireEnvironment.Check().EnvironmentVariable("KMS_MOCK_SERVERS_ENABLED");`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "description": "createDataKey-provider-invalid",`
	`2`	`+ "description": "createDataKey-kms_providers-invalid",`
`3`	`3`	`"schemaVersion": "1.8",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-description: createDataKey-provider-invalid`
	`1`	`+description: createDataKey-kms_providers-invalid`
`2`	`2`
`3`	`3`	`schemaVersion: "1.8"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "description": "rewrapManyDataKey-kms_providers",`
	`2`	`+ "description": "rewrapManyDataKey",`
`3`	`3`	`"schemaVersion": "1.8",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`@@ -128,7 +128,7 @@`
`128`	`128`	`],`
`129`	`129`	`"keyMaterial": {`
`130`	`130`	`"$binary": {`
`131`		`- "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEGkNTybTc7Eyif0f+qqE0lAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDB2j78AeuIQxcRh8cQIBEIB7vj9buHEaT7XHFIsKBJiyzZRmNnjvqMK5LSdzonKdx97jlqauvPvTDXSsdQDcspUs5oLrGmAXpbFResscxmbwZoKgUtWiuIOpeAcYuszCiMKt15s1WIMLDXUhYtfCmhRhekvgHnRAaK4HJMlGE+lKJXYI84E0b86Cd/g+",`
	`131`	`+ "base64": "pr01l7qDygUkFE/0peFwpnNlv3iIy8zrQK38Q9i12UCN2jwZHDmfyx8wokiIKMb9kAleeY+vnt3Cf1MKu9kcDmI+KxbNDd+V3ytAAGzOVLDJr77CiWjF9f8ntkXRHrAY9WwnVDANYkDwXlyU0Y2GQFTiW65jiQhUtYLYH63Tk48SsJuQvnWw1Q+PzY8ga+QeVec8wbcThwtm+r2IHsCFnc72Gv73qq7weISw+O4mN08z3wOp5FOS2ZM3MK7tBGmPdBcktW7F8ODGsOQ1FU53OrWUnyX2aTi2ftFFFMWVHqQo7EYuBZHru8RRODNKMyQk0BFfKovAeTAVRv9WH9QU7g==",`
`132`	`132`	`"subType": "00"`
`133`	`133`	`}`
`134`	`134`	`},`
`@@ -196,7 +196,7 @@`
`196`	`196`	`],`
`197`	`197`	`"keyMaterial": {`
`198`	`198`	`"$binary": {`
`199`		`- "base64": "VoI9J8HusQ3u2gT9i8Awgg/6W4/igvLwRzn3SRDGx0Dl/1ayDMubphOw0ONPVKfuvS6HL3e4gAoCJ/uEz2KLFTVsEqYCpMhfAhgXxm8Ena8vDcOkCzFX+euvN/N2ES3wpzAD18b3qIH0MbBwKJP82d5GQ4pVfGnPW8Ujp9aO1qC/s0EqNqYyzJ1SyzhV9lAjHHGIENYJx+bBrekg2EeZBA==",`
	`199`	`+ "base64": "CklVctHzke4mcytd0TxGqvepkdkQN8NUF4+jV7aZQITAKdz6WjdDpq3lMt9nSzWGG2vAEfvRb3mFEVjV57qqGqxjq2751gmiMRHXz0btStbIK3mQ5xbY9kdye4tsixlCryEwQONr96gwlwKKI9Nubl9/8+uRF6tgYjje7Q7OjauEf1SrJwKcoQ3WwnjZmEqAug0kImCpJ/irhdqPzivRiA==",`
`200`	`200`	`"subType": "00"`
`201`	`201`	`}`
`202`	`202`	`},`