GODRIVER-2739 Support Optional Inserted Ids in CSFLE Unified Tests (#1163)

prestonvasquez · web-flow · commit 7b8eca4893b0 · 2023-01-24T09:46:53.000-07:00
diff --git a/testdata/client-side-encryption/unified/rewrapManyDataKey.json b/testdata/client-side-encryption/unified/rewrapManyDataKey.json
@@ -321,7 +321,10 @@
               "modifiedCount": 4,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         }
@@ -503,7 +506,10 @@
               "modifiedCount": 4,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         }
@@ -687,7 +693,10 @@
               "modifiedCount": 4,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         }
@@ -873,7 +882,10 @@
               "modifiedCount": 4,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         }
@@ -1055,7 +1067,10 @@
               "modifiedCount": 4,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         }
@@ -1218,7 +1233,10 @@
               "modifiedCount": 5,
               "deletedCount": 0,
               "upsertedCount": 0,
-              "upsertedIds": {}
+              "upsertedIds": {},
+              "insertedIds": {
+                "$$unsetOrMatches": {}
+              }
             }
           }
         },
diff --git a/testdata/client-side-encryption/unified/rewrapManyDataKey.yml b/testdata/client-side-encryption/unified/rewrapManyDataKey.yml
@@ -130,6 +130,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
     expectEvents:
       - client: *client0
         events:
@@ -182,6 +183,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
     expectEvents:
       - client: *client0
         events:
@@ -236,6 +238,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
     expectEvents:
       - client: *client0
         events:
@@ -285,6 +288,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
     expectEvents:
       - client: *client0
         events:
@@ -334,6 +338,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
     expectEvents:
       - client: *client0
         events:
@@ -381,6 +386,7 @@ tests:
             deletedCount: 0
             upsertedCount: 0
             upsertedIds: {}
+            insertedIds: { $$unsetOrMatches: {} }
       - name: find
         object: *collection0
         arguments:

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,10 @@`
`321`	`321`	`"modifiedCount": 4,`
`322`	`322`	`"deletedCount": 0,`
`323`	`323`	`"upsertedCount": 0,`
`324`		`- "upsertedIds": {}`
	`324`	`+ "upsertedIds": {},`
	`325`	`+ "insertedIds": {`
	`326`	`+ "$$unsetOrMatches": {}`
	`327`	`+ }`
`325`	`328`	`}`
`326`	`329`	`}`
`327`	`330`	`}`
`@@ -503,7 +506,10 @@`
`503`	`506`	`"modifiedCount": 4,`
`504`	`507`	`"deletedCount": 0,`
`505`	`508`	`"upsertedCount": 0,`
`506`		`- "upsertedIds": {}`
	`509`	`+ "upsertedIds": {},`
	`510`	`+ "insertedIds": {`
	`511`	`+ "$$unsetOrMatches": {}`
	`512`	`+ }`
`507`	`513`	`}`
`508`	`514`	`}`
`509`	`515`	`}`
`@@ -687,7 +693,10 @@`
`687`	`693`	`"modifiedCount": 4,`
`688`	`694`	`"deletedCount": 0,`
`689`	`695`	`"upsertedCount": 0,`
`690`		`- "upsertedIds": {}`
	`696`	`+ "upsertedIds": {},`
	`697`	`+ "insertedIds": {`
	`698`	`+ "$$unsetOrMatches": {}`
	`699`	`+ }`
`691`	`700`	`}`
`692`	`701`	`}`
`693`	`702`	`}`
`@@ -873,7 +882,10 @@`
`873`	`882`	`"modifiedCount": 4,`
`874`	`883`	`"deletedCount": 0,`
`875`	`884`	`"upsertedCount": 0,`
`876`		`- "upsertedIds": {}`
	`885`	`+ "upsertedIds": {},`
	`886`	`+ "insertedIds": {`
	`887`	`+ "$$unsetOrMatches": {}`
	`888`	`+ }`
`877`	`889`	`}`
`878`	`890`	`}`
`879`	`891`	`}`
`@@ -1055,7 +1067,10 @@`
`1055`	`1067`	`"modifiedCount": 4,`
`1056`	`1068`	`"deletedCount": 0,`
`1057`	`1069`	`"upsertedCount": 0,`
`1058`		`- "upsertedIds": {}`
	`1070`	`+ "upsertedIds": {},`
	`1071`	`+ "insertedIds": {`
	`1072`	`+ "$$unsetOrMatches": {}`
	`1073`	`+ }`
`1059`	`1074`	`}`
`1060`	`1075`	`}`
`1061`	`1076`	`}`
`@@ -1218,7 +1233,10 @@`
`1218`	`1233`	`"modifiedCount": 5,`
`1219`	`1234`	`"deletedCount": 0,`
`1220`	`1235`	`"upsertedCount": 0,`
`1221`		`- "upsertedIds": {}`
	`1236`	`+ "upsertedIds": {},`
	`1237`	`+ "insertedIds": {`
	`1238`	`+ "$$unsetOrMatches": {}`
	`1239`	`+ }`
`1222`	`1240`	`}`
`1223`	`1241`	`}`
`1224`	`1242`	`},`