mongo 2.15.0.alpha → 2.15.0

data/spec/spec_tests/data/change_streams/change-streams-resume-errorLabels.yml

@@ -9,10 +9,10 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout # SERVER-46091 explains why a new failpoint was needed
       mode: { times: 1 }
       data:
-          errorCode: 6
-          closeConnection: false
+        errorCode: 6
+        closeConnection: false
     target: collection
-    topology: 
+    topology:
       - replicaset
       - sharded
     changeStreamPipeline: []
@@ -72,8 +72,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 7
-          closeConnection: false
+        errorCode: 7
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -135,8 +135,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 89
-          closeConnection: false
+        errorCode: 89
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -198,8 +198,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 91
-          closeConnection: false
+        errorCode: 91
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -261,8 +261,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 189
-          closeConnection: false
+        errorCode: 189
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -324,8 +324,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 262
-          closeConnection: false
+        errorCode: 262
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -387,8 +387,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 9001
-          closeConnection: false
+        errorCode: 9001
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -444,14 +444,14 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMaster"
+    description: "change stream resumes after NotWritablePrimary"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 10107
-          closeConnection: false
+        errorCode: 10107
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -513,8 +513,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 11600
-          closeConnection: false
+        errorCode: 11600
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -576,8 +576,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 11602
-          closeConnection: false
+        errorCode: 11602
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -633,14 +633,14 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterNoSlaveOk"
+    description: "change stream resumes after NotPrimaryNoSecondaryOk"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 13435
-          closeConnection: false
+        errorCode: 13435
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -696,14 +696,14 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterOrSecondary"
+    description: "change stream resumes after NotPrimaryOrSecondary"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 13436
-          closeConnection: false
+        errorCode: 13436
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -765,8 +765,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 63
-          closeConnection: false
+        errorCode: 63
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -828,8 +828,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 150
-          closeConnection: false
+        errorCode: 150
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -891,8 +891,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 234
-          closeConnection: false
+        errorCode: 234
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -954,8 +954,8 @@ tests:
       configureFailPoint: failGetMoreAfterCursorCheckout
       mode: { times: 1 }
       data:
-          errorCode: 133
-          closeConnection: false
+        errorCode: 133
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -1010,7 +1010,7 @@ tests:
           fullDocument:
             x:
               $numberInt: "1"
-  # The next two tests ensure that the driver only uses the error label, not the whitelist.
+  # The next two tests ensure that the driver only uses the error label, not the allow list.
   -
     description: "change stream resumes if error contains ResumableChangeStreamError"
     minServerVersion: "4.3.1"
@@ -1018,10 +1018,10 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 50 # Use an error code that does not have the whitelist label by default
-          closeConnection: false
-          errorLabels: ["ResumableChangeStreamError"]
+        failCommands: ["getMore"]
+        errorCode: 50 # Use an error code that does not have the allow list label by default
+        closeConnection: false
+        errorLabels: ["ResumableChangeStreamError"]
     target: collection
     topology:
       - replicaset
@@ -1080,12 +1080,12 @@ tests:
     description: "change stream does not resume if error does not contain ResumableChangeStreamError"
     minServerVersion: "4.3.1"
     failPoint:
-      configureFailPoint: failCommand # failCommand will not add the whitelist error label
+      configureFailPoint: failCommand # failCommand will not add the allow list error label
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 6 # Use an error code that is on the whitelist
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 6 # Use an error code that is on the allow list
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -1102,4 +1102,4 @@ tests:
             x: 1
     result:
       error:
-        code: 6
+        code: 6

data/spec/spec_tests/data/change_streams_unified/change-streams.yml

@@ -0,0 +1,72 @@
+description: "change-streams"
+schemaVersion: "1.0"
+createEntities:
+  - client:
+      id: &client0 client0
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: *database0
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: *collection0
+initialData:
+  - collectionName: *collection0
+    databaseName: *database0
+    documents: []
+tests:
+  - description: "Test array truncation"
+    runOnRequirements:
+      - minServerVersion: "4.7"
+        topologies: [replicaset]
+    operations:
+      - name: insertOne
+        object: *collection0
+        arguments:
+          document: {
+            "_id": 1,
+            "a": 1,
+            "array": ["foo", {"a": "bar"}, 1, 2, 3]
+          }
+      - name: createChangeStream
+        object: *collection0
+        arguments:
+          pipeline: []
+        saveResultAsEntity: &changeStream0 changeStream0
+      - name: updateOne
+        object: *collection0
+        arguments:
+          filter: {
+            "_id": 1
+          }
+          update: [
+            {
+              "$set": {
+                "array": ["foo", {"a": "bar"}]
+              }
+            }
+          ]
+      - name: iterateUntilDocumentOrError
+        object: *changeStream0
+        expectResult: {
+          "operationType": "update",
+          "ns": {
+            "db": "database0",
+            "coll": "collection0"
+          },
+          # It is up to the MongoDB server to decide how to report a change.
+          # This expectation is based on the current MongoDB server behavior.
+          # Alternatively, we could have used a set of possible expectations of which only one
+          # must be satisfied, but the unified test format does not support this.
+          "updateDescription": {
+            "updatedFields": {},
+            "removedFields": [],
+            "truncatedArrays": [
+              {
+                "field": "array",
+                "newSize": 2
+              }
+            ]
+          }
+        }

