Updated search e2e tests

Author: lsierant

docker/mongodb-kubernetes-init-ops-manager/mmsconfiguration/edit_mms_configuration.go

@@ -145,7 +145,7 @@ func readLinesFromFile(name string) ([]string, error) {
 func writeLinesToFile(name string, lines []string) error {
 	output := strings.Join(lines, lineBreak)
 
-	err := os.WriteFile(name, []byte(output), 0o775)
+	err := os.WriteFile(name, []byte(output), 0o644)
 	if err != nil {
 		return xerrors.Errorf("error writing to file %s: %w", name, err)
 	}
@@ -168,7 +168,7 @@ func appendLinesToFile(name string, lines string) error {
 
 func getOmPropertiesFromEnvVars() map[string]string {
 	props := map[string]string{}
-	for _, pair := range os.Environ() {
+	for _, pair := range os.Environ() { // nolint:forbidigo
 		if !strings.HasPrefix(pair, omPropertyPrefix) {
 			continue
 		}

docker/mongodb-kubernetes-tests/tests/search/fixtures/community-replicaset-sample-mflix.yaml

@@ -4,59 +4,66 @@ kind: MongoDBCommunity
 metadata:
   name: mdbc-rs
 spec:
-  members: 3
+  version: 8.0.10
   type: ReplicaSet
-  version: "8.0.10"
+  members: 3
   security:
     authentication:
-      modes: ["SCRAM-SHA-1"]
+      ignoreUnknownUsers: true
+      modes:
+        - SCRAM
   agent:
     logLevel: DEBUG
+  statefulSet:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: mongod
+              resources:
+                limits:
+                  cpu: "2"
+                  memory: 2Gi
+                requests:
+                  cpu: "1"
+                  memory: 1Gi
+            - name: mongodb-agent
+              resources:
+                limits:
+                  cpu: "1"
+                  memory: 2Gi
+                requests:
+                  cpu: "0.5"
+                  memory: 1Gi
   users:
+    # admin user with root role
     - name: mdb-admin
       db: admin
-      passwordSecretRef: # a reference to the secret that will be used to generate the user's password
+      passwordSecretRef: # a reference to the secret containing user password
         name: mdb-admin-user-password
+      scramCredentialsSecretName: mdb-admin-user
       roles:
         - name: root
           db: admin
-      scramCredentialsSecretName: mdb-admin-user-scram
+    # user performing search queries
     - name: mdb-user
       db: admin
-      passwordSecretRef: # a reference to the secret that will be used to generate the user's password
+      passwordSecretRef: # a reference to the secret containing user password
         name: mdb-user-password
+      scramCredentialsSecretName: mdb-user-scram
       roles:
         - name: restore
           db: sample_mflix
         - name: readWrite
           db: sample_mflix
-      scramCredentialsSecretName: mdb-user-scram
-    - name: mongot-user
+    # user used by MongoDB Search to connect to MongoDB database to synchronize data from
+    # For MongoDB <8.2, the operator will be creating the searchCoordinator custom role automatically
+    # From MongoDB 8.2, searchCoordinator role will be a built-in role.
+    - name: search-sync-source
       db: admin
       passwordSecretRef: # a reference to the secret that will be used to generate the user's password
-        name: mdbc-rs-mongot-user-password
+        name: mdbc-rs-search-sync-source-password
+      scramCredentialsSecretName: mdbc-rs-search-sync-source
       roles:
         - name: searchCoordinator
           db: admin
-      scramCredentialsSecretName: mongot-user-scram
-  statefulSet:
-    spec:
-      template:
-        spec:
-          containers:
-            - name: mongod
-              resources:
-                limits:
-                  cpu: "3"
-                  memory: 5Gi
-                requests:
-                  cpu: "2"
-                  memory: 5Gi
-            - name: mongodb-agent
-              resources:
-                limits:
-                  cpu: "3"
-                  memory: 5Gi
-                requests:
-                  cpu: "2"
-                  memory: 5Gi

docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py

@@ -15,8 +15,8 @@
 ADMIN_USER_NAME = "mdb-admin-user"
 ADMIN_USER_PASSWORD = "mdb-admin-user-pass"
 
-MONGOT_USER_NAME = "mongot-user"
-MONGOT_USER_PASSWORD = "mongot-user-password"
+MONGOT_USER_NAME = "search-sync-source"
+MONGOT_USER_PASSWORD = "search-sync-source-user-password"
 
 USER_NAME = "mdb-user"
 USER_PASSWORD = "mdb-user-pass"
@@ -32,8 +32,8 @@ def mdbc(namespace: str) -> MongoDBCommunity:
         namespace=namespace,
     )
 
-    # if try_load(resource):
-    #     return resource
+    if try_load(resource):
+        return resource
 
     return resource
 
@@ -45,8 +45,8 @@ def mdbs(namespace: str) -> MongoDBSearch:
         namespace=namespace,
     )
 
-    # if try_load(resource):
-    #     return resource
+    if try_load(resource):
+        return resource
 
     return resource
 
@@ -75,7 +75,7 @@ def test_create_database_resource(mdbc: MongoDBCommunity):
 
 
 @mark.e2e_search_community_basic
-def test_create_search_resource(mdbs: MongoDBSearch, mdbc: MongoDBCommunity):
+def test_create_search_resource(mdbs: MongoDBSearch):
     mdbs.update()
     mdbs.assert_reaches_phase(Phase.Running, timeout=300)
 
@@ -102,11 +102,6 @@ def test_search_create_search_index(sample_movies_helper: SampleMoviesSearchHelp
     sample_movies_helper.create_search_index()
 
 
-# @mark.e2e_search_community_basic
-# def test_search_wait_for_search_indexes(sample_movies_helper: SampleMoviesSearchHelper):
-#     sample_movies_helper.wait_for_search_indexes()
-
-
 @mark.e2e_search_community_basic
 def test_search_assert_search_query(sample_movies_helper: SampleMoviesSearchHelper):
     sample_movies_helper.assert_search_query(retry_timeout=60)

docs/community-search/quick-start/code_snippets/0310_create_mongodb_community_resource.sh

@@ -41,7 +41,7 @@ spec:
       db: admin
       passwordSecretRef: # a reference to the secret containing user password
         name: mdb-admin-user-password
-      scramCredentialsSecretName: mdb-admin-user-scram
+      scramCredentialsSecretName: mdb-admin-user
       roles:
         - name: root
           db: admin
@@ -61,10 +61,9 @@ spec:
     # From MongoDB 8.2, searchCoordinator role will be a built-in role.
     - name: search-sync-source
       db: admin
-      passwordSecretRef: # a reference to the secret containing user password
+      passwordSecretRef: # a reference to the secret that will be used to generate the user's password
         name: mdbc-rs-search-sync-source-password
-      scramCredentialsSecretName: mdb-rs-search-sync-source
+      scramCredentialsSecretName: mdbc-rs-search-sync-source
       roles:
         - name: searchCoordinator
           db: admin
-EOF