From fa046c7887ab61370d36758ffe883e2630940c15 Mon Sep 17 00:00:00 2001 From: Preston Vasquez Date: Wed, 15 Jun 2022 09:13:44 -0600 Subject: [PATCH] DRIVER-2017 relax multi/upsert expectations (#1251) --- .../tests/unified/rewrapManyDataKey.json | 200 +++++++++++++----- .../tests/unified/rewrapManyDataKey.yml | 100 ++++----- 2 files changed, 200 insertions(+), 100 deletions(-) diff --git a/source/client-side-encryption/tests/unified/rewrapManyDataKey.json b/source/client-side-encryption/tests/unified/rewrapManyDataKey.json index ed7568ca4d..64361d90de 100644 --- a/source/client-side-encryption/tests/unified/rewrapManyDataKey.json +++ b/source/client-side-encryption/tests/unified/rewrapManyDataKey.json @@ -372,8 +372,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -396,8 +400,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -420,8 +428,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -444,8 +456,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { @@ -538,8 +554,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -562,8 +582,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -586,8 +610,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -610,8 +638,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { @@ -708,8 +740,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -734,8 +770,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -760,8 +800,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -786,8 +830,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { @@ -877,8 +925,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -902,8 +954,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -927,8 +983,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -952,8 +1012,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { @@ -1040,8 +1104,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1062,8 +1130,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1084,8 +1156,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1106,8 +1182,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { @@ -1262,8 +1342,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1284,8 +1368,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1306,8 +1394,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1328,8 +1420,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } }, { "q": { @@ -1350,8 +1446,12 @@ "updateDate": true } }, - "upsert": false, - "multi": false + "multi": { + "$$unsetOrMatches": false + }, + "upsert": { + "$$unsetOrMatches": false + } } ], "writeConcern": { diff --git a/source/client-side-encryption/tests/unified/rewrapManyDataKey.yml b/source/client-side-encryption/tests/unified/rewrapManyDataKey.yml index 4b03395010..84fa46964a 100644 --- a/source/client-side-encryption/tests/unified/rewrapManyDataKey.yml +++ b/source/client-side-encryption/tests/unified/rewrapManyDataKey.yml @@ -146,20 +146,20 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: aws, <<: *new_aws_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: aws, <<: *new_aws_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: aws, <<: *new_aws_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: aws, <<: *new_aws_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - description: "rewrap with new Azure KMS provider" @@ -198,20 +198,20 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: azure, <<: *new_azure_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: azure, <<: *new_azure_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: azure, <<: *new_azure_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: azure, <<: *new_azure_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - description: "rewrap with new GCP KMS provider" @@ -252,20 +252,20 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: gcp, <<: *new_gcp_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: gcp, <<: *new_gcp_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: gcp, <<: *new_gcp_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: gcp, <<: *new_gcp_masterkey }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - description: "rewrap with new KMIP KMS provider" @@ -301,20 +301,20 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: kmip, keyId: { $$type: string } }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: kmip, keyId: { $$type: string } }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: kmip, keyId: { $$type: string } }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: kmip, keyId: { $$type: string } }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - description: "rewrap with new local KMS provider" @@ -350,20 +350,20 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: local }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: local }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: local }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { provider: local }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - description: "rewrap with current KMS provider" @@ -409,23 +409,23 @@ tests: updates: - q: { _id: { $$type: binData } } u: { $set: { masterKey: { $$type: object }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { $$type: object }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { $$type: object }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { $$type: object }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } - q: { _id: { $$type: binData } } u: { $set: { masterKey: { $$type: object }, keyMaterial: { $$type: binData } }, $currentDate: { updateDate: true } } - upsert: false - multi: false + multi: { $$unsetOrMatches: false } + upsert: { $$unsetOrMatches: false } writeConcern: { w: majority } - commandStartedEvent: { commandName: find }