WIP

Author: qingyang-hu

.evergreen/config.yml

@@ -434,7 +434,7 @@ functions:
       params:
         binary: "bash"
         env:
-          SEARCH_INDEX_URI: "${MONGODB_URI}"
+          SEARCH_INDEX_URI: "${SEARCH_INDEX_URI}"
         args: [*task-runner, evg-test-search-index]
 
   add-aws-auth-variables-to-file:
@@ -2067,6 +2067,15 @@ task_groups:
       - command: expansions.update
         params:
           file: src/go.mongodb.org/mongo-driver/atlas-expansion.yml
+      - command: shell.exec
+        params:
+          working_dir: src/go.mongodb.org/mongo-driver
+          shell: bash
+          script: |-
+            echo "SEARCH_INDEX_URI: ${MONGODB_URI}" > atlas-expansion.yml
+      - command: expansions.update
+        params:
+          file: src/go.mongodb.org/mongo-driver/atlas-expansion.yml
     teardown_group:
       - command: subprocess.exec
         params:

internal/integration/search_index_test.go

@@ -35,22 +35,19 @@ func TestSearchIndex(t *testing.T) {
 	mt.Run("search indexes with empty option", func(mt *mtest.T) {
 		ctx := context.Background()
 
-		_, err := mt.Coll.InsertMany(ctx, []interface{}{
+		_, err := mt.Coll.InsertMany(ctx, []any{
 			bson.M{
 				"string_field": "test1 test1",
 			},
 		})
 		require.NoError(mt, err, "failed to insert")
 
-		view := mt.Coll.SearchIndexes()
-
-		definition := bson.D{
-			{"mappings", bson.D{
-				{"dynamic", true},
-			}},
-		}
-		_, err = view.CreateOne(ctx, mongo.SearchIndexModel{
-			Definition: definition,
+		_, err = mt.Coll.SearchIndexes().CreateOne(ctx, mongo.SearchIndexModel{
+			Definition: bson.D{
+				{"mappings", bson.D{
+					{"dynamic", true},
+				}},
+			},
 		})
 		require.NoError(mt, err, "failed to create index")
 	})

mongo/search_index_view.go

@@ -123,13 +123,13 @@ func (siv SearchIndexView) CreateMany(
 		}
 
 		var iidx int32
+		iidx, indexes = bsoncore.AppendDocumentElementStart(indexes, strconv.Itoa(i))
 		if model.Options != nil {
 			searchIndexArgs, err := mongoutil.NewOptions[options.SearchIndexesOptions](model.Options)
 			if err != nil {
 				return nil, fmt.Errorf("failed to construct options from builder: %w", err)
 			}
 
-			iidx, indexes = bsoncore.AppendDocumentElementStart(indexes, strconv.Itoa(i))
 			if searchIndexArgs.Name != nil {
 				indexes = bsoncore.AppendStringElement(indexes, "name", *searchIndexArgs.Name)
 			}