data/spec/spec_tests/data/collection_management/timeseries-collection.yml

@@ -0,0 +1,129 @@
+description: "timeseries-collection"
+
+schemaVersion: "1.0"
+
+runOnRequirements:
+  - minServerVersion: "5.0"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      observeEvents: [ commandStartedEvent ]
+  - database:
+      id: &database0 database0
+      client: *client0
+      databaseName: &database0Name ts-tests
+  - collection:
+      id: &collection0 collection0
+      database: *database0
+      collectionName: &collection0Name test
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    documents: []
+
+tests:
+  - description: "createCollection with all options"
+    operations:
+      - name: dropCollection
+        object: *database0
+        arguments:
+          collection: *collection0Name
+      - name: createCollection
+        object: *database0
+        arguments:
+          collection: *collection0Name
+          # expireAfterSeconds should be an int64 (as it is stored on the server).
+          expireAfterSeconds: 604800
+          timeseries: &timeseries0
+            timeField: "time"
+            metaField: "meta"
+            granularity: "minutes"
+      - name: assertCollectionExists
+        object: testRunner
+        arguments:
+          databaseName: *database0Name
+          collectionName: *collection0Name
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                drop: *collection0Name
+              databaseName: *database0Name
+          - commandStartedEvent:
+              command:
+                create: *collection0Name
+                expireAfterSeconds: 604800
+                timeseries: *timeseries0
+              databaseName: *database0Name
+
+  # Unlike regular collections, time-series collections allow duplicate ids.
+  - description: "insertMany with duplicate ids"
+    operations:
+      - name: dropCollection
+        object: *database0
+        arguments:
+          collection: *collection0Name
+      - name: createCollection
+        object: *database0
+        arguments:
+          collection: *collection0Name
+          # expireAfterSeconds should be an int64 (as it is stored on the server).
+          expireAfterSeconds: 604800
+          timeseries: *timeseries0
+      - name: assertCollectionExists
+        object: testRunner
+        arguments:
+          databaseName: *database0Name
+          collectionName: *collection0Name
+      - name: insertMany
+        object: *collection0
+        arguments:
+          documents: &docs
+            - {
+                _id: 1,
+                time: {
+                  $date: {
+                    $numberLong: "1552949630482"
+                  }
+                }
+              }
+            - {
+                _id: 1,
+                time: {
+                  $date: {
+                    $numberLong: "1552949630483"
+                  }
+                }
+              }
+      - name: find
+        object: *collection0
+        arguments:
+          filter: {}
+          sort: { time: 1 }
+        expectResult: *docs
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                drop: *collection0Name
+              databaseName: *database0Name
+          - commandStartedEvent:
+              command:
+                create: *collection0Name
+                expireAfterSeconds: 604800
+                timeseries: *timeseries0
+              databaseName: *database0Name
+          - commandStartedEvent:
+              command:
+                insert: *collection0Name
+                documents: *docs
+          - commandStartedEvent:
+              command:
+                find: *collection0Name
+                filter: {}
+                sort: { time: 1 }
+              databaseName: *database0Name

data/spec/spec_tests/data/command_monitoring_unified/redacted-commands.yml

