diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2022-05-16 10:22:33 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-17 02:35:37 +0000 |
| commit | ad2271e4c9dfeffd8a11b04a23da361483d695fb (patch) | |
| tree | a326e656d1c11b9fe885673203966f2de6c0bf06 /src/mongo/db/fle_crud.cpp | |
| parent | 13ec926abfad8452f9e44196d5592577d245032e (diff) | |
| download | mongo-ad2271e4c9dfeffd8a11b04a23da361483d695fb.tar.gz | |
SERVER-66120 Use consistent way to refer to FLE 2 encryption in user-facing messages
Diffstat (limited to 'src/mongo/db/fle_crud.cpp')
| -rw-r--r-- | src/mongo/db/fle_crud.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mongo/db/fle_crud.cpp b/src/mongo/db/fle_crud.cpp index 993ef06e2a2..d8f88c80991 100644 --- a/src/mongo/db/fle_crud.cpp +++ b/src/mongo/db/fle_crud.cpp @@ -192,7 +192,9 @@ std::pair<FLEBatchResult, write_ops::InsertCommandReply> processInsert( auto documents = insertRequest.getDocuments(); // TODO - how to check if a document will be too large??? - uassert(6371202, "Only single insert batches are supported in FLE2", documents.size() == 1); + uassert(6371202, + "Only single insert batches are supported in Queryable Encryption", + documents.size() == 1); auto document = documents[0]; EDCServerCollection::validateEncryptedFieldInfo(document, efc); @@ -243,7 +245,8 @@ std::pair<FLEBatchResult, write_ops::InsertCommandReply> processInsert( // does not try to commit the transaction. if (reply->getWriteErrors().has_value() && !reply->getWriteErrors().value().empty()) { return SemiFuture<void>::makeReady( - Status(ErrorCodes::FLETransactionAbort, "FLE2 write errors on insert")); + Status(ErrorCodes::FLETransactionAbort, + "Queryable Encryption write errors on insert")); } return SemiFuture<void>::makeReady(); @@ -322,7 +325,8 @@ write_ops::DeleteCommandReply processDelete(OperationContext* opCtx, // does not try to commit the transaction. if (reply->getWriteErrors().has_value() && !reply->getWriteErrors().value().empty()) { return SemiFuture<void>::makeReady( - Status(ErrorCodes::FLETransactionAbort, "FLE2 write errors on delete")); + Status(ErrorCodes::FLETransactionAbort, + "Queryable Encryption write errors on delete")); } return SemiFuture<void>::makeReady(); @@ -406,7 +410,8 @@ write_ops::UpdateCommandReply processUpdate(OperationContext* opCtx, // does not try to commit the transaction. if (reply->getWriteErrors().has_value() && !reply->getWriteErrors().value().empty()) { return SemiFuture<void>::makeReady( - Status(ErrorCodes::FLETransactionAbort, "FLE2 write errors on delete")); + Status(ErrorCodes::FLETransactionAbort, + "Queryable Encryption write errors on delete")); } return SemiFuture<void>::makeReady(); @@ -887,7 +892,7 @@ FLEBatchResult processFLEBatch(OperationContext* opCtx, // TODO (SERVER-65077): Remove FCV check once 6.0 is released uassert(6371209, - "FLE 2 is only supported when FCV supports 6.0", + "Queryable Encryption is only supported when FCV supports 6.0", gFeatureFlagFLE2.isEnabled(serverGlobalParams.featureCompatibility)); if (request.getBatchType() == BatchedCommandRequest::BatchType_Insert) { @@ -1145,7 +1150,7 @@ FLEBatchResult processFLEFindAndModify(OperationContext* opCtx, // TODO (SERVER-65077): Remove FCV check once 6.0 is released if (!gFeatureFlagFLE2.isEnabled(serverGlobalParams.featureCompatibility)) { - uasserted(6371405, "FLE 2 is only supported when FCV supports 6.0"); + uasserted(6371405, "Queryable Encryption is only supported when FCV supports 6.0"); } // FLE2 Mongos CRUD operations loopback through MongoS with EncryptionInformation as |