PYTHON-2207 Do not use the admin database for the key vault in FLE tests

ShaneHarvey · ShaneHarvey · commit ef2ecc4eac23 · 2020-04-17T16:19:39.000-07:00
Admin collections cannot be dropped in sharded clusters in 4.5+.
diff --git a/test/client-side-encryption/spec/aggregate.json b/test/client-side-encryption/spec/aggregate.json
@@ -157,7 +157,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -187,7 +187,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -280,7 +280,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -310,7 +310,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/basic.json b/test/client-side-encryption/spec/basic.json
@@ -151,7 +151,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -181,7 +181,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -290,7 +290,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -320,7 +320,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/bulk.json b/test/client-side-encryption/spec/bulk.json
@@ -185,7 +185,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -215,7 +215,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/bypassAutoEncryption.json b/test/client-side-encryption/spec/bypassAutoEncryption.json
@@ -196,7 +196,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -369,7 +369,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/count.json b/test/client-side-encryption/spec/count.json
@@ -156,7 +156,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -186,7 +186,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/countDocuments.json b/test/client-side-encryption/spec/countDocuments.json
@@ -157,7 +157,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -187,7 +187,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/delete.json b/test/client-side-encryption/spec/delete.json
@@ -158,7 +158,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -188,7 +188,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -283,7 +283,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -313,7 +313,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/distinct.json b/test/client-side-encryption/spec/distinct.json
@@ -168,7 +168,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -198,7 +198,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/explain.json b/test/client-side-encryption/spec/explain.json
@@ -162,7 +162,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -192,7 +192,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/find.json b/test/client-side-encryption/spec/find.json
@@ -167,7 +167,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -197,7 +197,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -309,7 +309,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -339,7 +339,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/findOneAndDelete.json b/test/client-side-encryption/spec/findOneAndDelete.json
@@ -155,7 +155,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -185,7 +185,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/findOneAndReplace.json b/test/client-side-encryption/spec/findOneAndReplace.json
@@ -154,7 +154,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -184,7 +184,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/findOneAndUpdate.json b/test/client-side-encryption/spec/findOneAndUpdate.json
@@ -156,7 +156,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -186,7 +186,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/getMore.json b/test/client-side-encryption/spec/getMore.json
@@ -186,7 +186,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -216,7 +216,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/insert.json b/test/client-side-encryption/spec/insert.json
@@ -138,7 +138,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -168,7 +168,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
@@ -265,7 +265,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -295,7 +295,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/keyAltName.json b/test/client-side-encryption/spec/keyAltName.json
@@ -138,7 +138,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -163,7 +163,7 @@
                   }
                 ]
               },
-              "$db": "admin",
+              "$db": "keyvault",
               "readConcern": {
                 "level": "majority"
               }
diff --git a/test/client-side-encryption/spec/localKMS.json b/test/client-side-encryption/spec/localKMS.json
@@ -121,7 +121,7 @@
               "filter": {
                 "name": "datakeys"
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "listCollections"
           }
@@ -151,7 +151,7 @@
                   }
                 ]
               },
-              "$db": "admin"
+              "$db": "keyvault"
             },
             "command_name": "find"
           }