@@ -0,0 +1,340 @@
+description: "redacted-commands"
+
+schemaVersion: "1.5"
+
+runOnRequirements:
+  - minServerVersion: "5.0"
+    auth: false
+
+createEntities:
+  - client:
+      id: &client client
+      observeEvents:
+        - commandStartedEvent
+        - commandSucceededEvent
+      observeSensitiveCommands: true
+  - database:
+      id: &database database
+      client: *client
+      databaseName: &databaseName command-monitoring-tests
+
+tests:
+  - description: "authenticate"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: authenticate
+          command:
+            authenticate: 1
+            mechanism: "MONGODB-X509"
+            user: "CN=myName,OU=myOrgUnit,O=myOrg,L=myLocality,ST=myState,C=myCountry"
+            db: "$external"
+        # An authentication error is expected, but we want to check that the
+        # CommandStartedEvent is redacted
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: authenticate
+              # We cannot simply assert that command is an empty document
+              # because it's at root-level, so we make a best effort to make
+              # sure sensitive fields are redacted.
+              command:
+                authenticate: { $$exists: false }
+                mechanism: { $$exists: false }
+                user: { $$exists: false }
+                db: { $$exists: false }
+
+  - description: "saslStart"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: saslStart
+          command:
+            saslStart: 1
+            payload: "definitely-invalid-payload"
+            db: "admin"
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: saslStart
+              command:
+                saslStart: { $$exists: false }
+                payload: { $$exists: false }
+                db: { $$exists: false }
+
+  - description: "saslContinue"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: saslContinue
+          command:
+            saslContinue: 1
+            conversationId: 0
+            payload: "definitely-invalid-payload"
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: saslContinue
+              command:
+                saslContinue: { $$exists: false }
+                conversationId: { $$exists: false }
+                payload: { $$exists: false }
+
+  - description: "getnonce"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: getnonce
+          command:
+            getnonce: 1
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: getnonce
+              command: { getnonce: { $$exists: false } }
+          - commandSucceededEvent:
+              commandName: getnonce
+              reply:
+                ok: { $$exists: false }
+                nonce: { $$exists: false }
+
+  - description: "createUser"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: createUser
+          command:
+            createUser: "private"
+            # Passing an object is prohibited and we want to trigger a command
+            # failure
+            pwd: {}
+            roles: []
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: createUser
+              command:
+                createUser: { $$exists: false }
+                pwd: { $$exists: false }
+                roles: { $$exists: false }
+
+  - description: "updateUser"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: updateUser
+          command:
+            updateUser: "private"
+            pwd: {}
+            roles: []
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: updateUser
+              command:
+                updateUser: { $$exists: false }
+                pwd: { $$exists: false }
+                roles: { $$exists: false }
+
+  - description: "copydbgetnonce"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: copydbgetnonce
+          command:
+            copydbgetnonce: "private"
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: copydbgetnonce
+              command: { copydbgetnonce: { $$exists: false } }
+
+  - description: "copydbsaslstart"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: copydbsaslstart
+          command:
+            copydbsaslstart: "private"
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: copydbsaslstart
+              command: { copydbsaslstart: { $$exists: false } }
+
+  - description: "copydb"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: copydb
+          command:
+            copydb: "private"
+        expectError:
+          isError: true
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: copydb
+              command: { copydb: { $$exists: false } }
+
+  - description: "hello with speculative authenticate"
+    runOnRequirements:
+      - minServerVersion: "4.9"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: hello
+          command:
+            hello: 1
+            speculativeAuthenticate:
+              saslStart: 1
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: hello
+              command:
+                hello: { $$exists: false }
+                speculativeAuthenticate: { $$exists: false }
+          - commandSucceededEvent:
+              commandName: hello
+              reply:
+                # Even though authentication above fails and the reply does not
+                # contain sensitive information, we're expecting the reply to be
+                # redacted as well.
+                isWritablePrimary: { $$exists: false }
+                # This assertion will currently always hold true since we're
+                # not expecting successful authentication, in which case this
+                # field is missing anyways.
+                speculativeAuthenticate: { $$exists: false }
+
+  - description: "legacy hello with speculative authenticate"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: ismaster
+          command:
+            ismaster: 1
+            speculativeAuthenticate:
+              saslStart: 1
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: isMaster
+          command:
+            isMaster: 1
+            speculativeAuthenticate:
+              saslStart: 1
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: ismaster
+              command:
+                ismaster: { $$exists: false }
+                speculativeAuthenticate: { $$exists: false }
+          - commandSucceededEvent:
+              commandName: ismaster
+              reply:
+                ismaster: { $$exists: false }
+                speculativeAuthenticate: { $$exists: false }
+          - commandStartedEvent:
+              commandName: isMaster
+              command:
+                isMaster: { $$exists: false }
+                speculativeAuthenticate: { $$exists: false }
+          - commandSucceededEvent:
+              commandName: isMaster
+              reply:
+                ismaster: { $$exists: false }
+                speculativeAuthenticate: { $$exists: false }
+
+  - description: "hello without speculative authenticate is not redacted"
+    runOnRequirements:
+      - minServerVersion: "4.9"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: hello
+          command:
+            hello: 1
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: hello
+              command:
+                hello: 1
+          - commandSucceededEvent:
+              commandName: hello
+              reply:
+                isWritablePrimary: { $$exists: true }
+
+  - description: "legacy hello without speculative authenticate is not redacted"
+    operations:
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: ismaster
+          command:
+            ismaster: 1
+      - name: runCommand
+        object: *database
+        arguments:
+          commandName: isMaster
+          command:
+            isMaster: 1
+    expectEvents:
+      - client: *client
+        events:
+          - commandStartedEvent:
+              commandName: ismaster
+              command:
+                ismaster: 1
+          - commandSucceededEvent:
+              commandName: ismaster
+              reply:
+                ismaster: { $$exists: true }
+          - commandStartedEvent:
+              commandName: isMaster
+              command:
+                isMaster: 1
+          - commandSucceededEvent:
+              commandName: isMaster
+              reply:
+                ismaster: { $$exists: true }