-
Notifications
You must be signed in to change notification settings - Fork 244
DRIVERS-2017 Add clientEncryption entity to unified test format #1188
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.
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
eramongodb
merged 36 commits into
mongodb:master
from
eramongodb:client-encryption-entity
Apr 26, 2022
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
47e4a6e
Add schema-1.8.json
eramongodb ac1740d
Add schema for encryptedClient entity
eramongodb 1a309a9
Add unified test format tests for clientEncryptionOpts
eramongodb 5f551d1
Add unified test format spec wording for encryptedClient entity
eramongodb 8c65df2
Update and move some valid-fail clientEncryptionOpts tests to valid-pass
eramongodb 637960e
Rename valid-fail clientEncryptionOpts tests for consistency
eramongodb ddbb517
Fix length of local key material
eramongodb 58d2750
Revert automated formatting of schema-1.8.json
eramongodb 5b31d3a
Refer to MongoClient entity as "client" rather than "MongoClient"
eramongodb c449055
Split missing KMS credential fields test by provider
eramongodb 5f7fed3
Use "$$placeholder" instead of an empty document for placeholder values
eramongodb 79eb724
Fix "keyvault" -> "key vault"
eramongodb 64dddde
Rename "encryptedClient" entity to "clientEncryption"
eramongodb b2d7890
Rename "mixed-kms-credentials" -> "mixed-kms-credential-fields" for c…
eramongodb 8b3dd10
Add descriptive comments to clientEncryptionOpts test files
eramongodb 85f7f3b
Rename tests with mixed casing
eramongodb 0074399
Remove "tlsOptions" from document structure in favor of a note
eramongodb aeabb28
Add invalid tests for new unified test format
eramongodb 5f8b403
Fix spec and tests so keyVaultClient is optional
eramongodb d103a58
More invalid tests for unified test format
eramongodb 927ec8f
Rename clientEncryptionOpts -> kmsProviders for kmsProviders schema t…
eramongodb 55deb64
Fix title level for new "$$placeholder" section
eramongodb 17e1a48
Fix inconsistent description of new placeholder value
eramongodb c2c2fb5
Fix KMS provider in kmsProviders-invalid_kmip_property.yml
eramongodb 9ab7159
Revert removal of required field ClientEncryptionOpts.keyVaultClient
eramongodb 7fa4bcc
Fix id for clientEncryption entities
eramongodb 85bee86
Revert modification of CSE spec
eramongodb 885aab1
Update version and change log for unified test format spec
eramongodb f10bf89
Merge branch 'master' into client-encryption-entity
eramongodb 41ad053
Include replacement failure among error conditions for placeholder value
eramongodb 176f0c3
Permit flexible values for "$$placeholder"
eramongodb f2c9353
Add "$$placeholder" to changelog
eramongodb 706e577
Rename invalid format tests for consistency
eramongodb 0fd74eb
Remove inapplicable invalid tests due to revision of "client" -> "key…
eramongodb 3a94297
Add entity-clientEncryption-clientEncryptionOpts-required invalid test
eramongodb c8edfde
Add context note to clientEncryptionOpts-tlsOptions_not_supported inv…
eramongodb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
30 changes: 30 additions & 0 deletions
30
source/unified-test-format/tests/invalid/clientEncryptionOpts-additionalProperties.json
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,30 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-additionalProperties", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| }, | ||
| "invalid": {} | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
19 changes: 19 additions & 0 deletions
19
source/unified-test-format/tests/invalid/clientEncryptionOpts-additionalProperties.yml
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,19 @@ | ||
| description: clientEncryptionOpts-additionalProperties | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| aws: {} | ||
| invalid: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
23 changes: 23 additions & 0 deletions
23
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultClient-required.json
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,23 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-keyVaultClient-required", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
15 changes: 15 additions & 0 deletions
15
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultClient-required.yml
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,15 @@ | ||
| description: clientEncryptionOpts-keyVaultClient-required | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| aws: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
29 changes: 29 additions & 0 deletions
29
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultClient-type.json
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,29 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-keyVaultClient-type", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": 0, | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultClient-type.yml
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,18 @@ | ||
| description: clientEncryptionOpts-keyVaultClient-type | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: 0 | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| aws: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
28 changes: 28 additions & 0 deletions
28
...ce/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultNamespace-required.json
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,28 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-keyVaultNamespace-required", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
17 changes: 17 additions & 0 deletions
17
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultNamespace-required.yml
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,17 @@ | ||
| description: clientEncryptionOpts-keyVaultNamespace-required | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| kmsProviders: | ||
| aws: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
29 changes: 29 additions & 0 deletions
29
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultNamespace-type.json
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,29 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-keyVaultNamespace-type", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "keyVaultNamespace": 0, | ||
| "kmsProviders": { | ||
| "aws": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
source/unified-test-format/tests/invalid/clientEncryptionOpts-keyVaultNamespace-type.yml
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,18 @@ | ||
| description: clientEncryptionOpts-keyVaultNamespace-type | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| keyVaultNamespace: 0 | ||
| kmsProviders: | ||
| aws: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
29 changes: 29 additions & 0 deletions
29
...ied-test-format/tests/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.json
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,29 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-kmsProviders-additionalProperties", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "invalid": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
...fied-test-format/tests/invalid/clientEncryptionOpts-kmsProviders-additionalProperties.yml
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,18 @@ | ||
| description: clientEncryptionOpts-kmsProviders-additionalProperties | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| invalid: {} | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
31 changes: 31 additions & 0 deletions
31
...test-format/tests/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.json
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,31 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-kmsProviders-aws-additionalProperties", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "aws": { | ||
| "invalid": {} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
...-test-format/tests/invalid/clientEncryptionOpts-kmsProviders-aws-additionalProperties.yml
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,18 @@ | ||
| description: clientEncryptionOpts-kmsProviders-aws-additionalProperties | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| aws: { invalid: {} } | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
29 changes: 29 additions & 0 deletions
29
source/unified-test-format/tests/invalid/clientEncryptionOpts-kmsProviders-aws-type.json
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,29 @@ | ||
| { | ||
| "description": "clientEncryptionOpts-kmsProviders-aws-type", | ||
| "schemaVersion": "1.8", | ||
| "createEntities": [ | ||
| { | ||
| "client": { | ||
| "id": "client0" | ||
| } | ||
| }, | ||
| { | ||
| "clientEncryption": { | ||
| "id": "clientEncryption0", | ||
| "clientEncryptionOpts": { | ||
| "keyVaultClient": "client0", | ||
| "keyVaultNamespace": "keyvault.datakeys", | ||
| "kmsProviders": { | ||
| "aws": 0 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "tests": [ | ||
| { | ||
| "description": "", | ||
| "operations": [] | ||
| } | ||
| ] | ||
| } |
18 changes: 18 additions & 0 deletions
18
source/unified-test-format/tests/invalid/clientEncryptionOpts-kmsProviders-aws-type.yml
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,18 @@ | ||
| description: clientEncryptionOpts-kmsProviders-aws-type | ||
|
|
||
| schemaVersion: "1.8" | ||
|
|
||
| createEntities: | ||
| - client: | ||
| id: &client0 client0 | ||
| - clientEncryption: | ||
| id: &clientEncryption0 clientEncryption0 | ||
| clientEncryptionOpts: | ||
| keyVaultClient: *client0 | ||
| keyVaultNamespace: keyvault.datakeys | ||
| kmsProviders: | ||
| aws: 0 | ||
|
|
||
| tests: | ||
| - description: "" | ||
| operations: [] |
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.