Skip to content

CSHARP-4678: Additional collections are created in QE v2 on older servers #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2023
Merged

CSHARP-4678: Additional collections are created in QE v2 on older servers #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cfa28e
CSHARP-4678: Additional collections are created in QE v2 on older ser…
BorisDog Jun 15, 2023
57b3020
- Bugs
BorisDog Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,38 @@
"result": {
"errorContains": "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
}
},
{
"name": "assertCollectionNotExists",
"object": "testRunner",
"arguments": {
"database": "default",
"collection": "enxcol_.encryptedCollection.esc"
}
},
{
"name": "assertCollectionNotExists",
"object": "testRunner",
"arguments": {
"database": "default",
"collection": "enxcol_.encryptedCollection.ecc"
}
},
{
"name": "assertCollectionNotExists",
"object": "testRunner",
"arguments": {
"database": "default",
"collection": "enxcol_.encryptedCollection.ecoc"
}
},
{
"name": "assertCollectionNotExists",
"object": "testRunner",
"arguments": {
"database": "default",
"collection": "encryptedCollection"
}
}
]
}
Expand Down
22 changes: 22 additions & 0 deletions specifications/client-side-encryption/tests/legacy/fle2v2-CreateCollection-OldServer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,25 @@ tests:
collection: "encryptedCollection"
result:
errorContains: "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption."
# Assert no collections were created.
- name: assertCollectionNotExists
object: testRunner
arguments:
database: *database_name
collection: &esc_collection_name "enxcol_.encryptedCollection.esc"
# ecc collection is no longer created for QEv2
- name: assertCollectionNotExists
object: testRunner
arguments:
database: *database_name
collection: &ecc_collection_name "enxcol_.encryptedCollection.ecc"
- name: assertCollectionNotExists
object: testRunner
arguments:
database: *database_name
collection: &ecoc_collection_name "enxcol_.encryptedCollection.ecoc"
- name: assertCollectionNotExists
object: testRunner
arguments:
database: *database_name
collection: encryptedCollection
16 changes: 10 additions & 6 deletions src/MongoDB.Driver.Core/Core/Operations/CreateCollectionOperation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ internal static IWriteOperation<BsonDocument> CreateEncryptedCreateCollectionOpe
{
var mainOperation = new CreateCollectionOperation(
collectionNamespace,
messageEncoderSettings)
messageEncoderSettings,
encryptedFields != null ? Feature.Csfle2QEv2 : null)
{
EncryptedFields = encryptedFields
};
Expand All @@ -62,7 +63,10 @@ internal static IWriteOperation<BsonDocument> CreateEncryptedCreateCollectionOpe
}

CreateCollectionOperation CreateInnerCollectionOperation(string collectionName)
=> new CreateCollectionOperation(new CollectionNamespace(collectionNamespace.DatabaseNamespace.DatabaseName, collectionName), messageEncoderSettings) { ClusteredIndex = new BsonDocument { { "key", new BsonDocument("_id", 1) }, { "unique", true } } };
=> new(new CollectionNamespace(collectionNamespace.DatabaseNamespace.DatabaseName, collectionName), messageEncoderSettings, Feature.Csfle2QEv2)
{
ClusteredIndex = new BsonDocument { { "key", new BsonDocument("_id", 1) }, { "unique", true } }
};
}
#endregion

Expand All @@ -89,6 +93,8 @@ CreateCollectionOperation CreateInnerCollectionOperation(string collectionName)
private BsonDocument _validator;
private WriteConcern _writeConcern;

private readonly Feature _supportedFeature;

// constructors
/// <summary>
/// Initializes a new instance of the <see cref="CreateCollectionOperation"/> class.
Expand All @@ -109,6 +115,7 @@ private CreateCollectionOperation(
{
_collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace));
_messageEncoderSettings = messageEncoderSettings;
_supportedFeature = supportedFeature;
}

// properties
Expand Down Expand Up @@ -455,10 +462,7 @@ private WriteCommandOperation<BsonDocument> CreateOperation(ICoreSessionHandle s

private void EnsureServerIsValid(int maxWireVersion)
{
if (_encryptedFields != null)
{
Feature.Csfle2QEv2.ThrowIfNotSupported(maxWireVersion);
}
_supportedFeature?.ThrowIfNotSupported(maxWireVersion);
}

[Flags]
Expand Down