Fix e2e search test naming alignment issues

- Fix try_load() by removing the FIXME early-return that was causing
  get_ops_manager() to return unloaded resources (empty status), resulting
  in empty baseUrl in OpsManager connection ConfigMaps on om80 variant
- Fix endpoint template in search-sharded-external-lb.yaml
- Fix username mismatch in enterprise_tls sample_movies_helper
- Fix CRD field name sharded→shardedCluster in sharded_enterprise_external_mongod
- Fix CA configmap and mongodbResourceRef overrides in sharded_enterprise_managed_lb
- Fix username mismatches in sharded_external_mongod_single_mongot

Author: lsierant

docker/mongodb-kubernetes-tests/kubetester/__init__.py

@@ -458,8 +458,6 @@ def try_load(resource: CustomObject) -> bool:
     Tries to load the resource without raising an exception when the resource does not exist.
     Returns False if the resource does not exist.
     """
-    # FIXME DELETE THIS
-    return False
     try:
         resource.load()
     except kubernetes.client.ApiException as e:

docker/mongodb-kubernetes-tests/tests/common/mongodb_tools_pod/mongodb_tools_pod.py

@@ -10,7 +10,9 @@
 
 TOOLS_POD_NAME = "mongodb-tools-pod"
 # pinning to specific hash as there was a regression in recently published images
-TOOLS_POD_IMAGE = "quay.io/mongodb/mongodb-community-server@sha256:4be3e7a6568e467a21c093f34ddedf0a7d35c244ead410d687e9eb50ac46be25"
+TOOLS_POD_IMAGE = (
+    "quay.io/mongodb/mongodb-community-server@sha256:4be3e7a6568e467a21c093f34ddedf0a7d35c244ead410d687e9eb50ac46be25"
+)
 
 
 class ToolsPod:

docker/mongodb-kubernetes-tests/tests/common/search/search_resource_names.py

@@ -7,7 +7,6 @@
 Go source: api/v1/search/mongodbsearch_types.go
 """
 
-
 # ============================================================================
 # Replica Set resources
 # ============================================================================

docker/mongodb-kubernetes-tests/tests/search/fixtures/search-sharded-external-lb.yaml

@@ -18,4 +18,4 @@ spec:
     mode: Unmanaged
     # Endpoint template with {shardName} placeholder
     # NAMESPACE placeholder is replaced with actual namespace by the test fixture
-    endpoint: "mdb-sh-mongot-{shardName}-proxy-svc.NAMESPACE.svc.cluster.local:27029"
+    endpoint: "mdb-sh-search-0-{shardName}-proxy-svc.NAMESPACE.svc.cluster.local:27029"

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

@@ -54,11 +54,7 @@ def mdbs(namespace: str) -> MongoDBSearch:
     if "spec" not in resource:
         resource["spec"] = {}
     resource["spec"]["security"] = {"tls": {"certificateKeySecretRef": {"name": MDBS_TLS_SECRET_NAME}}}
-    resource["spec"]["source"] = {
-        "passwordSecretRef": {
-            "name": f"{resource.name}-{MONGOT_USER_NAME}-password"
-        }
-    }
+    resource["spec"]["source"] = {"passwordSecretRef": {"name": f"{resource.name}-{MONGOT_USER_NAME}-password"}}
     try_load(resource)
     return resource
 
@@ -81,7 +77,9 @@ def admin_user(namespace: str) -> MongoDBUser:
 
 @fixture(scope="function")
 def user(namespace: str) -> MongoDBUser:
-    resource = MongoDBUser.from_yaml(yaml_fixture("mongodbuser-mdb-user.yaml"), namespace=namespace, name=f"{MDB_RESOURCE_NAME}-{USER_NAME}")
+    resource = MongoDBUser.from_yaml(
+        yaml_fixture("mongodbuser-mdb-user.yaml"), namespace=namespace, name=f"{MDB_RESOURCE_NAME}-{USER_NAME}"
+    )
     resource["spec"]["mongodbResourceRef"]["name"] = MDB_RESOURCE_NAME
     resource["spec"]["username"] = resource.name
     resource["spec"]["passwordSecretKeyRef"]["name"] = f"{resource.name}-password"
