JS Server: Implemented snapshot, verify, maintenance, update blobs

client/smoke_tests/test_listener.py

@@ -1,18 +1,18 @@
 import aiohttp
 import pytest
 from cbltest import CBLPyTest
+from cbltest.api.cbltestclass import CBLTestClass
 from cbltest.api.listener import Listener
-from cbltest.globals import CBLPyTestGlobal
+from cbltest.responses import ServerVariant
 
 
-class TestListener:
-    def setup_method(self, method):
-        # If writing a new test do not forget this step or the test server
-        # will not be informed about the currently running test
-        CBLPyTestGlobal.running_test_name = method.__name__
-
+class TestListener(CBLTestClass):
     @pytest.mark.asyncio(loop_scope="session")
     async def test_start_stop_listener(self, cblpytest: CBLPyTest) -> None:
+        await self.skip_if_not_platform(
+            cblpytest.test_servers[0], ServerVariant.ALL & ~ServerVariant.JS
+        )
+
         dbs = await cblpytest.test_servers[0].create_and_reset_db(["db1"])
         db = dbs[0]
         listener = Listener(db, ["_default._default"], 59840)

client/smoke_tests/test_log_endpoint.py

@@ -3,18 +3,17 @@
 import pytest
 import requests
 from cbltest import CBLPyTest
-from cbltest.globals import CBLPyTestGlobal
+from cbltest.api.cbltestclass import CBLTestClass
 from cbltest.logging import LogSlurpHandler, _cbl_log
+from cbltest.responses import ServerVariant
 
 
-class TestLogEndpoint:
-    def setup_method(self, method):
-        # If writing a new test do not forget this step or the test server
-        # will not be informed about the currently running test
-        CBLPyTestGlobal.running_test_name = method.__name__
-
+class TestLogEndpoint(CBLTestClass):
     @pytest.mark.asyncio(loop_scope="session")
     async def test_log_message(self, cblpytest: CBLPyTest) -> None:
