CDRIVER-3917 Run versioned API tests in Evergreen (#773)

benjirewis · kevinAlbs · commit 734b5c0ae376 · 2021-06-02T20:38:02.000-04:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -416,6 +416,7 @@ functions:
         export SSL=${SSL}
         export ORCHESTRATION_FILE=${ORCHESTRATION_FILE}
         export OCSP=${OCSP}
+        export REQUIRE_API_VERSION=${REQUIRE_API_VERSION}
         sh .evergreen/integration-tests.sh
   run tests:
   - command: shell.exec
@@ -694,8 +695,13 @@ functions:
       working_dir: mongoc
       background: true
       shell: bash
-      script: "set -o errexit\nset -o xtrace\nset -o xtrace\ncd drivers-evergreen-tools\
-        \ \nexport DRIVERS_TOOLS=$(pwd)\nsh .evergreen/atlas_data_lake/run-mongohouse-local.sh"
+      script: |-
+        set -o errexit
+        set -o xtrace
+        set -o xtrace
+        cd drivers-evergreen-tools
+        export DRIVERS_TOOLS=$(pwd)
+        sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
   test mongohouse:
   - command: shell.exec
     type: test
@@ -716,6 +722,29 @@ functions:
         export RUN_MONGOHOUSE_TESTS=true
         ./src/libmongoc/test-libmongoc --no-fork -l /mongohouse/* -d
         unset RUN_MONGOHOUSE_TESTS
+  test versioned api:
+  - command: shell.exec
+    type: test
+    params:
+      working_dir: mongoc
+      shell: bash
+      script: |-
+        set -o errexit
+        set -o xtrace
+        export COMPRESSORS='${COMPRESSORS}'
+        export CC='${CC}'
+        export AUTH=${AUTH}
+        export SSL=${SSL}
+        export URI=${URI}
+        export IPV4_ONLY=${IPV4_ONLY}
+        export VALGRIND=${VALGRIND}
+        export MONGOC_TEST_URI=${URI}
+        export DNS=${DNS}
+        export ASAN=${ASAN}
+        export MONGODB_API_VERSION=1
+        # TODO: CDRIVER-3954 Run all integration tests
+        ./src/libmongoc/test-libmongoc --no-fork -l /versioned_api/* -d
+        unset MONGODB_API_VERSION
   run aws tests:
   - command: shell.exec
     type: test
@@ -17473,6 +17502,52 @@ tasks:
   - func: run auth tests
     vars:
       valgrind: 'true'
+- name: test-versioned-api
+  tags:
+  - versioned-api
+  depends_on:
+    name: debug-compile-nosasl-openssl
+  commands:
+  - func: fetch build
+    vars:
+      BUILD_NAME: debug-compile-nosasl-openssl
+  - func: fetch build
+    vars:
+      BUILD_NAME: debug-compile-nosasl-openssl
+  - func: bootstrap mongo-orchestration
+    vars:
+      AUTH: auth
+      REQUIRE_API_VERSION: 'true'
+      SSL: ssl
+      TOPOLOGY: server
+      VERSION: latest
+  - func: test versioned api
+    vars:
+      AUTH: auth
+      SSL: ssl
+- name: test-versioned-api-accept-version-two
+  tags:
+  - versioned-api
+  depends_on:
+    name: debug-compile-nosasl-openssl
+  commands:
+  - func: fetch build
+    vars:
+      BUILD_NAME: debug-compile-nosasl-openssl
+  - func: fetch build
+    vars:
+      BUILD_NAME: debug-compile-nosasl-openssl
+  - func: bootstrap mongo-orchestration
+    vars:
+      AUTH: auth
+      ORCHESTRATION_FILE: versioned-api-testing
+      SSL: ssl
+      TOPOLOGY: server
+      VERSION: latest
+  - func: test versioned api
+    vars:
+      AUTH: auth
+      SSL: ssl
 - name: build-and-run-authentication-tests-openssl-0.9.8
   commands:
   - func: install ssl
@@ -23162,3 +23237,9 @@ buildvariants:
   tasks:
   - .tsan
   batchtime: 1440
+- name: versioned-api
+  display_name: Versioned API Tests
+  run_on: ubuntu1804-test
+  tasks:
+  - debug-compile-nosasl-openssl
+  - .versioned-api
diff --git a/.evergreen/integration-tests.sh b/.evergreen/integration-tests.sh
@@ -12,6 +12,8 @@
 # ORCHESTRATION_FILE: <file name in orchestration_configs/ without .json>
 #   If this is not set, the file name is constructed from other options.
 # OCSP: off, on
+# REQUIRE_API_VERSION: set to a non-empty string to set the requireApiVersion parameter
+#   This is currently only supported for standalone servers
 #
 # This script may be run locally.
 #
@@ -39,6 +41,7 @@ AUTH=${AUTH:-noauth}
 SSL=${SSL:-nossl}
 TOPOLOGY=${TOPOLOGY:-server}
 OCSP=${OCSP:-off}
+REQUIRE_API_VERSION=${REQUIRE_API_VERSION}
 
 # If caller of script specifies an ORCHESTRATION_FILE, do not attempt to modify it. Otherwise construct it.
 if [ -z "$ORCHESTRATION_FILE" ]; then
@@ -166,3 +169,8 @@ echo $MONGO_SHELL_CONNECTION_FLAGS
 
 `pwd`/mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval 'printjson(db.serverBuildInfo())' admin
 `pwd`/mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval 'printjson(db.isMaster())' admin
+
+# Set the requireApiVersion parameter.
+if [ ! -z "$REQUIRE_API_VERSION" ]; then
+  `pwd`/mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS $DIR/require-api-version.js
+fi
diff --git a/.evergreen/require-api-version.js b/.evergreen/require-api-version.js
@@ -0,0 +1 @@
+db.adminCommand({ "setParameter": 1, "requireApiVersion": 1 });
diff --git a/build/evergreen_config_lib/functions.py b/build/evergreen_config_lib/functions.py
@@ -74,7 +74,7 @@
         . bin/activate
         ./bin/pip install sphinx
         cd ..
-        
+
         set -o xtrace
         export MONGOC_TEST_FUTURE_TIMEOUT_MS=30000
         export MONGOC_TEST_SKIP_LIVE=on
@@ -98,13 +98,13 @@
             ]))]),
         shell_exec(r'''
         mkdir mongoc
-        
+
         if command -v gtar 2>/dev/null; then
            TAR=gtar
         else
            TAR=tar
         fi
-        
+
         $TAR xf build.tar.gz -C mongoc/
         ''', test=False, continue_on_err=True),
     )),
@@ -140,7 +140,7 @@
         make
         cd ..
         mv aha-repo/aha .
-        
+
         sh .evergreen/man-pages-to-html.sh libbson cmake_build/src/libbson/doc/man > bson-man-pages.html
         sh .evergreen/man-pages-to-html.sh libmongoc cmake_build/src/libmongoc/doc/man > mongoc-man-pages.html
         ''', test=False, silent=True, xtrace=False),
@@ -175,7 +175,7 @@
         export AWS_ACCESS_KEY_ID=${aws_key}
         export AWS_SECRET_ACCESS_KEY=${aws_secret}
         aws s3 cp abi-compliance/compat_reports s3://mciuploads/${project}/%s/abi-compliance/compat_reports --recursive --acl public-read --region us-east-1
-        
+
         if [ -e ./abi-compliance/abi-error.txt ]; then
           exit 1
         else
@@ -279,6 +279,7 @@
         export SSL=${SSL}
         export ORCHESTRATION_FILE=${ORCHESTRATION_FILE}
         export OCSP=${OCSP}
+        export REQUIRE_API_VERSION=${REQUIRE_API_VERSION}
         sh .evergreen/integration-tests.sh
         ''', test=False),
     )),
@@ -475,7 +476,7 @@
         shell_mongoc(r'''
         set -o xtrace
 
-        cd drivers-evergreen-tools 
+        cd drivers-evergreen-tools
         export DRIVERS_TOOLS=$(pwd)
 
         sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
@@ -500,6 +501,25 @@
 
         '''),
     )),
+    ('test versioned api', Function(
+        shell_mongoc(r'''
+        export COMPRESSORS='${COMPRESSORS}'
+        export CC='${CC}'
+        export AUTH=${AUTH}
+        export SSL=${SSL}
+        export URI=${URI}
+        export IPV4_ONLY=${IPV4_ONLY}
+        export VALGRIND=${VALGRIND}
+        export MONGOC_TEST_URI=${URI}
+        export DNS=${DNS}
+        export ASAN=${ASAN}
+        export MONGODB_API_VERSION=1
+        # TODO: CDRIVER-3954 Run all integration tests
+        ./src/libmongoc/test-libmongoc --no-fork -l /versioned_api/* -d
+        unset MONGODB_API_VERSION
+
+        '''),
+    )),
     ('run aws tests', Function(
         shell_mongoc(r'''
         # Add AWS variables to a file.
diff --git a/build/evergreen_config_lib/tasks.py b/build/evergreen_config_lib/tasks.py
@@ -838,6 +838,20 @@ def __init__(self, *args, **kwargs):
                   SSL=OPENSSL CFLAGS='-DBSON_MEMCHECK' sh .evergreen/compile.sh
                 """),
             func('run auth tests', valgrind='true')]),
+    PostCompileTask(
+        'test-versioned-api',
+        tags=['versioned-api'],
+        depends_on='debug-compile-nosasl-openssl',
+        commands=[func('fetch build', BUILD_NAME='debug-compile-nosasl-openssl'),
+                  func('bootstrap mongo-orchestration', TOPOLOGY='server', AUTH='auth', SSL='ssl', VERSION='latest', REQUIRE_API_VERSION='true'),
+                  func('test versioned api', AUTH='auth', SSL='ssl')]),
+    PostCompileTask(
+        'test-versioned-api-accept-version-two',
+        tags=['versioned-api'],
+        depends_on='debug-compile-nosasl-openssl',
+        commands=[func('fetch build', BUILD_NAME='debug-compile-nosasl-openssl'),
+                  func('bootstrap mongo-orchestration', TOPOLOGY='server', AUTH='auth', SSL='ssl', VERSION='latest', ORCHESTRATION_FILE='versioned-api-testing'),
+                  func('test versioned api', AUTH='auth', SSL='ssl')]),
 ])
 
 
diff --git a/build/evergreen_config_lib/variants.py b/build/evergreen_config_lib/variants.py
@@ -636,4 +636,10 @@ def days(n):
         ['.tsan'],
         {'CC': '/opt/mongodbtoolchain/v3/bin/clang'},
         batchtime=days(1))
+    Variant('versioned-api',
+        'Versioned API Tests',
+        'ubuntu1804-test',
+        ['debug-compile-nosasl-openssl',
+         '.versioned-api'],
+        {})
 ]
diff --git a/orchestration_configs/servers/versioned-api-testing.json b/orchestration_configs/servers/versioned-api-testing.json
@@ -0,0 +1,12 @@
+{
+  "id": "versioned-api-testing",
+  "name": "mongod",
+  "procParams": {
+    "ipv6": true,
+    "bind_ip": "127.0.0.1,::1",
+    "logappend": true,
+    "journal": true,
+    "port": 27017,
+    "setParameter": {"enableTestCommands": 1, "acceptAPIVersion2":  1}
+  }
+}
diff --git a/src/libmongoc/tests/test-libmongoc.c b/src/libmongoc/tests/test-libmongoc.c
@@ -2094,17 +2094,18 @@ _parse_server_version (const bson_t *buildinfo)
    ASSERT (bson_iter_recurse (&iter, &array_iter));
 
    /* Server returns a 4-part version like [3, 2, 0, 0], or like [3, 2, 0, -49]
-    * for an RC. Bail if number of parts is ever not 4. */
+    * for an RC. Ignore the 4th part since RCs are equivalent to non-RCs for
+    * testing purposes. */
    i = 0;
    while (bson_iter_next (&array_iter)) {
+      if (++i == N_SERVER_VERSION_PARTS) {
+         break;
+      }
       ret *= 1000;
       ret += 100 + bson_iter_as_int64 (&array_iter);
-      i++;
-      ASSERT_CMPINT (i, <=, N_SERVER_VERSION_PARTS);
    }
 
    ASSERT_CMPINT (i, ==, N_SERVER_VERSION_PARTS);
-
    return ret;
 }
 