@@ -240,7 +238,9 @@ def test_search_verify_prometheus_enabled_on_custom_port(namespace: str, mdbs: M
 @fixture(scope="function")
 def sample_movies_helper(mdb: MongoDB, namespace: str) -> movies_search_helper.SampleMoviesSearchHelper:
     return movies_search_helper.SampleMoviesSearchHelper(
-        SearchTester.for_replicaset(mdb, USER_NAME, USER_PASSWORD, use_ssl=True, ca_path=get_issuer_ca_filepath()),
+        SearchTester.for_replicaset(
+            mdb, f"{MDB_RESOURCE_NAME}-{USER_NAME}", USER_PASSWORD, use_ssl=True, ca_path=get_issuer_ca_filepath()
+        ),
         tools_pod=mongodb_tools_pod.get_tools_pod(namespace),
     )
 

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

@@ -539,14 +539,14 @@ def create_envoy_certificates(namespace: str, issuer: str):
 
 def create_per_shard_search_tls_certs(namespace: str, issuer: str, prefix: str):
     """
-    Create per-shard TLS certificates for MongoDBSearch resource.
+        Create per-shard TLS certificates for MongoDBSearch resource.
 
-    For each shard, creates a certificate with DNS names for:
-    - The mongot service: {search-name}-search-0-{shardName}-svc.{namespace}.svc.cluster.local
-    - The proxy service: {search-name}-search-0-{shardName}-proxy-svc.{namespace}.svc.cluster.local
+        For each shard, creates a certificate with DNS names for:
+        - The mongot service: {search-name}-search-0-{shardName}-svc.{namespace}.svc.cluster.local
+        - The proxy service: {search-name}-search-0-{shardName}-proxy-svc.{namespace}.svc.cluster.local
 
-a    Secret naming: search_resource_names.shard_tls_cert_name(MDB_RESOURCE_NAME, shardName, prefix)
-    e.g., certs-mdb-sh-search-0-mdb-sh-0-cert
+    a    Secret naming: search_resource_names.shard_tls_cert_name(MDB_RESOURCE_NAME, shardName, prefix)
+        e.g., certs-mdb-sh-search-0-mdb-sh-0-cert
     """
     logger.info(f"Creating per-shard Search TLS certificates with prefix '{prefix}'...")
 
@@ -731,7 +731,9 @@ def test_verify_per_shard_tls_secrets(namespace: str, mdbs: MongoDBSearch):
         shard_name = f"{MDB_RESOURCE_NAME}-{shard_idx}"
 
         # Verify source secret (created by cert-manager in test_)
-        source_secret_name = search_resource_names.shard_tls_cert_name(MDB_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX)
+        source_secret_name = search_resource_names.shard_tls_cert_name(
+            MDB_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX
+        )
         try:
             source_secret = read_secret(namespace, source_secret_name)
             assert "tls.crt" in source_secret, f"Source secret {source_secret_name} missing tls.crt"

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

@@ -13,7 +13,7 @@
 - Executes search queries through mongos and verifies results from all shards
 
 Key difference from search_sharded_enterprise_external_lb.py:
-- This test uses spec.source.external.sharded (external MongoDB source)
+- This test uses spec.source.external.shardedCluster (external MongoDB source)
 - The other test uses spec.source.mongodb.name (operator-managed MongoDB source)
 """
 
@@ -139,7 +139,9 @@ def mdb(namespace: str, sharded_ca_configmap: str) -> MongoDB:
     for shard_idx in range(SHARD_COUNT):
         shard_name = f"{MDB_RESOURCE_NAME}-{shard_idx}"
         # Envoy proxy service name follows the pattern: <search-name>-search-0-<shard-name>-proxy-svc
-        proxy_host = search_resource_names.shard_proxy_service_host(MDBS_RESOURCE_NAME, shard_name, namespace, ENVOY_PROXY_PORT)
+        proxy_host = search_resource_names.shard_proxy_service_host(
+            MDBS_RESOURCE_NAME, shard_name, namespace, ENVOY_PROXY_PORT
+        )
 
         shard_overrides.append(
             {
@@ -161,7 +163,9 @@ def mdb(namespace: str, sharded_ca_configmap: str) -> MongoDB:
 
     # Configure mongos with search parameters pointing to first shard's Envoy proxy
     first_shard_name = f"{MDB_RESOURCE_NAME}-0"
-    mongos_proxy_host = search_resource_names.shard_proxy_service_host(MDBS_RESOURCE_NAME, first_shard_name, namespace, ENVOY_PROXY_PORT)
+    mongos_proxy_host = search_resource_names.shard_proxy_service_host(
+        MDBS_RESOURCE_NAME, first_shard_name, namespace, ENVOY_PROXY_PORT
+    )
 
     # Initialize mongos spec if not present
     if "mongos" not in resource["spec"]:
@@ -185,7 +189,7 @@ def mdb(namespace: str, sharded_ca_configmap: str) -> MongoDB:
 def mdbs(namespace: str, mdb: MongoDB) -> MongoDBSearch:
     """Fixture for MongoDBSearch with external sharded source configuration.
 
-    This fixture dynamically builds the spec.source.external.sharded configuration
+    This fixture dynamically builds the spec.source.external.shardedCluster configuration
     based on the deployed MongoDB sharded cluster, treating it as an external source.
     """
     resource = MongoDBSearch.from_yaml(
@@ -227,7 +231,7 @@ def mdbs(namespace: str, mdb: MongoDB) -> MongoDBSearch:
             "key": "password",
         },
         "external": {
-            "sharded": {
+            "shardedCluster": {
                 "router": {
                     "hosts": router_hosts,
                 },
@@ -784,7 +788,9 @@ def test_verify_per_shard_tls_secrets(namespace: str, mdbs: MongoDBSearch):
         shard_name = f"{MDB_RESOURCE_NAME}-{shard_idx}"
 
         # Verify source secret (created by cert-manager in test_create_search_tls_certificate)
-        source_secret_name = search_resource_names.shard_tls_cert_name(MDBS_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX)
+        source_secret_name = search_resource_names.shard_tls_cert_name(
+            MDBS_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX
+        )
         try:
             source_secret = read_secret(namespace, source_secret_name)
             assert "tls.crt" in source_secret, f"Source secret {source_secret_name} missing tls.crt"

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

@@ -120,6 +120,8 @@ def mdb(namespace: str, sharded_ca_configmap: str) -> MongoDB:
     # Configure OpsManager/CloudManager connection
     resource.configure(om=get_ops_manager(namespace), project_name=MDB_RESOURCE_NAME)
 
+    resource["spec"]["security"]["tls"]["ca"] = CA_CONFIGMAP_NAME
+
     return resource
 
 
@@ -139,6 +141,8 @@ def mdbs(namespace: str) -> MongoDBSearch:
     if try_load(resource):
         return resource
 
+    resource["spec"]["source"]["mongodbResourceRef"]["name"] = MDB_RESOURCE_NAME
+
     return resource
 
 
@@ -488,7 +492,9 @@ def test_verify_per_shard_tls_secrets(namespace: str, mdbs: MongoDBSearch):
         shard_name = f"{MDB_RESOURCE_NAME}-{shard_idx}"
 
         # Verify source secret (created by cert-manager in test_)
-        source_secret_name = search_resource_names.shard_tls_cert_name(MDB_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX)
+        source_secret_name = search_resource_names.shard_tls_cert_name(
+            MDB_RESOURCE_NAME, shard_name, MDBS_TLS_CERT_PREFIX
+        )
         try:
             source_secret = read_secret(namespace, source_secret_name)
             assert "tls.crt" in source_secret, f"Source secret {source_secret_name} missing tls.crt"

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

@@ -24,8 +24,7 @@
 from pytest import fixture, mark
 from tests import test_logger
 from tests.common.mongodb_tools_pod import mongodb_tools_pod
-from tests.common.search import search_resource_names, movies_search_helper
-from tests.common.search.search_tester import SearchTester
+from tests.common.search import movies_search_helper, search_resource_names
 from tests.common.search.movies_search_helper import SampleMoviesSearchHelper
 from tests.common.search.search_tester import SearchTester
 from tests.conftest import get_default_operator, get_issuer_ca_filepath
@@ -139,7 +138,9 @@ def mdb(namespace: str, sharded_ca_configmap: str) -> MongoDB:
 
     # Configure mongos with search parameters pointing to first shard's Envoy proxy
     first_shard_name = f"{MDB_RESOURCE_NAME}-0"
-    mongos_proxy_host = search_resource_names.shard_service_host(MDBS_RESOURCE_NAME, first_shard_name, namespace, MONGOT_PORT)
+    mongos_proxy_host = search_resource_names.shard_service_host(
+        MDBS_RESOURCE_NAME, first_shard_name, namespace, MONGOT_PORT
+    )
 
     # Initialize mongos spec if not present
     if "mongos" not in resource["spec"]:
@@ -240,7 +241,9 @@ def admin_user(namespace: str) -> MongoDBUser:
 
 @fixture(scope="function")
 def user(namespace: str) -> MongoDBUser:
-    resource = MongoDBUser.from_yaml(yaml_fixture("mongodbuser-mdb-user.yaml"), namespace=namespace, name=f"{MDB_RESOURCE_NAME}-{USER_NAME}")
+    resource = MongoDBUser.from_yaml(
+        yaml_fixture("mongodbuser-mdb-user.yaml"), namespace=namespace, name=f"{MDB_RESOURCE_NAME}-{USER_NAME}"
+    )
     resource["spec"]["mongodbResourceRef"]["name"] = MDB_RESOURCE_NAME
     resource["spec"]["username"] = resource.name
     resource["spec"]["passwordSecretKeyRef"]["name"] = f"{resource.name}-password"
@@ -407,7 +410,9 @@ def check_mongod_parameters():
                         pod_name, namespace, ["cat", "/data/automation-mongod.conf"]
                     )
                 )
-                expected_mongot_host_port = search_resource_names.shard_service_host(mdbs.name, shard_name, namespace, MONGOT_PORT)
+                expected_mongot_host_port = search_resource_names.shard_service_host(
+                    mdbs.name, shard_name, namespace, MONGOT_PORT
+                )
 
                 set_parameter = mongod_config.get("setParameter", {})
                 mongot_host = set_parameter.get("mongotHost", "")
@@ -467,15 +472,20 @@ def test_search_deploy_tools_pod(tools_pod: mongodb_tools_pod.ToolsPod):
 @fixture(scope="function")
 def sample_movies_helper(mdb: MongoDB, namespace: str) -> movies_search_helper.SampleMoviesSearchHelper:
     return movies_search_helper.SampleMoviesSearchHelper(
-        SearchTester.for_sharded(mdb, USER_NAME, USER_PASSWORD, use_ssl=True, ca_path=get_issuer_ca_filepath()),
+        SearchTester.for_sharded(
+            mdb, f"{MDB_RESOURCE_NAME}-{USER_NAME}", USER_PASSWORD, use_ssl=True, ca_path=get_issuer_ca_filepath()
+        ),
         tools_pod=mongodb_tools_pod.get_tools_pod(namespace),
     )
 
 
 @mark.e2e_search_sharded_external_mongod_single_mongot
-def test_search_restore_sample_database(mdb: MongoDB, sample_movies_helper: movies_search_helper.SampleMoviesSearchHelper):
+def test_search_restore_sample_database(
+    mdb: MongoDB, sample_movies_helper: movies_search_helper.SampleMoviesSearchHelper
+):
     sample_movies_helper.restore_sample_database()
 
+
 logger.info("Sample database restored")
 
 
@@ -580,13 +590,17 @@ def execute_all_docs_search():
 def get_admin_search_tester(mdb: MongoDB, use_ssl: bool = False) -> SearchTester:
     """Get SearchTester with admin credentials."""
     ca_path = get_issuer_ca_filepath() if use_ssl else None
-    return SearchTester.for_sharded(mdb, ADMIN_USER_NAME, ADMIN_USER_PASSWORD, use_ssl=use_ssl, ca_path=ca_path)
+    return SearchTester.for_sharded(
+        mdb, f"{MDB_RESOURCE_NAME}-{ADMIN_USER_NAME}", ADMIN_USER_PASSWORD, use_ssl=use_ssl, ca_path=ca_path
+    )
 
 
 def get_user_search_tester(mdb: MongoDB, use_ssl: bool = False) -> SearchTester:
     """Get SearchTester with regular user credentials."""
     ca_path = get_issuer_ca_filepath() if use_ssl else None
-    return SearchTester.for_sharded(mdb, USER_NAME, USER_PASSWORD, use_ssl=use_ssl, ca_path=ca_path)
+    return SearchTester.for_sharded(
+        mdb, f"{MDB_RESOURCE_NAME}-{USER_NAME}", USER_PASSWORD, use_ssl=use_ssl, ca_path=ca_path
+    )
 
 
 def create_per_shard_search_tls_certs(namespace: str, issuer: str, prefix: str):