PYTHON-3761 Add e2e testing against Atlas to the search index management API (#1337)

blink1073 · web-flow · commit 0660f32e76e0 · 2023-08-08T08:08:35.000-05:00
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -442,7 +442,8 @@ functions:
       params:
         working_dir: "src"
         script: |
-          set -o xtrace
+          # Disable xtrace
+          set +x
           if [ -n "${set_xtrace_on}" ]; then
             export SET_XTRACE_ON="${set_xtrace_on}"
           fi
@@ -488,6 +489,12 @@ functions:
             export SINGLE_MONGOS_LB_URI="${MONGODB_URI}"
             export MULTI_MONGOS_LB_URI="${MONGODB_URI}"
           fi
+          if [ -n "${TEST_INDEX_MANAGEMENT}" ]; then
+            export TEST_INDEX_MANAGEMENT=1
+            export MONGODB_URI="${TEST_INDEX_URI}"
+            export DB_USER="${DRIVERS_ATLAS_LAMBDA_USER}"
+            export DB_PASSWORD="${DRIVERS_ATLAS_LAMBDA_PASSWORD}"
+          fi
 
           export PYTHON_BINARY=${PYTHON_BINARY}
           if [ -z "$PYTHON_BINARY" ]; then
@@ -1293,6 +1300,46 @@ task_groups:
     tasks:
     - testazurekms-task
 
+  - name: test_atlas_task_group_search_indexes
+    setup_group:
+      - func: fetch source
+      - func: prepare resources
+      - func: fix absolute paths
+      - func: make files executable
+      - command: subprocess.exec
+        params:
+          working_dir: src
+          binary: bash
+          add_expansions_to_env: true
+          env:
+            MONGODB_VERSION: "7.0"
+          args:
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+      - command: expansions.update
+        params:
+          file: src/atlas-expansion.yml
+      - command: shell.exec
+        params:
+          working_dir: src
+          shell: bash
+          script: |-
+            echo "TEST_INDEX_URI: ${MONGODB_URI}" > atlas-expansion.yml
+      - command: expansions.update
+        params:
+          file: src/atlas-expansion.yml
+    teardown_group:
+      - command: subprocess.exec
+        params:
+          working_dir: src
+          binary: bash
+          add_expansions_to_env: true
+          args:
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
+    setup_group_can_fail_task: true
+    setup_group_timeout_secs: 1800
+    tasks:
+      - test-search-index-helpers
+
 tasks:
     # Wildcard task. Do you need to find out what tools are available and where?
     # Throw it here, and execute this task on all buildvariants
@@ -1666,6 +1713,16 @@ tasks:
             TOPOLOGY: "server"
         - func: "run enterprise auth tests"
 
+    - name: "test-search-index-helpers"
+      commands:
+        - func: "bootstrap mongo-orchestration"
+          vars:
+            VERSION: "latest"
+            TOPOLOGY: "replica_set"
+        - func: "run tests"
+          vars:
+            TEST_INDEX_MANAGEMENT: "1"
+
     - name: "mod-wsgi-standalone"
       tags: ["mod_wsgi"]
       commands:
@@ -3103,6 +3160,14 @@ buildvariants:
   tasks:
      - name: "test-enterprise-auth"
 
+- matrix_name: "test-search-index-helpers"
+  matrix_spec:
+    platform: rhel8
+    python-version: "3.8"
+  display_name: "Search Index Helpers ${platform}"
+  tasks:
+     - name: "test_atlas_task_group_search_indexes"
+
 - matrix_name: "tests-mod-wsgi"
   matrix_spec:
     platform: ubuntu-20.04
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -164,6 +164,10 @@ if [ -n "$TEST_FLE_AZURE_AUTO" ] || [ -n "$TEST_FLE_GCP_AUTO" ]; then
     fi
 fi
 
+if [ -n "$TEST_INDEX_MANAGEMENT" ]; then
+    TEST_ARGS="test/test_index_management.py"
+fi
+
 if [ -n "$TEST_DATA_LAKE" ] && [ -z "$TEST_ARGS" ]; then
     TEST_ARGS="test/test_data_lake.py"
 fi
@@ -190,7 +194,7 @@ if [ -z "$GREEN_FRAMEWORK" ]; then
         python -c "from bson import _cbson; from pymongo import _cmessage"
     fi
 
-    python -m pytest $TEST_ARGS
+    python -m pytest -v $TEST_ARGS
 else
     python -m pip install $GREEN_FRAMEWORK
     python green_framework_test.py $GREEN_FRAMEWORK
diff --git a/test/index_management/createSearchIndex.json b/test/index_management/createSearchIndex.json
@@ -54,7 +54,8 @@
             }
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
@@ -100,7 +101,8 @@
             }
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
diff --git a/test/index_management/createSearchIndexes.json b/test/index_management/createSearchIndexes.json
@@ -48,7 +48,8 @@
             "models": []
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
@@ -87,7 +88,8 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
@@ -135,7 +137,8 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
diff --git a/test/index_management/dropSearchIndex.json b/test/index_management/dropSearchIndex.json
@@ -48,7 +48,8 @@
             "name": "test index"
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
diff --git a/test/index_management/listSearchIndexes.json b/test/index_management/listSearchIndexes.json
@@ -45,7 +45,8 @@
           "name": "listSearchIndexes",
           "object": "collection0",
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
@@ -79,7 +80,8 @@
             "name": "test index"
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
@@ -119,7 +121,8 @@
             }
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
diff --git a/test/index_management/updateSearchIndex.json b/test/index_management/updateSearchIndex.json
@@ -49,7 +49,8 @@
             "definition": {}
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorContains": "Search index commands are only supported with Atlas"
           }
         }
       ],
