SERVER-39492 Allow array of BSON types in encrypt.bsonType specification

Changed the IDL definition of EncryptionInfo.bsonType to use a custom type based on
MatcherTypeSet. Since it is a pretty generic type we could move it to
basic_types.idl.
Changed InternalSchemaBinDataEncryptedTypeExpression to use
MatcherTypeSet as well, rather than a single type. Parsing logic of
MatcherTypeSet allowed for a concise code.

1 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/matcher/matcher_type_set.cpp b/src/mongo/db/matcher/matcher_type_set.cpp
index 44b77009034..1f37415a0b1 100644
--- a/src/mongo/db/matcher/matcher_type_set.cpp
+++ b/src/mongo/db/matcher/matcher_type_set.cpp
@@ -166,4 +166,13 @@ void MatcherTypeSet::toBSONArray(BSONArrayBuilder* builder) const {
     }
 }
 
+BSONTypeSet BSONTypeSet::parseFromBSON(const BSONElement& element) {
+    // BSON type can be specified with a type alias, other values will be rejected.
+    auto typeSet = uassertStatusOK(JSONSchemaParser::parseTypeSet(element, kTypeAliasMap));
+    return BSONTypeSet(typeSet);
+}
+
+void BSONTypeSet::serializeToBSON(StringData fieldName, BSONObjBuilder* builder) const {
+    builder->appendArray(fieldName, _typeSet.toBSONArray());
+}
 }  // namespace mongo