Fix tests for MongoDB with enabled replica set (#3807)

Closes #3310. Co-authored-by: Alexey Palazhchenko <alexey.palazhchenko@ferretdb.io>
FerretDB · Dec 7, 2023 · 514acee · 514acee
1 parent fe268cb
commit 514acee
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 40 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -215,7 +215,7 @@ tasks:
         -target-backend=ferretdb-postgresql
         -target-tls
         -postgresql-url='postgres://username@127.0.0.1:5432/ferretdb?search_path='
-        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
+        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem&replicaSet=mongodb-rs'
         -disable-pushdown={{.DISABLE_PUSHDOWN}}
 
   test-integration-sqlite:
@@ -240,7 +240,7 @@ tasks:
         -target-backend=ferretdb-sqlite
         -sqlite-url=file:../tmp/sqlite-tests/
         -target-tls
-        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
+        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem&replicaSet=mongodb-rs'
         -disable-pushdown={{.DISABLE_PUSHDOWN}}
 
   test-integration-mysql:
@@ -265,7 +265,7 @@ tasks:
         -target-backend=ferretdb-mysql
         -target-tls
         -mysql-url='mysql://username:password@127.0.0.1:3306/ferretdb'
-        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
+        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem&replicaSet=mongodb-rs'
         -disable-pushdown={{.DISABLE_PUSHDOWN}}
 
   test-integration-hana:
@@ -290,7 +290,7 @@ tasks:
         -target-backend=ferretdb-hana
         -target-tls
         -hana-url=$FERRETDB_HANA_URL
-        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem'
+        -compat-url='mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=../build/certs/client.pem&tlsCaFile=../build/certs/rootCA-cert.pem&replicaSet=mongodb-rs'
         -disable-pushdown={{.DISABLE_PUSHDOWN}}
 
   test-integration-mongodb:

diff --git a/build/deps/mongo.Dockerfile b/build/deps/mongo.Dockerfile
@@ -1,13 +1 @@
 FROM mongo:6.0.9
-
-# If you encounter an "unknown instruction" error there,
-# please update Docker to the latest version.
-
-# see https://github.com/docker-library/mongo/issues/475
-RUN <<EOF
-set -ex
-
-echo 'topsecret' > /etc/mongod_keyfile.txt
-chmod 0400 /etc/mongod_keyfile.txt
-chown 999:999 /etc/mongod_keyfile.txt
-EOF
diff --git a/build/mongodb_secured.conf b/build/mongodb_secured.conf
@@ -5,12 +5,12 @@ net:
     mode: requireTLS
     certificateKeyFile: /etc/certs/server.pem
     CAFile: /etc/certs/rootCA-cert.pem
+    clusterFile: /etc/certs/client.pem
 
 security:
   authorization: enabled # that also enables authentication
-  keyFile: /etc/mongod_keyfile.txt
+  clusterAuthMode: x509
 
-# TODO https://github.com/FerretDB/FerretDB/issues/3310
-# replication:
-#   oplogSizeMB: 512
-#   replSetName: mongodb-rs
+replication:
+  oplogSizeMB: 512
+  replSetName: mongodb-rs
diff --git a/cmd/envtool/envtool.go b/cmd/envtool/envtool.go
@@ -206,8 +206,32 @@ func setupMongodb(ctx context.Context, logger *zap.SugaredLogger) error {
 
 // setupMongodbSecured configures `mongodb_secured` container.
 func setupMongodbSecured(ctx context.Context, logger *zap.SugaredLogger) error {
-	// TODO https://github.com/FerretDB/FerretDB/issues/3310
-	return waitForPort(ctx, logger.Named("mongodb_secured"), 47018)
+	if err := waitForPort(ctx, logger.Named("mongodb_secured"), 47018); err != nil {
+		return err
+	}
+
+	eval := `'rs.initiate({_id: "mongodb-rs", members: [{_id: 0, host: "localhost:47018" }]})'`
+	shell := `mongodb://username:password@127.0.0.1:47018/?tls=true&tlsCertificateKeyFile=/etc/certs/client.pem&tlsCaFile=/etc/certs/rootCA-cert.pem` //nolint:lll // for readability
+	args := []string{"compose", "exec", "-T", "mongodb_secured", "mongosh", "--eval", eval, "--shell", shell}
+
+	var buf bytes.Buffer
+	var retry int64
+
+	for ctx.Err() == nil {
+		buf.Reset()
+
+		err := runCommand("docker", args, &buf, logger)
+		if err == nil {
+			break
+		}
+
+		logger.Infof("%s:\n%s", err, buf.String())
+
+		retry++
+		ctxutil.SleepWithJitter(ctx, time.Second, retry)
+	}
+
+	return ctx.Err()
 }
 
 // setup runs all setup commands.

diff --git a/integration/aggregate_documents_compat_test.go b/integration/aggregate_documents_compat_test.go
@@ -29,6 +29,7 @@ import (
 
 	"github.com/FerretDB/FerretDB/integration/setup"
 	"github.com/FerretDB/FerretDB/integration/shareddata"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 // aggregateStagesCompatTestCase describes aggregation stages compatibility test case.
@@ -227,7 +228,13 @@ func testAggregateCommandCompat(t *testing.T, testCases map[string]aggregateComm
 					return
 				}
 				require.NoError(t, compatErr, "compat error; target returned no error")
-				AssertEqualDocuments(t, compatRes, targetRes)
+
+				compat := ConvertDocument(t, compatRes)
+				compat.Remove("$clusterTime")
+				compat.Remove("operationTime")
+
+				target := ConvertDocument(t, targetRes)
+				testutil.AssertEqual(t, compat, target)
 
 				if len(targetRes) > 0 || len(compatRes) > 0 {
 					nonEmptyResults = true

diff --git a/integration/count_command_compat_test.go b/integration/count_command_compat_test.go
@@ -23,6 +23,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 	"github.com/FerretDB/FerretDB/integration/setup"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 type countCommandCompatTestCase struct {
@@ -99,7 +100,12 @@ func testCountCommandCompat(t *testing.T, testCases map[string]countCommandCompa
 					require.NoError(t, targetResult.Decode(&targetRes))
 					require.NoError(t, compatResult.Decode(&compatRes))
 
-					AssertEqualDocuments(t, compatRes, targetRes)
+					compatDoc := ConvertDocument(t, compatRes)
+					compatDoc.Remove("$clusterTime")
+					compatDoc.Remove("operationTime")
+
+					targetDoc := ConvertDocument(t, targetRes)
+					testutil.AssertEqual(t, compatDoc, targetDoc)
 
 					targetCount := targetRes.Map()["n"].(int32)
 					compatCount := compatRes.Map()["n"].(int32)

diff --git a/integration/count_compat_test.go b/integration/count_compat_test.go
@@ -25,6 +25,7 @@ import (
 
 	"github.com/FerretDB/FerretDB/integration/setup"
 	"github.com/FerretDB/FerretDB/integration/shareddata"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 // countCompatTestCase describes count compatibility test case.
@@ -99,7 +100,13 @@ func testCountCompat(t *testing.T, testCases map[string]countCompatTestCase) {
 
 					t.Logf("Compat (expected) result: %v", compatRes)
 					t.Logf("Target (actual)   result: %v", targetRes)
-					assert.Equal(t, compatRes, targetRes)
+
+					compatDoc := ConvertDocument(t, compatRes)
+					compatDoc.Remove("$clusterTime")
+					compatDoc.Remove("operationTime")
+
+					targetDoc := ConvertDocument(t, targetRes)
+					testutil.AssertEqual(t, compatDoc, targetDoc)
 
 					if targetRes != nil || compatRes != nil {
 						nonEmptyResults = true

diff --git a/integration/delete_command_compat_test.go b/integration/delete_command_compat_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/FerretDB/FerretDB/integration/setup"
 	"github.com/FerretDB/FerretDB/integration/shareddata"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 // deleteCommandCompatTestCase describes delete compatibility test case.
@@ -149,5 +150,12 @@ func TestDeleteCommandCompatNotExistingDatabase(t *testing.T) {
 	assert.NoError(t, targetErr)
 	assert.NoError(t, compatErr)
 
-	assert.Equal(t, compatRes, targetRes)
+	compat := ConvertDocument(t, compatRes)
+	compat.Remove("$clusterTime")
+	compat.Remove("operationTime")
+	compat.Remove("electionId")
+	compat.Remove("opTime")
+
+	target := ConvertDocument(t, targetRes)
+	testutil.AssertEqual(t, compat, target)
 }
diff --git a/integration/findandmodify_compat_test.go b/integration/findandmodify_compat_test.go
@@ -23,6 +23,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 
 	"github.com/FerretDB/FerretDB/integration/setup"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 func TestFindAndModifyCompatSimple(t *testing.T) {
@@ -836,7 +837,12 @@ func testFindAndModifyCompat(t *testing.T, testCases map[string]findAndModifyCom
 					}
 					require.NoError(t, compatErr, "compat error; target returned no error")
 
-					AssertEqualDocuments(t, compatMod, targetMod)
+					compat := ConvertDocument(t, compatMod)
+					compat.Remove("$clusterTime")
+					compat.Remove("operationTime")
+
+					target := ConvertDocument(t, targetMod)
+					testutil.AssertEqual(t, compat, target)
 
 					// To make sure that the results of modification are equal,
 					// find all the documents in target and compat collections and compare that they are the same

diff --git a/integration/indexes_command_compat_test.go b/integration/indexes_command_compat_test.go
@@ -24,6 +24,7 @@ import (
 
 	"github.com/FerretDB/FerretDB/integration/setup"
 	"github.com/FerretDB/FerretDB/integration/shareddata"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 	"github.com/FerretDB/FerretDB/internal/util/testutil/testtb"
 )
 
@@ -164,7 +165,13 @@ func TestCreateIndexesCommandCompat(t *testing.T) {
 				require.Nil(t, compatRes)
 			}
 
-			assert.Equal(t, compatRes, targetRes)
+			compatDoc := ConvertDocument(t, compatRes)
+			compatDoc.Remove("$clusterTime")
+			compatDoc.Remove("operationTime")
+			compatDoc.Remove("commitQuorum")
+
+			targetDoc := ConvertDocument(t, targetRes)
+			testutil.AssertEqual(t, compatDoc, targetDoc)
 
 			targetCursor, targetErr := targetCollection.Indexes().List(ctx)
 			compatCursor, compatErr := compatCollection.Indexes().List(ctx)
@@ -229,7 +236,13 @@ func TestCreateIndexesCommandCompatCheckFields(t *testing.T) {
 	require.NoError(t, err)
 	require.True(t, createdCollectionAutomatically.(bool)) // must be true because a new collection was created
 
-	AssertEqualDocuments(t, compatRes, targetRes)
+	compat := ConvertDocument(t, compatRes)
+	compat.Remove("$clusterTime")
+	compat.Remove("operationTime")
+	compat.Remove("commitQuorum")
+
+	target := ConvertDocument(t, targetRes)
+	testutil.AssertEqual(t, compat, target)
 
 	// Now this collection exists, so we create another index and expect createdCollectionAutomatically to be false.
 	indexesDoc = bson.D{{"key", bson.D{{"foo", 1}}}, {"name", "foo_1"}}
@@ -252,7 +265,12 @@ func TestCreateIndexesCommandCompatCheckFields(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, createdCollectionAutomatically.(bool)) // must be false because the collection already exists
 
-	AssertEqualDocuments(t, compatRes, targetRes)
+	compatDoc.Remove("$clusterTime")
+	compatDoc.Remove("operationTime")
+	compatDoc.Remove("commitQuorum")
+
+	targetDoc := ConvertDocument(t, targetRes)
+	testutil.AssertEqual(t, compatDoc, targetDoc)
 
 	// Call index creation for the index that already exists, expect note to be set.
 	indexesDoc = bson.D{{"key", bson.D{{"foo", 1}}}, {"name", "foo_1"}}
@@ -277,7 +295,11 @@ func TestCreateIndexesCommandCompatCheckFields(t *testing.T) {
 	// note must be set because no new indexes were created:
 	require.Equal(t, "all indexes already exist", createdCollectionAutomatically.(string))
 
-	AssertEqualDocuments(t, compatRes, targetRes)
+	compatDoc.Remove("$clusterTime")
+	compatDoc.Remove("operationTime")
+
+	targetDoc = ConvertDocument(t, targetRes)
+	testutil.AssertEqual(t, compatDoc, targetDoc)
 }
 
 func TestDropIndexesCommandCompat(tt *testing.T) {
@@ -451,7 +473,12 @@ func TestDropIndexesCommandCompat(tt *testing.T) {
 						require.Nil(t, compatRes)
 					}
 
-					require.ElementsMatch(t, compatRes, targetRes)
+					compatDoc := ConvertDocument(t, compatRes)
+					compatDoc.Remove("$clusterTime")
+					compatDoc.Remove("operationTime")
+
+					targetDoc := ConvertDocument(t, targetRes)
+					testutil.AssertEqual(t, compatDoc, targetDoc)
 
 					if compatErr == nil {
 						nonEmptyResults = true

diff --git a/integration/indexes_compat_test.go b/integration/indexes_compat_test.go
@@ -399,13 +399,18 @@ func TestDropIndexesCompat(t *testing.T) {
 						compatRes, compatErr = compatCollection.Indexes().DropOne(ctx, tc.dropIndexName)
 					}
 
-					require.Equal(t, compatErr, targetErr)
-					require.Equal(t, compatRes, targetRes)
+					if targetErr != nil {
+						t.Logf("Target error: %v", targetErr)
+						t.Logf("Compat error: %v", compatErr)
 
-					if targetErr == nil {
+						AssertMatchesCommandError(t, compatErr, targetErr)
+					} else {
 						nonEmptyResults = true
+						require.NoError(t, compatErr, "compat error; target returned no error")
 					}
 
+					require.Equal(t, compatRes, targetRes)
+
 					// List indexes to see they are identical after drop.
 					targetCursor, targetErr := targetCollection.Indexes().List(ctx)
 					compatCursor, compatErr := compatCollection.Indexes().List(ctx)

diff --git a/integration/insert_command_compat_test.go b/integration/insert_command_compat_test.go
@@ -17,11 +17,11 @@ package integration
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.mongodb.org/mongo-driver/bson"
 
 	"github.com/FerretDB/FerretDB/integration/setup"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 type insertCommandCompatTestCase struct { //nolint:vet // for readability
@@ -85,7 +85,15 @@ func testInsertCommandCompat(t *testing.T, testCases map[string]insertCommandCom
 
 					t.Logf("Compat (expected) result: %v", compatRes)
 					t.Logf("Target (actual)   result: %v", targetRes)
-					assert.Equal(t, compatRes, targetRes)
+
+					compatDoc := ConvertDocument(t, compatRes)
+					compatDoc.Remove("$clusterTime")
+					compatDoc.Remove("operationTime")
+					compatDoc.Remove("electionId")
+					compatDoc.Remove("opTime")
+
+					targetDoc := ConvertDocument(t, targetRes)
+					testutil.AssertEqual(t, compatDoc, targetDoc)
 				})
 			}
 		})

diff --git a/integration/query_command_compat_test.go b/integration/query_command_compat_test.go
@@ -24,6 +24,7 @@ import (
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 	"github.com/FerretDB/FerretDB/integration/setup"
+	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
 
 // queryCommandCompatTestCase describes query compatibility test case.
@@ -147,7 +148,12 @@ func testQueryCommandCompat(t *testing.T, testCases map[string]queryCommandCompa
 					require.NoError(t, targetResult.Decode(&targetRes))
 					require.NoError(t, compatResult.Decode(&compatRes))
 
-					AssertEqualDocuments(t, compatRes, targetRes)
+					compatDoc := ConvertDocument(t, compatRes)
+					compatDoc.Remove("$clusterTime")
+					compatDoc.Remove("operationTime")
+
+					targetDoc := ConvertDocument(t, targetRes)
+					testutil.AssertEqual(t, compatDoc, targetDoc)
 
 					targetDocs := targetRes.Map()["cursor"].(bson.D).Map()["firstBatch"].(primitive.A)
 					compatDocs := compatRes.Map()["cursor"].(bson.D).Map()["firstBatch"].(primitive.A)

diff --git a/integration/update_compat_test.go b/integration/update_compat_test.go
@@ -371,7 +371,14 @@ func testUpdateCommandCompat(t *testing.T, testCases map[string]updateCommandCom
 								nonEmptyResults = true
 							}
 
-							assert.Equal(t, compatUpdateRes, targetUpdateRes)
+							compat := ConvertDocument(t, compatUpdateRes)
+							compat.Remove("$clusterTime")
+							compat.Remove("operationTime")
+							compat.Remove("electionId")
+							compat.Remove("opTime")
+
+							target := ConvertDocument(t, targetUpdateRes)
+							testutil.AssertEqual(t, compat, target)
 
 							if isMulti, ok := multi.(bool); ok && isMulti {
 								// if multi == false, an item updated by compat and target are different.