diff --git a/test/test_index_management.py b/test/test_index_management.py

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@`
`54`	`54`	`}`
`55`	`55`	`},`
`56`	`56`	`"expectError": {`
`57`		`- "isError": true`
	`57`	`+ "isError": true,`
	`58`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`	`],`
`@@ -100,7 +101,8 @@`
`100`	`101`	`}`
`101`	`102`	`},`
`102`	`103`	`"expectError": {`
`103`		`- "isError": true`
	`104`	`+ "isError": true,`
	`105`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`104`	`106`	`}`
`105`	`107`	`}`
`106`	`108`	`],`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@`
`48`	`48`	`"models": []`
`49`	`49`	`},`
`50`	`50`	`"expectError": {`
`51`		`- "isError": true`
	`51`	`+ "isError": true,`
	`52`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`	`],`
`@@ -87,7 +88,8 @@`
`87`	`88`	`]`
`88`	`89`	`},`
`89`	`90`	`"expectError": {`
`90`		`- "isError": true`
	`91`	`+ "isError": true,`
	`92`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`91`	`93`	`}`
`92`	`94`	`}`
`93`	`95`	`],`
`@@ -135,7 +137,8 @@`
`135`	`137`	`]`
`136`	`138`	`},`
`137`	`139`	`"expectError": {`
`138`		`- "isError": true`
	`140`	`+ "isError": true,`
	`141`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`139`	`142`	`}`
`140`	`143`	`}`
`141`	`144`	`],`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@`
`45`	`45`	`"name": "listSearchIndexes",`
`46`	`46`	`"object": "collection0",`
`47`	`47`	`"expectError": {`
`48`		`- "isError": true`
	`48`	`+ "isError": true,`
	`49`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`	`],`
`@@ -79,7 +80,8 @@`
`79`	`80`	`"name": "test index"`
`80`	`81`	`},`
`81`	`82`	`"expectError": {`
`82`		`- "isError": true`
	`83`	`+ "isError": true,`
	`84`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`83`	`85`	`}`
`84`	`86`	`}`
`85`	`87`	`],`
`@@ -119,7 +121,8 @@`
`119`	`121`	`}`
`120`	`122`	`},`
`121`	`123`	`"expectError": {`
`122`		`- "isError": true`
	`124`	`+ "isError": true,`
	`125`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`123`	`126`	`}`
`124`	`127`	`}`
`125`	`128`	`],`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@`
`49`	`49`	`"definition": {}`
`50`	`50`	`},`
`51`	`51`	`"expectError": {`
`52`		`- "isError": true`
	`52`	`+ "isError": true,`
	`53`	`+ "errorContains": "Search index commands are only supported with Atlas"`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`],`