@@ -2142,18 +2143,21 @@ test_framework_str_to_version (const char *version_str)
    str_copy = bson_strdup (version_str);
    i = 0;
    part = strtok (str_copy, ".");
+
+   /* Versions can have 4 parts like "3.2.0.0", or like "3.2.0.-49" for an RC.
+    * Ignore the 4th part since RCs are equivalent to non-RCs for testing
+    * purposes. */
    while (part) {
+      if (++i == N_SERVER_VERSION_PARTS) {
+         break;
+      }
       ret *= 1000;
-
-      /* add 100 since release candidates have versions like "3.2.0.-49" */
       ret += 100 + bson_ascii_strtoll (part, &end, 10);
-      i++;
-      ASSERT_CMPINT (i, <=, N_SERVER_VERSION_PARTS);
       part = strtok (NULL, ".");
    }
 
-   /* pad out a short version like "3.0" */
-   for (; i < N_SERVER_VERSION_PARTS; i++) {
+   /* pad out a short version like "3.0" to three parts */
+   for (; i < N_SERVER_VERSION_PARTS - 1; i++) {
       ret *= 1000;
       ret += 100;
    }
@@ -2167,11 +2171,11 @@ test_framework_str_to_version (const char *version_str)
 static void
 test_version_cmp (void)
 {
-   server_version_t v2_6_12 = 102106112100;
-   server_version_t v3_0_0 = 103100100100;
-   server_version_t v3_0_1 = 103100101100;
-   server_version_t v3_0_10 = 103100110100;
-   server_version_t v3_2_0_rc1_pre = 103102100051;
+   server_version_t v2_6_12 = 102106112;
+   server_version_t v3_0_0 = 103100100;
+   server_version_t v3_0_1 = 103100101;
+   server_version_t v3_0_10 = 103100110;
+   server_version_t v3_2_0 = 103102100;
 
    ASSERT (v2_6_12 == test_framework_str_to_version ("2.6.12"));
    ASSERT (v2_6_12 == _parse_server_version (
@@ -2189,12 +2193,14 @@ test_version_cmp (void)
    ASSERT (v3_0_10 == _parse_server_version (
                          tmp_bson ("{'versionArray': [3, 0, 10, 0]}")));
 
-   ASSERT (v3_2_0_rc1_pre == test_framework_str_to_version ("3.2.0.-49"));
-   ASSERT (v3_2_0_rc1_pre == _parse_server_version (
-                                tmp_bson ("{'versionArray': [3, 2, 0, -49]}")));
+   /* release candidates should be equivalent to non-rcs. */
+   ASSERT (v3_2_0 == test_framework_str_to_version ("3.2.0.-49"));
+   ASSERT (v3_2_0 == _parse_server_version (
+                        tmp_bson ("{'versionArray': [3, 2, 0, -49]}")));
 
-   ASSERT (v3_2_0_rc1_pre > test_framework_str_to_version ("3.1.9"));
-   ASSERT (v3_2_0_rc1_pre < test_framework_str_to_version ("3.2"));
+   ASSERT (v3_2_0 > test_framework_str_to_version ("3.1.9"));
+   ASSERT (v3_2_0 == test_framework_str_to_version ("3.2"));
+   ASSERT (v3_2_0 < test_framework_str_to_version ("3.2.1"));
 }
 
 int

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+db.adminCommand({ "setParameter": 1, "requireApiVersion": 1 });`