WIP

Author: qingyang-hu

.evergreen/config.yml

@@ -2058,7 +2058,7 @@ task_groups:
         params:
           working_dir: src/go.mongodb.org/mongo-driver
           binary: bash
-          include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
+          include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN, MONGODB_URI]
           env:
             MONGODB_VERSION: ${VERSION}
             LAMBDA_STACK_NAME: dbx-go-lambda

Taskfile.yml

@@ -160,7 +160,6 @@ tasks:
 
   evg-test-search-index:
     # Use the long timeout to wait for the responses from the server.
-    - go test ./internal/integration -run TestSearchIndexProse -v -timeout {{.LONG_TEST_TIMEOUT}}s >> test.suite
     - go test ./internal/integration -run TestSearchIndex -v -timeout {{.LONG_TEST_TIMEOUT}}s >> test.suite
 
   evg-test-ocsp:

internal/integration/mongointernal_test.go

@@ -10,16 +10,13 @@ package integration
 
 import (
 	"context"
-	"os"
 	"testing"
-	"time"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
 	"go.mongodb.org/mongo-driver/v2/internal/require"
 	"go.mongodb.org/mongo-driver/v2/mongo"
-	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 )
 
@@ -99,40 +96,3 @@ func TestNewSessionWithLSID(t *testing.T) {
 		t.Errorf("expected ClientSession.SetServer to panic")
 	})
 }
-
-func TestSearchIndex(t *testing.T) {
-	t.Parallel()
-
-	const timeout = 5 * time.Minute
-
-	uri := os.Getenv("SEARCH_INDEX_URI")
-	if uri == "" {
-		t.Skip("skipping")
-	}
-
-	opts := options.Client().ApplyURI(uri).SetTimeout(timeout)
-	mt := mtest.New(t, mtest.NewOptions().ClientOptions(opts).MinServerVersion("7.0").Topologies(mtest.ReplicaSet))
-
-	mt.Run("search indexes with empty option", func(mt *mtest.T) {
-		ctx := context.Background()
-
-		_, err := mt.Coll.InsertMany(ctx, []interface{}{
-			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,
-		})
-		require.NoError(mt, err, "failed to create index")
-	})
-}

internal/integration/search_index_test.go

@@ -0,0 +1,57 @@
+// Copyright (C) MongoDB, Inc. 2025-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+package integration
+
+import (
+	"context"
+	"os"
+	"testing"
+	"time"
+
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
+	"go.mongodb.org/mongo-driver/v2/internal/require"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
+)
+
+func TestSearchIndex(t *testing.T) {
+	t.Parallel()
+
+	const timeout = 5 * time.Minute
+
+	uri := os.Getenv("SEARCH_INDEX_URI")
+	if uri == "" {
+		t.Skip("skipping")
+	}
+
+	opts := options.Client().ApplyURI(uri).SetTimeout(timeout)
+	mt := mtest.New(t, mtest.NewOptions().ClientOptions(opts).MinServerVersion("7.0").Topologies(mtest.ReplicaSet))
+
+	mt.Run("search indexes with empty option", func(mt *mtest.T) {
+		ctx := context.Background()
+
+		_, err := mt.Coll.InsertMany(ctx, []interface{}{
+			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,
+		})
+		require.NoError(mt, err, "failed to create index")
+	})
+}