+        await self.skip_if_not_platform(
+            cblpytest.test_servers[0], ServerVariant.ALL & ~ServerVariant.JS
+        )
         if cblpytest.config.logslurp_url is None:
             pytest.skip(
                 "No LogSlurp server configured (required to check functionality)"

client/smoke_tests/test_multipeer.py

@@ -2,19 +2,20 @@
 
 import pytest
 from cbltest import CBLPyTest
+from cbltest.api.cbltestclass import CBLTestClass
 from cbltest.api.multipeer_replicator import MultipeerReplicator
 from cbltest.api.replicator_types import ReplicatorCollectionEntry
-from cbltest.globals import CBLPyTestGlobal
+from cbltest.responses import ServerVariant
 
 
-class TestMultipeerReplicator:
-    def setup_method(self, method):
-        # If writing a new test do not forget this step or the test server
-        # will not be informed about the currently running test
-        CBLPyTestGlobal.running_test_name = method.__name__
-
+class TestMultipeerReplicator(CBLTestClass):
     @pytest.mark.asyncio(loop_scope="session")
     async def test_start_stop_multipeer(self, cblpytest: CBLPyTest) -> None:
+        await self.skip_if_not_platform(
+            cblpytest.test_servers[0], ServerVariant.ALL & ~ServerVariant.JS
+        )
+        await self.skip_if_cbl_not(cblpytest.test_servers[0], ">= 3.3.0")
+
         dbs = await cblpytest.test_servers[0].create_and_reset_db(["db1"])
         db = dbs[0]
         multipeer = MultipeerReplicator(

client/smoke_tests/test_perform_maintenance.py

@@ -1,9 +1,11 @@
 import pytest
 from cbltest import CBLPyTest
+from cbltest.api.cbltestclass import CBLTestClass
 from cbltest.api.database_types import MaintenanceType
+from cbltest.responses import ServerVariant
 
 
-class TestPerformMaintenance:
+class TestPerformMaintenance(CBLTestClass):
     @pytest.mark.asyncio(loop_scope="session")
     @pytest.mark.parametrize(
         "maintenance_type",
@@ -17,6 +19,11 @@ class TestPerformMaintenance:
     async def test_perform_maintenance_endpoint(
         self, cblpytest: CBLPyTest, maintenance_type: MaintenanceType
     ) -> None:
+        if maintenance_type != MaintenanceType.COMPACT:
+            await self.skip_if_not_platform(
+                cblpytest.test_servers[0], ServerVariant.ALL & ~ServerVariant.JS
+            )
+
         dbs = await cblpytest.test_servers[0].create_and_reset_db(
             ["db1"], dataset="names"
         )

client/smoke_tests/test_run_query.py

@@ -14,11 +14,13 @@ async def test_run_query(self, cblpytest: CBLPyTest):
         db = await cblpytest.test_servers[0].create_and_reset_db(
             ["db1"], dataset="names"
         )
-        results = await db[0].run_query("select meta().id from _ LIMIT 5")
+        results = await db[0].run_query(
+            "select meta().id from _ ORDER BY meta().id LIMIT 5"
+        )
         assert results is not None, "The query should return a result"
         assert len(results) == 5, "The query should return five results"
         i = 1
-        for r in results:
+        expected = ["name_1", "name_10", "name_100", "name_11", "name_12"]
+        for i, r in enumerate(results):
             assert "id" in r, "The result should have an ID column"
-            assert r["id"] == f"name_{i}", f"The result ID should be name_{i}"
-            i += 1
+            assert r["id"] == expected[i], f"The result ID should be {expected[i]}"

client/smoke_tests/test_start_replicator.py

@@ -2,7 +2,6 @@
 from cbltest import CBLPyTest
 from cbltest.api.database import Database
 from cbltest.api.error import CblTestServerBadResponseError
-from cbltest.api.error_types import ErrorDomain
 from cbltest.api.replicator import Replicator
 from cbltest.api.replicator_types import (
     ReplicatorActivityLevel,
@@ -35,11 +34,7 @@ async def test_bad_endpoint(self, cblpytest: CBLPyTest) -> None:
         repl.add_default_collection()
         await repl.start()
         status = await repl.wait_for(ReplicatorActivityLevel.STOPPED)
-        assert (
-            status.error is not None
-            and ErrorDomain.equal(status.error.domain, ErrorDomain.CBL)
-            and status.error.code == 5002
-        )
+        assert status.error is not None
 
     @pytest.mark.asyncio(loop_scope="session")
     @pytest.mark.parametrize(

client/src/cbltest/api/error.py

@@ -21,10 +21,14 @@ def response(self) -> TestServerResponse:
         """Gets the body of the response that had the bad status"""
         return self.__response
 
-    def __init__(self, code: int, response: TestServerResponse, *args):
+    def __init__(self, code: int, response: TestServerResponse, message: str):
         self.__code = code
         self.__response = response
-        super().__init__(args)
+        self.__message = message
+        super().__init__(message)
+
+    def __str__(self) -> str:
+        return self.__message
 
 
 class CblTimeoutError(Exception):

client/src/cbltest/api/syncgateway.py

@@ -19,6 +19,41 @@
 from cbltest.utils import assert_not_null
 from cbltest.version import VERSION
 
+# This is copied from environment/aws/sgw_setup/cert/ca_cert.pem
+# So if that file ever changes, change this too.
+_SGW_CA_CERT: str = """-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIUBdrc0OhquX8RnXtZ6AiOY+57C18wDQYJKoZIhvcNAQEL
+BQAwPDEZMBcGA1UEAwwQSW50ZXJuYWwgVGVzdCBDQTESMBAGA1UECgwJQ291Y2hi
+YXNlMQswCQYDVQQGEwJVUzAeFw0yNTEwMjkwMTAzMDBaFw0yNzEwMjkwMTAzMDBa
+MDwxGTAXBgNVBAMMEEludGVybmFsIFRlc3QgQ0ExEjAQBgNVBAoMCUNvdWNoYmFz
+ZTELMAkGA1UEBhMCVVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCl
+vMLIQDFfEcttEUSzBKkzoRSSLJ3Z/73xmJxBenCtZ9HasLhF3iJxwyQK09nD7sLv
+RRwLeRfY8QObr/F/qJAa1cQtVA/5UxIiKsjDk+TrUibg4p6NFSgKUEg+08D0tRHG
+CF3CF/3qcM/10A+Pg2K1COaAtPrYjslOv8DoDBzwOBxibaheDZmtBdPEeHghDXZr
+DWYDe2770XGzKYqINCEDxNdyDUBdiNSzuX2h/YeZi6vGTtpAt3Iti2SIerRrCiah
+UOlykQoqiDVh4JPXts79Xhszw0oDK6YWHEBBfXmYDUdYAyF97XC6hZc+6HxiCVTB
+887mkyLCuKMGfB3dabyCqJ31fXm7gmufOs8voCfi/sKjLgcdZQUY4Gw345oYI3Yw
+O41ig/uR04KW2xASba38vXt0fEl9/50+AO3xAy9oaY36nLSnBwTV72VbvTlvevGf
+zSHbVIbtzcuovpudghYizmIqMEFguc8VsGgmwZb8mkypzB80SOoED3nJRziIK1ym
+e+NuO0DIG6xMPUhputNhwqaeYXuSmcUH5YcmLN//ewMIjzxoH33H1cwcADHFioR/
+YfIraSgVZCUhrN9aJlXdDOzDuhbVpXYJMbh5PfAiNLHPCXmo685Utf3ID+nFW1wd
+WOIyuE3aJ5KVtG8hjlgKARV7eEqtxHjIl41QtsxalwIDAQABo1MwUTAdBgNVHQ4E
+FgQUs2WdMu1wh9pJ5dPN80yN1NPAkSswHwYDVR0jBBgwFoAUs2WdMu1wh9pJ5dPN
+80yN1NPAkSswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAhiYP
+a9dvAv/33u9vBKzUo045RRrfEpv80DSZQb4ttyulrIfbaLFHxaDcf2+S+mywAgoW
+tf9SAwWO41qU7sfIBnFdCh982nP1dD707GDAZIe8ZNpl/Vu3hWY3TRQAp9ufA51w
+wxn0m2tOS18UXpv5BNX1kVaLlAiOzRzmP1ghx08v9yd8eBgnjJ89D2m1U+qFS1Xk
+egiyw66HHc3bG+eo523/l4RDqTx6KkhYnD3Bz89IxMaeK7CuynCY3VyVWPeIUfBr
+clkDBqZa4o7fD3xV6Wiu/NHZsWJx3wog1wwelvlsyOVM+mfd4IOsPGVCCdDGtpoq
+sT+f9mPDXXHKuDER8a7HiCgGK8rAQtCm/P5UFp2HUEIru/psWCXc3vh9HYVX9W79
+TwS+AVAlkeVogs1ugqAXOuGmstnevj6XzA8PszCKDSIV+t1PJSSOtypUyN4gbGGx
+sk1s9bwqy7bw2cMh3tt7HromGOoLnPxnsbQCs5HsqNdiEsPABWnI6m7epm0tFjCe
+gHDyw1LdmZlZ3R7DT+CwfyhxL6hktfs8h7goR1vkmS2q0Alxmw9faKVVpDyWnsZC
+qv6PMC0fI7jhvrr2Uf2Hhw9SQlBFwZ7LjjLqjuuJkclM4VooDElsLbPjSUbA+c5h
+WCKJ0c94mrl9GwwBmcSIKJBvd6u7uAta2fREJeE=
+-----END CERTIFICATE-----
+"""
+
 
 class _CollectionMap(JSONSerializable):
     @property
@@ -344,7 +379,7 @@ def _create_session(
         self, secure: bool, scheme: str, url: str, port: int, auth: BasicAuth | None
     ) -> ClientSession:
         if secure:
-            ssl_context = ssl.create_default_context(cadata=self.tls_cert())
+            ssl_context = ssl.create_default_context(cadata=_SGW_CA_CERT)
             # Disable hostname check so that the pre-generated SG can be used on any machines.
             ssl_context.check_hostname = False
             return ClientSession(

client/src/cbltest/requests_transport.py

@@ -85,7 +85,7 @@ async def send(
         cbl_trace(f"Received {ret_val} from {self.__url}")
         if not resp.ok:
             raise CblTestServerBadResponseError(
-                resp.status, ret_val, f"{self} returned {resp.status}"
+                resp.status, ret_val, f"returned {resp.status}"
             )
 
         return ret_val
@@ -167,7 +167,7 @@ async def send(
         cbl_trace(f"Received {ret_val} from {self.__url}")
         if ret_val.status_code != 200:
             raise CblTestServerBadResponseError(
-                ret_val.status_code, ret_val, f"{self} returned {ret_val.status_code}"
+                ret_val.status_code, ret_val, f"returned {ret_val.status_code}"
             )
 
         return ret_val

dataset/server/dbs/js/travel/index.json

@@ -2,7 +2,9 @@
     "name": "travel",
     "collections": [
         "travel.airlines",
+        "travel.airports",
         "travel.hotels",
+        "travel.landmarks",
         "travel.routes"
     ]
 }

environment/aws/common/docker.py

@@ -54,29 +54,6 @@ def check_aws_key_checking() -> None:
         )
 
 
-def get_ec2_hostname(hostname: str) -> str:
-    """
-    Convert an IP address to an EC2 hostname.
-
-    Args:
-        hostname (str): The IP address.
-
-    Returns:
-        str: The EC2 hostname.
-
-    Raises:
-        ValueError: If the hostname is not an IP address.
-    """
-    if hostname.startswith("ec2-"):
-        return hostname
-
-    components = hostname.split(".")
-    if len(components) != 4:
-        raise ValueError(f"Invalid hostname {hostname}")
-
-    return f"ec2-{hostname.replace('.', '-')}.compute-1.amazonaws.com"
-
-
 def start_container(
     name: str,
     context_name: str,

environment/aws/common/io.py

@@ -219,6 +219,29 @@ def untar_directory(input: Path, output: Path) -> None:
     click.echo("Done")
 
 
+def get_ec2_hostname(hostname: str) -> str:
+    """
+    Convert an IP address to an EC2 hostname.
+
+    Args:
+        hostname (str): The IP address.
+
+    Returns:
+        str: The EC2 hostname.
+
+    Raises:
+        ValueError: If the hostname is not an IP address.
+    """
+    if hostname.startswith("ec2-"):
+        return hostname
+
+    components = hostname.split(".")
+    if len(components) != 4:
+        raise ValueError(f"Invalid hostname {hostname}")
+
+    return f"ec2-{hostname.replace('.', '-')}.compute-1.amazonaws.com"
+
+
 @contextmanager
 def pushd(new_dir: Path):
     prev_dir = Path.cwd()

environment/aws/lb_setup/setup_load_balancers.py

@@ -25,10 +25,9 @@
 
 from environment.aws.common.docker import (
     check_aws_key_checking,
-    get_ec2_hostname,
     start_container,
 )
-from environment.aws.common.io import LIGHT_GRAY, sftp_progress_bar
+from environment.aws.common.io import LIGHT_GRAY, get_ec2_hostname, sftp_progress_bar
 from environment.aws.common.output import header
 from environment.aws.topology_setup.setup_topology import TopologyConfig
 

environment/aws/logslurp_setup/setup_logslurp.py

@@ -23,10 +23,9 @@
 
 from environment.aws.common.docker import (
     check_aws_key_checking,
-    get_ec2_hostname,
     start_container,
 )
-from environment.aws.common.io import LIGHT_GRAY, sftp_progress_bar
+from environment.aws.common.io import LIGHT_GRAY, get_ec2_hostname, sftp_progress_bar
 from environment.aws.common.output import header
 from environment.aws.topology_setup.setup_topology import TopologyConfig
 

environment/aws/sgw_setup/cert/ca_cert.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIUBdrc0OhquX8RnXtZ6AiOY+57C18wDQYJKoZIhvcNAQEL
+BQAwPDEZMBcGA1UEAwwQSW50ZXJuYWwgVGVzdCBDQTESMBAGA1UECgwJQ291Y2hi
+YXNlMQswCQYDVQQGEwJVUzAeFw0yNTEwMjkwMTAzMDBaFw0yNzEwMjkwMTAzMDBa
+MDwxGTAXBgNVBAMMEEludGVybmFsIFRlc3QgQ0ExEjAQBgNVBAoMCUNvdWNoYmFz
+ZTELMAkGA1UEBhMCVVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCl
+vMLIQDFfEcttEUSzBKkzoRSSLJ3Z/73xmJxBenCtZ9HasLhF3iJxwyQK09nD7sLv
+RRwLeRfY8QObr/F/qJAa1cQtVA/5UxIiKsjDk+TrUibg4p6NFSgKUEg+08D0tRHG
+CF3CF/3qcM/10A+Pg2K1COaAtPrYjslOv8DoDBzwOBxibaheDZmtBdPEeHghDXZr
+DWYDe2770XGzKYqINCEDxNdyDUBdiNSzuX2h/YeZi6vGTtpAt3Iti2SIerRrCiah
+UOlykQoqiDVh4JPXts79Xhszw0oDK6YWHEBBfXmYDUdYAyF97XC6hZc+6HxiCVTB
+887mkyLCuKMGfB3dabyCqJ31fXm7gmufOs8voCfi/sKjLgcdZQUY4Gw345oYI3Yw
+O41ig/uR04KW2xASba38vXt0fEl9/50+AO3xAy9oaY36nLSnBwTV72VbvTlvevGf
+zSHbVIbtzcuovpudghYizmIqMEFguc8VsGgmwZb8mkypzB80SOoED3nJRziIK1ym
+e+NuO0DIG6xMPUhputNhwqaeYXuSmcUH5YcmLN//ewMIjzxoH33H1cwcADHFioR/
+YfIraSgVZCUhrN9aJlXdDOzDuhbVpXYJMbh5PfAiNLHPCXmo685Utf3ID+nFW1wd
+WOIyuE3aJ5KVtG8hjlgKARV7eEqtxHjIl41QtsxalwIDAQABo1MwUTAdBgNVHQ4E
+FgQUs2WdMu1wh9pJ5dPN80yN1NPAkSswHwYDVR0jBBgwFoAUs2WdMu1wh9pJ5dPN
+80yN1NPAkSswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAhiYP
+a9dvAv/33u9vBKzUo045RRrfEpv80DSZQb4ttyulrIfbaLFHxaDcf2+S+mywAgoW
+tf9SAwWO41qU7sfIBnFdCh982nP1dD707GDAZIe8ZNpl/Vu3hWY3TRQAp9ufA51w
+wxn0m2tOS18UXpv5BNX1kVaLlAiOzRzmP1ghx08v9yd8eBgnjJ89D2m1U+qFS1Xk
+egiyw66HHc3bG+eo523/l4RDqTx6KkhYnD3Bz89IxMaeK7CuynCY3VyVWPeIUfBr
+clkDBqZa4o7fD3xV6Wiu/NHZsWJx3wog1wwelvlsyOVM+mfd4IOsPGVCCdDGtpoq
+sT+f9mPDXXHKuDER8a7HiCgGK8rAQtCm/P5UFp2HUEIru/psWCXc3vh9HYVX9W79
+TwS+AVAlkeVogs1ugqAXOuGmstnevj6XzA8PszCKDSIV+t1PJSSOtypUyN4gbGGx
+sk1s9bwqy7bw2cMh3tt7HromGOoLnPxnsbQCs5HsqNdiEsPABWnI6m7epm0tFjCe
+gHDyw1LdmZlZ3R7DT+CwfyhxL6hktfs8h7goR1vkmS2q0Alxmw9faKVVpDyWnsZC
+qv6PMC0fI7jhvrr2Uf2Hhw9SQlBFwZ7LjjLqjuuJkclM4VooDElsLbPjSUbA+c5h
+WCKJ0c94mrl9GwwBmcSIKJBvd6u7uAta2fREJeE=
+-----END CERTIFICATE-----