From 5c7fcc81df2cfbd00a9d4aaccca743b521e91650 Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Mon, 9 Sep 2024 15:50:39 -0400 Subject: [PATCH 1/7] implementing modifyCollection using runCommand and collMod --- internal/integration/unified/operation.go | 2 +- .../modifyCollection-pre_and_post_images.json | 10 ++++++---- .../modifyCollection-pre_and_post_images.yml | 9 +++++---- .../crud/unified/findOneAndUpdate-errorResponse.json | 12 +++++++----- .../crud/unified/findOneAndUpdate-errorResponse.yml | 9 +++++---- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/internal/integration/unified/operation.go b/internal/integration/unified/operation.go index 75462693d0..3a4565dc46 100644 --- a/internal/integration/unified/operation.go +++ b/internal/integration/unified/operation.go @@ -268,7 +268,7 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat return executeAddKeyAltName(ctx, op) // Unsupported operations - case "count", "listIndexNames", "modifyCollection": + case "count", "listIndexNames": return nil, newSkipTestError(fmt.Sprintf("the %q operation is not supported", op.Name)) default: return nil, fmt.Errorf("unrecognized entity operation %q", op.Name) diff --git a/testdata/collection-management/modifyCollection-pre_and_post_images.json b/testdata/collection-management/modifyCollection-pre_and_post_images.json index 8026faeb17..1456d2abf9 100644 --- a/testdata/collection-management/modifyCollection-pre_and_post_images.json +++ b/testdata/collection-management/modifyCollection-pre_and_post_images.json @@ -61,12 +61,14 @@ } }, { - "name": "modifyCollection", + "name": "runCommand", "object": "database0", "arguments": { - "collection": "test", - "changeStreamPreAndPostImages": { - "enabled": true + "command": { + "collMod": "test", + "changeStreamPreAndPostImages": { + "enabled": true + } } } } diff --git a/testdata/collection-management/modifyCollection-pre_and_post_images.yml b/testdata/collection-management/modifyCollection-pre_and_post_images.yml index 75675bf2c7..6dac80fd6f 100644 --- a/testdata/collection-management/modifyCollection-pre_and_post_images.yml +++ b/testdata/collection-management/modifyCollection-pre_and_post_images.yml @@ -36,11 +36,12 @@ tests: arguments: databaseName: *database0Name collectionName: *collection0Name - - name: modifyCollection + - name: runCommand object: *database0 - arguments: - collection: *collection0Name - changeStreamPreAndPostImages: { enabled: true } + arguments: &enablePreAndPostImages + command: + collMod: *collection0Name + changeStreamPreAndPostImages: { enabled: true } expectEvents: - client: *client0 events: diff --git a/testdata/crud/unified/findOneAndUpdate-errorResponse.json b/testdata/crud/unified/findOneAndUpdate-errorResponse.json index 5023a450f3..3352e6c93b 100644 --- a/testdata/crud/unified/findOneAndUpdate-errorResponse.json +++ b/testdata/crud/unified/findOneAndUpdate-errorResponse.json @@ -90,13 +90,15 @@ ], "operations": [ { - "name": "modifyCollection", + "name": "runCommand", "object": "database0", "arguments": { - "collection": "test", - "validator": { - "x": { - "$type": "string" + "command": { + "collMod": "test", + "validator": { + "x": { + "$type": "string" + } } } } diff --git a/testdata/crud/unified/findOneAndUpdate-errorResponse.yml b/testdata/crud/unified/findOneAndUpdate-errorResponse.yml index 8faed76809..0aef65584c 100644 --- a/testdata/crud/unified/findOneAndUpdate-errorResponse.yml +++ b/testdata/crud/unified/findOneAndUpdate-errorResponse.yml @@ -46,12 +46,13 @@ tests: runOnRequirements: - minServerVersion: "5.0" operations: - - name: modifyCollection + - name: runCommand object: *database0 arguments: - collection: *collection0Name - validator: - x: { $type: "string" } + command: + collMod: *collection0Name + validator: + x: { $type: "string" } - name: findOneAndUpdate object: *collection0 arguments: From 8fbdb2d63f52e9f10ef2864e07c56011ea739524 Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Tue, 10 Sep 2024 09:57:45 -0400 Subject: [PATCH 2/7] Revert "implementing modifyCollection using runCommand and collMod" This reverts commit 5c7fcc81df2cfbd00a9d4aaccca743b521e91650. --- internal/integration/unified/operation.go | 2 +- .../modifyCollection-pre_and_post_images.json | 10 ++++------ .../modifyCollection-pre_and_post_images.yml | 9 ++++----- .../crud/unified/findOneAndUpdate-errorResponse.json | 12 +++++------- .../crud/unified/findOneAndUpdate-errorResponse.yml | 9 ++++----- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/internal/integration/unified/operation.go b/internal/integration/unified/operation.go index 3a4565dc46..75462693d0 100644 --- a/internal/integration/unified/operation.go +++ b/internal/integration/unified/operation.go @@ -268,7 +268,7 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat return executeAddKeyAltName(ctx, op) // Unsupported operations - case "count", "listIndexNames": + case "count", "listIndexNames", "modifyCollection": return nil, newSkipTestError(fmt.Sprintf("the %q operation is not supported", op.Name)) default: return nil, fmt.Errorf("unrecognized entity operation %q", op.Name) diff --git a/testdata/collection-management/modifyCollection-pre_and_post_images.json b/testdata/collection-management/modifyCollection-pre_and_post_images.json index 1456d2abf9..8026faeb17 100644 --- a/testdata/collection-management/modifyCollection-pre_and_post_images.json +++ b/testdata/collection-management/modifyCollection-pre_and_post_images.json @@ -61,14 +61,12 @@ } }, { - "name": "runCommand", + "name": "modifyCollection", "object": "database0", "arguments": { - "command": { - "collMod": "test", - "changeStreamPreAndPostImages": { - "enabled": true - } + "collection": "test", + "changeStreamPreAndPostImages": { + "enabled": true } } } diff --git a/testdata/collection-management/modifyCollection-pre_and_post_images.yml b/testdata/collection-management/modifyCollection-pre_and_post_images.yml index 6dac80fd6f..75675bf2c7 100644 --- a/testdata/collection-management/modifyCollection-pre_and_post_images.yml +++ b/testdata/collection-management/modifyCollection-pre_and_post_images.yml @@ -36,12 +36,11 @@ tests: arguments: databaseName: *database0Name collectionName: *collection0Name - - name: runCommand + - name: modifyCollection object: *database0 - arguments: &enablePreAndPostImages - command: - collMod: *collection0Name - changeStreamPreAndPostImages: { enabled: true } + arguments: + collection: *collection0Name + changeStreamPreAndPostImages: { enabled: true } expectEvents: - client: *client0 events: diff --git a/testdata/crud/unified/findOneAndUpdate-errorResponse.json b/testdata/crud/unified/findOneAndUpdate-errorResponse.json index 3352e6c93b..5023a450f3 100644 --- a/testdata/crud/unified/findOneAndUpdate-errorResponse.json +++ b/testdata/crud/unified/findOneAndUpdate-errorResponse.json @@ -90,15 +90,13 @@ ], "operations": [ { - "name": "runCommand", + "name": "modifyCollection", "object": "database0", "arguments": { - "command": { - "collMod": "test", - "validator": { - "x": { - "$type": "string" - } + "collection": "test", + "validator": { + "x": { + "$type": "string" } } } diff --git a/testdata/crud/unified/findOneAndUpdate-errorResponse.yml b/testdata/crud/unified/findOneAndUpdate-errorResponse.yml index 0aef65584c..8faed76809 100644 --- a/testdata/crud/unified/findOneAndUpdate-errorResponse.yml +++ b/testdata/crud/unified/findOneAndUpdate-errorResponse.yml @@ -46,13 +46,12 @@ tests: runOnRequirements: - minServerVersion: "5.0" operations: - - name: runCommand + - name: modifyCollection object: *database0 arguments: - command: - collMod: *collection0Name - validator: - x: { $type: "string" } + collection: *collection0Name + validator: + x: { $type: "string" } - name: findOneAndUpdate object: *collection0 arguments: From ab18d490e7f74d667a8a0a000f3e93b868162ad5 Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Tue, 10 Sep 2024 15:39:40 -0400 Subject: [PATCH 3/7] create executeModifyCollection --- .../unified/database_operation_execution.go | 29 +++++++++++++++++++ internal/integration/unified/operation.go | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/internal/integration/unified/database_operation_execution.go b/internal/integration/unified/database_operation_execution.go index 7fa42f3c78..fbede94273 100644 --- a/internal/integration/unified/database_operation_execution.go +++ b/internal/integration/unified/database_operation_execution.go @@ -223,6 +223,35 @@ func executeListCollectionNames(ctx context.Context, operation *operation) (*ope return newValueResult(bson.TypeArray, data, nil), nil } +func executeModifyCollection(ctx context.Context, operation *operation) (*operationResult, error) { + db, err := entities(ctx).database(operation.Object) + if err != nil { + return nil, err + } + + collModCmd := bson.D{} + + elems, _ := operation.Arguments.Elements() + for _, elem := range elems { + key := elem.Key() + val := elem.Value() + + switch key { + case "collection": + collModCmd = append(collModCmd, bson.E{"collMod", val.StringValue()}) + case "changeStreamPreAndPostImages": + collModCmd = append(collModCmd, bson.E{"changeStreamPreAndPostImages", val.Document()}) + case "validator": + collModCmd = append(collModCmd, bson.E{"validator", val.Document()}) + default: + return nil, fmt.Errorf("unrecognized modifyCollection option %q", key) + } + } + + res, err := db.RunCommand(ctx, collModCmd).Raw() + return newDocumentResult(res, err), nil +} + func executeRunCommand(ctx context.Context, operation *operation) (*operationResult, error) { db, err := entities(ctx).database(operation.Object) if err != nil { diff --git a/internal/integration/unified/operation.go b/internal/integration/unified/operation.go index 75462693d0..f74fc9361e 100644 --- a/internal/integration/unified/operation.go +++ b/internal/integration/unified/operation.go @@ -145,6 +145,8 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat return executeListCollections(ctx, op) case "listCollectionNames": return executeListCollectionNames(ctx, op) + case "modifyCollection": + return executeModifyCollection(ctx, op) case "runCommand": return executeRunCommand(ctx, op) case "runCursorCommand": @@ -268,7 +270,7 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat return executeAddKeyAltName(ctx, op) // Unsupported operations - case "count", "listIndexNames", "modifyCollection": + case "count", "listIndexNames": return nil, newSkipTestError(fmt.Sprintf("the %q operation is not supported", op.Name)) default: return nil, fmt.Errorf("unrecognized entity operation %q", op.Name) From c1efef5b454a78332db8991cf0c3059fbbbdae92 Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Tue, 10 Sep 2024 16:59:40 -0400 Subject: [PATCH 4/7] sync spec tests for collMod and modifyCollection --- .../change-streams-pre_and_post_images.json | 4 +- .../change-streams-pre_and_post_images.yml | 4 +- .../change-streams-showExpandedEvents.json | 7 +- .../change-streams-showExpandedEvents.yml | 8 +- .../modifyCollection-errorResponse.json | 118 ++++++++++++++++++ .../modifyCollection-errorResponse.yml | 59 +++++++++ 6 files changed, 189 insertions(+), 11 deletions(-) create mode 100644 testdata/collection-management/modifyCollection-errorResponse.json create mode 100644 testdata/collection-management/modifyCollection-errorResponse.yml diff --git a/testdata/change-streams/change-streams-pre_and_post_images.json b/testdata/change-streams/change-streams-pre_and_post_images.json index 8beefb2bc8..1d6f7dc9e3 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.json +++ b/testdata/change-streams/change-streams-pre_and_post_images.json @@ -6,7 +6,7 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ], "serverless": "forbid" @@ -824,4 +824,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/testdata/change-streams/change-streams-pre_and_post_images.yml b/testdata/change-streams/change-streams-pre_and_post_images.yml index 2f6edd9820..f26de58ebb 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.yml +++ b/testdata/change-streams/change-streams-pre_and_post_images.yml @@ -4,7 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "6.0.0" - topologies: [ replicaset, sharded-replicaset, load-balanced ] + topologies: [ replicaset, sharded, load-balanced ] serverless: forbid createEntities: @@ -348,4 +348,4 @@ tests: command: aggregate: *collection0Name pipeline: - - $changeStream: { fullDocumentBeforeChange: "off" } + - $changeStream: { fullDocumentBeforeChange: "off" } \ No newline at end of file diff --git a/testdata/change-streams/change-streams-showExpandedEvents.json b/testdata/change-streams/change-streams-showExpandedEvents.json index 3eed2f534a..8363d6351a 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.json +++ b/testdata/change-streams/change-streams-showExpandedEvents.json @@ -6,9 +6,9 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", - "sharded-replicaset", "sharded" - ] + ], + "serverless": "forbid" } ], "createEntities": [ @@ -462,7 +462,6 @@ "runOnRequirements": [ { "topologies": [ - "sharded-replicaset", "sharded" ] } @@ -514,4 +513,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/testdata/change-streams/change-streams-showExpandedEvents.yml b/testdata/change-streams/change-streams-showExpandedEvents.yml index c0443d0e22..32c23f595a 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.yml +++ b/testdata/change-streams/change-streams-showExpandedEvents.yml @@ -2,7 +2,8 @@ description: "change-streams-showExpandedEvents" schemaVersion: "1.7" runOnRequirements: - minServerVersion: "6.0.0" - topologies: [ replicaset, sharded-replicaset, sharded ] + topologies: [ replicaset, sharded ] + serverless: forbid createEntities: - client: id: &client0 client0 @@ -275,7 +276,8 @@ tests: - description: "when showExpandedEvents is true, shardCollection events are reported" runOnRequirements: - - topologies: [ sharded-replicaset, sharded ] + # Note: minServerVersion is specified in top-level runOnRequirements + - topologies: [ sharded ] operations: - name: dropCollection object: *shardedDb @@ -302,4 +304,4 @@ tests: - name: iterateUntilDocumentOrError object: *changeStream0 expectResult: - operationType: shardCollection + operationType: shardCollection \ No newline at end of file diff --git a/testdata/collection-management/modifyCollection-errorResponse.json b/testdata/collection-management/modifyCollection-errorResponse.json new file mode 100644 index 0000000000..adbd3167d7 --- /dev/null +++ b/testdata/collection-management/modifyCollection-errorResponse.json @@ -0,0 +1,118 @@ +{ + "description": "modifyCollection-errorResponse", + "schemaVersion": "1.12", + "createEntities": [ + { + "client": { + "id": "client0", + "observeEvents": [ + "commandStartedEvent" + ] + } + }, + { + "database": { + "id": "database0", + "client": "client0", + "databaseName": "collMod-tests" + } + }, + { + "collection": { + "id": "collection0", + "database": "database0", + "collectionName": "test" + } + } + ], + "initialData": [ + { + "collectionName": "test", + "databaseName": "collMod-tests", + "documents": [ + { + "_id": 1, + "x": 1 + }, + { + "_id": 2, + "x": 1 + } + ] + } + ], + "tests": [ + { + "description": "modifyCollection prepareUnique violations are accessible", + "runOnRequirements": [ + { + "minServerVersion": "5.2" + } + ], + "operations": [ + { + "name": "createIndex", + "object": "collection0", + "arguments": { + "keys": { + "x": 1 + } + } + }, + { + "name": "modifyCollection", + "object": "database0", + "arguments": { + "collection": "test", + "index": { + "keyPattern": { + "x": 1 + }, + "prepareUnique": true + } + } + }, + { + "name": "insertOne", + "object": "collection0", + "arguments": { + "document": { + "_id": 3, + "x": 1 + } + }, + "expectError": { + "errorCode": 11000 + } + }, + { + "name": "modifyCollection", + "object": "database0", + "arguments": { + "collection": "test", + "index": { + "keyPattern": { + "x": 1 + }, + "unique": true + } + }, + "expectError": { + "isClientError": false, + "errorCode": 359, + "errorResponse": { + "violations": [ + { + "ids": [ + 1, + 2 + ] + } + ] + } + } + } + ] + } + ] + } \ No newline at end of file diff --git a/testdata/collection-management/modifyCollection-errorResponse.yml b/testdata/collection-management/modifyCollection-errorResponse.yml new file mode 100644 index 0000000000..edff573295 --- /dev/null +++ b/testdata/collection-management/modifyCollection-errorResponse.yml @@ -0,0 +1,59 @@ +description: "modifyCollection-errorResponse" + +schemaVersion: "1.12" + +createEntities: + - client: + id: &client0 client0 + observeEvents: [ commandStartedEvent ] + - database: + id: &database0 database0 + client: *client0 + databaseName: &database0Name collMod-tests + - collection: + id: &collection0 collection0 + database: *database0 + collectionName: &collection0Name test + +initialData: &initialData + - collectionName: *collection0Name + databaseName: *database0Name + documents: + - { _id: 1, x: 1 } + - { _id: 2, x: 1 } + +tests: + - description: "modifyCollection prepareUnique violations are accessible" + runOnRequirements: + - minServerVersion: "5.2" # SERVER-61158 + operations: + - name: createIndex + object: *collection0 + arguments: + keys: { x: 1 } + - name: modifyCollection + object: *database0 + arguments: + collection: *collection0Name + index: + keyPattern: { x: 1 } + prepareUnique: true + - name: insertOne + object: *collection0 + arguments: + document: { _id: 3, x: 1 } + expectError: + errorCode: 11000 # DuplicateKey + - name: modifyCollection + object: *database0 + arguments: + collection: *collection0Name + index: + keyPattern: { x: 1 } + unique: true + expectError: + isClientError: false + errorCode: 359 # CannotConvertIndexToUnique + errorResponse: + violations: + - { ids: [ 1, 2 ] } \ No newline at end of file From c4aa3a4fa4b948ee2c3c56cb00dd477055d7985f Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Tue, 10 Sep 2024 17:05:03 -0400 Subject: [PATCH 5/7] add index case --- internal/integration/unified/database_operation_execution.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/integration/unified/database_operation_execution.go b/internal/integration/unified/database_operation_execution.go index fbede94273..2ed57014c0 100644 --- a/internal/integration/unified/database_operation_execution.go +++ b/internal/integration/unified/database_operation_execution.go @@ -243,6 +243,8 @@ func executeModifyCollection(ctx context.Context, operation *operation) (*operat collModCmd = append(collModCmd, bson.E{"changeStreamPreAndPostImages", val.Document()}) case "validator": collModCmd = append(collModCmd, bson.E{"validator", val.Document()}) + case "index": + collModCmd = append(collModCmd, bson.E{"index", val.Document()}) default: return nil, fmt.Errorf("unrecognized modifyCollection option %q", key) } From 6e8f4c030a8c63dc701c4686541dc62361b7356c Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Wed, 11 Sep 2024 11:22:13 -0400 Subject: [PATCH 6/7] revert collMod test sync --- .../change-streams/change-streams-pre_and_post_images.json | 2 +- .../change-streams/change-streams-pre_and_post_images.yml | 2 +- .../change-streams/change-streams-showExpandedEvents.json | 5 +++-- .../change-streams/change-streams-showExpandedEvents.yml | 6 ++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/testdata/change-streams/change-streams-pre_and_post_images.json b/testdata/change-streams/change-streams-pre_and_post_images.json index 1d6f7dc9e3..172539bb3f 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.json +++ b/testdata/change-streams/change-streams-pre_and_post_images.json @@ -6,7 +6,7 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", - "sharded", + "sharded-replicaset", "load-balanced" ], "serverless": "forbid" diff --git a/testdata/change-streams/change-streams-pre_and_post_images.yml b/testdata/change-streams/change-streams-pre_and_post_images.yml index f26de58ebb..bb3ef5151c 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.yml +++ b/testdata/change-streams/change-streams-pre_and_post_images.yml @@ -4,7 +4,7 @@ schemaVersion: "1.4" runOnRequirements: - minServerVersion: "6.0.0" - topologies: [ replicaset, sharded, load-balanced ] + topologies: [ replicaset, sharded-replicaset, load-balanced ] serverless: forbid createEntities: diff --git a/testdata/change-streams/change-streams-showExpandedEvents.json b/testdata/change-streams/change-streams-showExpandedEvents.json index 8363d6351a..d1a35393f4 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.json +++ b/testdata/change-streams/change-streams-showExpandedEvents.json @@ -6,9 +6,9 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", + "sharded-replicaset", "sharded" - ], - "serverless": "forbid" + ] } ], "createEntities": [ @@ -462,6 +462,7 @@ "runOnRequirements": [ { "topologies": [ + "sharded-replicaset", "sharded" ] } diff --git a/testdata/change-streams/change-streams-showExpandedEvents.yml b/testdata/change-streams/change-streams-showExpandedEvents.yml index 32c23f595a..b811f062b1 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.yml +++ b/testdata/change-streams/change-streams-showExpandedEvents.yml @@ -2,8 +2,7 @@ description: "change-streams-showExpandedEvents" schemaVersion: "1.7" runOnRequirements: - minServerVersion: "6.0.0" - topologies: [ replicaset, sharded ] - serverless: forbid + topologies: [ replicaset, sharded-replicaset, sharded ] createEntities: - client: id: &client0 client0 @@ -276,8 +275,7 @@ tests: - description: "when showExpandedEvents is true, shardCollection events are reported" runOnRequirements: - # Note: minServerVersion is specified in top-level runOnRequirements - - topologies: [ sharded ] + - topologies: [ sharded-replicaset, sharded ] operations: - name: dropCollection object: *shardedDb From 4aafca36a757fee96e89b233dbce340d4ea8e93f Mon Sep 17 00:00:00 2001 From: Joy Wang Date: Wed, 11 Sep 2024 11:26:45 -0400 Subject: [PATCH 7/7] formmatting --- testdata/change-streams/change-streams-pre_and_post_images.json | 2 +- testdata/change-streams/change-streams-pre_and_post_images.yml | 2 +- testdata/change-streams/change-streams-showExpandedEvents.json | 2 +- testdata/change-streams/change-streams-showExpandedEvents.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testdata/change-streams/change-streams-pre_and_post_images.json b/testdata/change-streams/change-streams-pre_and_post_images.json index 172539bb3f..8beefb2bc8 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.json +++ b/testdata/change-streams/change-streams-pre_and_post_images.json @@ -824,4 +824,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/testdata/change-streams/change-streams-pre_and_post_images.yml b/testdata/change-streams/change-streams-pre_and_post_images.yml index bb3ef5151c..2f6edd9820 100644 --- a/testdata/change-streams/change-streams-pre_and_post_images.yml +++ b/testdata/change-streams/change-streams-pre_and_post_images.yml @@ -348,4 +348,4 @@ tests: command: aggregate: *collection0Name pipeline: - - $changeStream: { fullDocumentBeforeChange: "off" } \ No newline at end of file + - $changeStream: { fullDocumentBeforeChange: "off" } diff --git a/testdata/change-streams/change-streams-showExpandedEvents.json b/testdata/change-streams/change-streams-showExpandedEvents.json index d1a35393f4..3eed2f534a 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.json +++ b/testdata/change-streams/change-streams-showExpandedEvents.json @@ -514,4 +514,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/testdata/change-streams/change-streams-showExpandedEvents.yml b/testdata/change-streams/change-streams-showExpandedEvents.yml index b811f062b1..c0443d0e22 100644 --- a/testdata/change-streams/change-streams-showExpandedEvents.yml +++ b/testdata/change-streams/change-streams-showExpandedEvents.yml @@ -302,4 +302,4 @@ tests: - name: iterateUntilDocumentOrError object: *changeStream0 expectResult: - operationType: shardCollection \ No newline at end of file + operationType: shardCollection