DRIVERS-2524 do not create or drop eccCollection
#1396
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
|
There was a problem hiding this comment. @kevinAlbs: I just noticed this, but if you're removing the metadata collections here, doesn't that make this file identical to its If so, would it make sense to just stick with a single file and update the There was a problem hiding this comment. Related PR where I encountered this: #1399 There was a problem hiding this comment.
Another difference: the field names for I suggest filing a DRIVERS ticket for the improvement. This change can be made in a separate PR to avoid adding unrelated changes to this PR. There was a problem hiding this comment. |
||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -33,4 +30,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -23,4 +20,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -32,4 +29,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -23,4 +20,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -32,4 +29,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -29,4 +26,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -29,4 +26,4 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
@@ -30,4 +27,4 @@ | |
| "bsonType": "string" | ||
| } | ||
| ] | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,9 +18,6 @@ tests: | |
| local: {{ local_provider() }} | ||
| encryptedFieldsMap: { | ||
| "default.default": { | ||
| "fields": [] | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,9 +45,7 @@ tests: | |
| }, | ||
| "schema": { | ||
| "default.default": { | ||
| "fields": [] | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,6 @@ | |
| "collection_name": "default", | ||
| "data": [], | ||
| "encrypted_fields": { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,6 @@ | |
| "collection_name": "default", | ||
| "data": [], | ||
| "encrypted_fields": { | ||
| "fields": [ | ||
| { | ||
| "keyId": { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "runOn": [ | ||
| { | ||
| "minServerVersion": "6.0.0", | ||
| "maxServerVersion": "6.3.99", | ||
| "topology": [ | ||
| "replicaset", | ||
| "sharded", | ||
| "load-balanced" | ||
| ] | ||
| } | ||
| ], | ||
| "database_name": "default", | ||
| "collection_name": "default", | ||
| "tests": [ | ||
| { | ||
| "description": "driver returns an error if creating a QEv2 collection on unsupported server", | ||
| "clientOptions": { | ||
| "autoEncryptOpts": { | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| }, | ||
| "encryptedFieldsMap": { | ||
| "default.encryptedCollection": { | ||
| "fields": [ | ||
| { | ||
| "path": "firstName", | ||
| "bsonType": "string", | ||
| "keyId": { | ||
| "$binary": { | ||
| "base64": "AAAAAAAAAAAAAAAAAAAAAA==", | ||
| "subType": "04" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "operations": [ | ||
| { | ||
| "name": "dropCollection", | ||
| "object": "database", | ||
| "arguments": { | ||
| "collection": "encryptedCollection" | ||
| } | ||
| }, | ||
| { | ||
| "name": "createCollection", | ||
| "object": "database", | ||
| "arguments": { | ||
| "collection": "encryptedCollection" | ||
| }, | ||
| "result": { | ||
| "errorContains": "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption." | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Requires libmongocrypt 1.8.0. | ||
| runOn: | ||
| - minServerVersion: "6.0.0" | ||
| maxServerVersion: "6.3.99" | ||
| # FLE 2 Encrypted collections are not supported on standalone. | ||
| topology: [ "replicaset", "sharded", "load-balanced" ] | ||
|
|
||
| database_name: &database_name "default" | ||
| collection_name: &collection_name "default" | ||
jmikola marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| tests: | ||
| - description: "driver returns an error if creating a QEv2 collection on unsupported server" | ||
| clientOptions: | ||
| autoEncryptOpts: | ||
| kmsProviders: | ||
| aws: {} # Credentials filled in from environment. | ||
| encryptedFieldsMap: | ||
| default.encryptedCollection: { | ||
| "fields": [ | ||
| { | ||
| "path": "firstName", | ||
| "bsonType": "string", | ||
| "keyId": { "$binary": { "base64": "AAAAAAAAAAAAAAAAAAAAAA==", "subType": "04" }} | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| operations: | ||
| # Do an initial drop to remove collections that may exist from previous test runs. | ||
| - name: dropCollection | ||
| object: database | ||
| arguments: | ||
| collection: "encryptedCollection" | ||
| - name: createCollection | ||
| object: database | ||
| arguments: | ||
| collection: "encryptedCollection" | ||
| result: | ||
| errorContains: "Driver support of Queryable Encryption is incompatible with server. Upgrade server to use Queryable Encryption." | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.