diff --git a/test/client-side-encryption/spec/localSchema.json b/test/client-side-encryption/spec/localSchema.json
diff --git a/test/client-side-encryption/spec/missingKey.json b/test/client-side-encryption/spec/missingKey.json
diff --git a/test/client-side-encryption/spec/replaceOne.json b/test/client-side-encryption/spec/replaceOne.json
diff --git a/test/client-side-encryption/spec/types.json b/test/client-side-encryption/spec/types.json
diff --git a/test/client-side-encryption/spec/updateMany.json b/test/client-side-encryption/spec/updateMany.json
diff --git a/test/client-side-encryption/spec/updateOne.json b/test/client-side-encryption/spec/updateOne.json
diff --git a/test/test_encryption.py b/test/test_encryption.py

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@`
`157`	`157`	`"filter": {`
`158`	`158`	`"name": "datakeys"`
`159`	`159`	`},`
`160`		`- "$db": "admin"`
	`160`	`+ "$db": "keyvault"`
`161`	`161`	`},`
`162`	`162`	`"command_name": "listCollections"`
`163`	`163`	`}`
`@@ -187,7 +187,7 @@`
`187`	`187`	`}`
`188`	`188`	`]`
`189`	`189`	`},`
`190`		`- "$db": "admin",`
	`190`	`+ "$db": "keyvault",`
`191`	`191`	`"readConcern": {`
`192`	`192`	`"level": "majority"`
`193`	`193`	`}`
`@@ -280,7 +280,7 @@`
`280`	`280`	`"filter": {`
`281`	`281`	`"name": "datakeys"`
`282`	`282`	`},`
`283`		`- "$db": "admin"`
	`283`	`+ "$db": "keyvault"`
`284`	`284`	`},`
`285`	`285`	`"command_name": "listCollections"`
`286`	`286`	`}`
`@@ -310,7 +310,7 @@`
`310`	`310`	`}`
`311`	`311`	`]`
`312`	`312`	`},`
`313`		`- "$db": "admin",`
	`313`	`+ "$db": "keyvault",`
`314`	`314`	`"readConcern": {`
`315`	`315`	`"level": "majority"`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@`
`151`	`151`	`"filter": {`
`152`	`152`	`"name": "datakeys"`
`153`	`153`	`},`
`154`		`- "$db": "admin"`
	`154`	`+ "$db": "keyvault"`
`155`	`155`	`},`
`156`	`156`	`"command_name": "listCollections"`
`157`	`157`	`}`
`@@ -181,7 +181,7 @@`
`181`	`181`	`}`
`182`	`182`	`]`
`183`	`183`	`},`
`184`		`- "$db": "admin",`
	`184`	`+ "$db": "keyvault",`
`185`	`185`	`"readConcern": {`
`186`	`186`	`"level": "majority"`
`187`	`187`	`}`
`@@ -290,7 +290,7 @@`
`290`	`290`	`"filter": {`
`291`	`291`	`"name": "datakeys"`
`292`	`292`	`},`
`293`		`- "$db": "admin"`
	`293`	`+ "$db": "keyvault"`
`294`	`294`	`},`
`295`	`295`	`"command_name": "listCollections"`
`296`	`296`	`}`
`@@ -320,7 +320,7 @@`
`320`	`320`	`}`
`321`	`321`	`]`
`322`	`322`	`},`
`323`		`- "$db": "admin",`
	`323`	`+ "$db": "keyvault",`
`324`	`324`	`"readConcern": {`
`325`	`325`	`"level": "majority"`
`326`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@`
`185`	`185`	`"filter": {`
`186`	`186`	`"name": "datakeys"`
`187`	`187`	`},`
`188`		`- "$db": "admin"`
	`188`	`+ "$db": "keyvault"`
`189`	`189`	`},`
`190`	`190`	`"command_name": "listCollections"`
`191`	`191`	`}`
`@@ -215,7 +215,7 @@`
`215`	`215`	`}`
`216`	`216`	`]`
`217`	`217`	`},`
`218`		`- "$db": "admin",`
	`218`	`+ "$db": "keyvault",`
`219`	`219`	`"readConcern": {`
`220`	`220`	`"level": "majority"`
`221`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@`
`196`	`196`	`}`
`197`	`197`	`]`
`198`	`198`	`},`
`199`		`- "$db": "admin",`
	`199`	`+ "$db": "keyvault",`
`200`	`200`	`"readConcern": {`
`201`	`201`	`"level": "majority"`
`202`	`202`	`}`
`@@ -369,7 +369,7 @@`
`369`	`369`	`}`
`370`	`370`	`]`
`371`	`371`	`},`
`372`		`- "$db": "admin",`
	`372`	`+ "$db": "keyvault",`
`373`	`373`	`"readConcern": {`
`374`	`374`	`"level": "majority"`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@`
`156`	`156`	`"filter": {`
`157`	`157`	`"name": "datakeys"`
`158`	`158`	`},`
`159`		`- "$db": "admin"`
	`159`	`+ "$db": "keyvault"`
`160`	`160`	`},`
`161`	`161`	`"command_name": "listCollections"`
`162`	`162`	`}`
`@@ -186,7 +186,7 @@`
`186`	`186`	`}`
`187`	`187`	`]`
`188`	`188`	`},`
`189`		`- "$db": "admin",`
	`189`	`+ "$db": "keyvault",`
`190`	`190`	`"readConcern": {`
`191`	`191`	`"level": "majority"`
`192`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@`
`158`	`158`	`"filter": {`
`159`	`159`	`"name": "datakeys"`
`160`	`160`	`},`
`161`		`- "$db": "admin"`
	`161`	`+ "$db": "keyvault"`
`162`	`162`	`},`
`163`	`163`	`"command_name": "listCollections"`
`164`	`164`	`}`
`@@ -188,7 +188,7 @@`
`188`	`188`	`}`
`189`	`189`	`]`
`190`	`190`	`},`
`191`		`- "$db": "admin",`
	`191`	`+ "$db": "keyvault",`
`192`	`192`	`"readConcern": {`
`193`	`193`	`"level": "majority"`
`194`	`194`	`}`
`@@ -283,7 +283,7 @@`
`283`	`283`	`"filter": {`
`284`	`284`	`"name": "datakeys"`
`285`	`285`	`},`
`286`		`- "$db": "admin"`
	`286`	`+ "$db": "keyvault"`
`287`	`287`	`},`
`288`	`288`	`"command_name": "listCollections"`
`289`	`289`	`}`
`@@ -313,7 +313,7 @@`
`313`	`313`	`}`
`314`	`314`	`]`
`315`	`315`	`},`
`316`		`- "$db": "admin",`
	`316`	`+ "$db": "keyvault",`
`317`	`317`	`"readConcern": {`
`318`	`318`	`"level": "majority"`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@`
`168`	`168`	`"filter": {`
`169`	`169`	`"name": "datakeys"`
`170`	`170`	`},`
`171`		`- "$db": "admin"`
	`171`	`+ "$db": "keyvault"`
`172`	`172`	`},`
`173`	`173`	`"command_name": "listCollections"`
`174`	`174`	`}`
`@@ -198,7 +198,7 @@`
`198`	`198`	`}`
`199`	`199`	`]`
`200`	`200`	`},`
`201`		`- "$db": "admin",`
	`201`	`+ "$db": "keyvault",`
`202`	`202`	`"readConcern": {`
`203`	`203`	`"level": "majority"`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@`
`162`	`162`	`"filter": {`
`163`	`163`	`"name": "datakeys"`
`164`	`164`	`},`
`165`		`- "$db": "admin"`
	`165`	`+ "$db": "keyvault"`
`166`	`166`	`},`
`167`	`167`	`"command_name": "listCollections"`
`168`	`168`	`}`
`@@ -192,7 +192,7 @@`
`192`	`192`	`}`
`193`	`193`	`]`
`194`	`194`	`},`
`195`		`- "$db": "admin",`
	`195`	`+ "$db": "keyvault",`
`196`	`196`	`"readConcern": {`
`197`	`197`	`"level": "majority"`
`198`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@`
`167`	`167`	`"filter": {`
`168`	`168`	`"name": "datakeys"`
`169`	`169`	`},`
`170`		`- "$db": "admin"`
	`170`	`+ "$db": "keyvault"`
`171`	`171`	`},`
`172`	`172`	`"command_name": "listCollections"`
`173`	`173`	`}`
`@@ -197,7 +197,7 @@`
`197`	`197`	`}`
`198`	`198`	`]`
`199`	`199`	`},`
`200`		`- "$db": "admin",`
	`200`	`+ "$db": "keyvault",`
`201`	`201`	`"readConcern": {`
`202`	`202`	`"level": "majority"`
`203`	`203`	`}`
`@@ -309,7 +309,7 @@`
`309`	`309`	`"filter": {`
`310`	`310`	`"name": "datakeys"`
`311`	`311`	`},`
`312`		`- "$db": "admin"`
	`312`	`+ "$db": "keyvault"`
`313`	`313`	`},`
`314`	`314`	`"command_name": "listCollections"`
`315`	`315`	`}`
`@@ -339,7 +339,7 @@`
`339`	`339`	`}`
`340`	`340`	`]`
`341`	`341`	`},`
`342`		`- "$db": "admin",`
	`342`	`+ "$db": "keyvault",`
`343`	`343`	`"readConcern": {`
`344`	`344`	`"level": "majority"`
`345`	`345`	`}`