synapse 2.177.0__py311-none-any.whl → 2.178.0__py311-none-any.whl

synapse/tests/test_tools_aha.py

@@ -9,6 +9,7 @@ import synapse.lib.cell as s_cell
 import synapse.tests.utils as s_t_utils
 
 import synapse.tools.aha.list as s_a_list
+import synapse.tools.aha.clone as s_a_clone
 import synapse.tools.aha.enroll as s_a_enroll
 import synapse.tools.aha.easycert as s_a_easycert
 import synapse.tools.aha.provision.user as s_a_provision_user
@@ -17,40 +18,37 @@ class AhaToolsTest(s_t_utils.SynTest):
 
     async def test_aha_list(self):
 
-        ephemeral_address = 'tcp://0.0.0.0:0/'
-        async with self.getTestAha(conf={'auth:passwd': 'root',
-                                         'dmon:listen': ephemeral_address}) as aha:
-            _, port = aha.sockaddr
-            ahaurl = f'tcp://root:root@127.0.0.1:{port}'
-            conf0 = {
-                'aha:registry': ahaurl,
-                'aha:name': 'cell0',
-                'aha:network': 'demo.net',
-                'dmon:listen': ephemeral_address,
-            }
-            conf1 = {
-                'aha:registry': ahaurl,
-                'aha:name': 'cell1',
-                'aha:network': 'example.net',
-                'dmon:listen': ephemeral_address,
-            }
+        async with self.getTestAha() as aha:
+
             waiter = aha.waiter(2, 'aha:svcadd')
+            conf0 = {'aha:provision': await aha.addAhaSvcProv('cell0')}
+
+            provinfo = {'aha:network': 'example.net'}
+            conf1 = {'aha:provision': await aha.addAhaSvcProv('cell1', provinfo=provinfo)}
+
+            ahaurl = aha.getLocalUrl()
+
             async with self.getTestCell(s_cell.Cell, conf=conf0) as cell0:
+
                 async with self.getTestCell(s_cell.Cell, conf=conf1) as cell1:
+
                     self.true(await waiter.wait(timeout=6))
+
                     argv = [ahaurl]
                     retn, outp = await self.execToolMain(s_a_list._main, argv)
                     self.eq(retn, 0)
-                    outp.expect('Service              network                        leader')
-                    outp.expect('cell0                demo.net                       None')
-                    outp.expect('cell1                example.net                    None')
+
+                    outp.expect('''
+                        Service              network                        leader
+                        cell0                synapse                        None
+                        cell1                example.net                    None
+                    ''', whitespace=False)
 
                     argv = [ahaurl, 'demo.net']
                     retn, outp = await self.execToolMain(s_a_list._main, argv)
                     self.eq(retn, 0)
-                    outp.expect('Service              network')
-                    outp.expect('cell0                demo.net')
-                    self.false(outp.expect('cell1                example.net', throw=False))
+                    outp.expect('Service              network', whitespace=False)
+                    outp.expect('cell0                demo.net', whitespace=False)
 
         async with self.getTestCore() as core:
             curl = core.getLocalUrl()
@@ -94,102 +92,81 @@ class AhaToolsTest(s_t_utils.SynTest):
 
     async def test_aha_enroll(self):
 
-        with self.getTestDir() as dirn:
-
-            conf = {
-                'aha:name': 'aha',
-                'aha:network': 'loop.vertex.link',
-                'provision:listen': 'ssl://aha.loop.vertex.link:0',
-                'dmon:listen': 'tcp://0.0.0.0:0'
-            }
-            async with self.getTestAha(dirn=dirn, conf=conf) as aha:
-
-                addr, port = aha.provdmon.addr
-                aha.conf['provision:listen'] = f'ssl://aha.loop.vertex.link:{port}'
-
-                host_, ahaport = aha.sockaddr
-                self.eq(aha._getAhaUrls(), [f'ssl://aha.loop.vertex.link:{ahaport}'])
+        async with self.getTestAha() as aha:
 
-                argv = ['--url', aha.getLocalUrl(), 'visi']
-                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                self.isin('one-time use URL:', str(outp))
-
-                provurl = str(outp).split(':', 1)[1].strip()
-                with self.getTestSynDir() as syndir:
+            argv = ['--url', aha.getLocalUrl(), '01.aha.loop.vertex.link']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 0)
+            self.isin('one-time use URL:', str(outp))
 
-                    capath = s_common.genpath(syndir, 'certs', 'cas', 'loop.vertex.link.crt')
-                    crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.crt')
-                    keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.key')
+            argv = ['--url', aha.getLocalUrl(), '01.aha.loop.vertex.link', '--only-url']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 0)
+            self.notin('one-time use URL:', str(outp))
 
-                    for path in (capath, crtpath, keypath):
-                        s_common.genfile(path)
+            argv = ['--url', 'newp://1.2.3.4', '01.aha.loop.vertex.link']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 1)
+            self.isin('ERROR: Invalid URL scheme: newp', str(outp))
 
-                    yamlpath = s_common.genpath(syndir, 'telepath.yaml')
-                    s_common.yamlsave({'aha:servers': 'cell://aha'}, yamlpath)
+            argv = ['--url', aha.getLocalUrl(), 'visi']
+            retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+            self.isin('one-time use URL:', str(outp))
 
-                    retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-                    self.eq(0, retn)
+            provurl = str(outp).split(':', 1)[1].strip()
+            with self.getTestSynDir() as syndir:
 
-                    for path in (capath, crtpath, keypath):
-                        self.gt(os.path.getsize(path), 0)
+                capath = s_common.genpath(syndir, 'certs', 'cas', 'synapse.crt')
+                crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
+                keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
 
-                    teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                    self.eq(teleyaml.get('version'), 1)
-                    self.eq(teleyaml.get('aha:servers'), ('cell://aha', f'ssl://visi@aha.loop.vertex.link:{ahaport}'))
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
+                self.eq(0, retn)
 
-                    shutil.rmtree(s_common.genpath(syndir, 'certs'))
+                for path in (capath, crtpath, keypath):
+                    self.true(os.path.isfile(path))
+                    self.gt(os.path.getsize(path), 0)
 
-                    def _strUrl(self):
-                        return 'ssl://aha.loop.vertex.link'
+                teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
+                self.eq(teleyaml.get('version'), 1)
+                self.len(1, teleyaml.get('aha:servers'))
 
-                    with mock.patch('synapse.lib.aha.AhaCell._getAhaUrls', _strUrl):
+                shutil.rmtree(s_common.genpath(syndir, 'certs'))
 
-                        argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
-                        retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                        self.eq(retn, 0)
-                        self.isin('one-time use URL:', str(outp))
-
-                        provurl = str(outp).split(':', 1)[1].strip()
-
-                        retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-
-                        servers = ['cell://aha',
-                                   'ssl://visi@aha.loop.vertex.link',
-                                   f'ssl://visi@aha.loop.vertex.link:{ahaport}']
+                argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+                self.eq(retn, 0)
+                self.isin('one-time use URL:', str(outp))
 
-                        teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                        self.sorteq(teleyaml.get('aha:servers'), servers)
+                provurl = str(outp).split(':', 1)[1].strip()
 
-                        # Just return the URL
-                        retn, outp = await self.execToolMain(s_a_provision_user.main, argv + ['--only-url'])
-                        self.eq(retn, 0)
-                        self.notin('one-time use URL:', str(outp))
-                        self.isin('ssl://', str(outp))
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
 
-                with self.getTestSynDir() as syndir:
+                # Just return the URL
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv + ['--only-url'])
+                self.eq(retn, 0)
+                self.notin('one-time use URL:', str(outp))
+                self.isin('ssl://', str(outp))
 
-                    argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
-                    retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                    self.eq(retn, 0)
-                    provurl = str(outp).split(':', 1)[1].strip()
+            with self.getTestSynDir() as syndir:
 
-                    capath = s_common.genpath(syndir, 'certs', 'cas', 'loop.vertex.link.crt')
-                    crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.crt')
-                    keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.key')
+                argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+                self.eq(retn, 0)
+                provurl = str(outp).split(':', 1)[1].strip()
 
-                    for path in (capath, crtpath, keypath):
-                        s_common.genfile(path)
+                capath = s_common.genpath(syndir, 'certs', 'cas', 'synapse.crt')
+                crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
+                keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.key')
 
-                    yamlpath = s_common.genpath(syndir, 'telepath.yaml')
-                    s_common.yamlsave({'aha:servers': ['cell://aha', 'cell://foo', ['cell://bar']]}, yamlpath)
+                for path in (capath, crtpath, keypath):
+                    s_common.genfile(path)
 
-                    retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-                    self.eq(0, retn)
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
+                self.eq(0, retn)
 
-                    for path in (capath, crtpath, keypath):
-                        self.gt(os.path.getsize(path), 0)
+                for path in (capath, crtpath, keypath):
+                    self.gt(os.path.getsize(path), 0)
 
-                    teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                    self.eq(teleyaml.get('version'), 1)
-                    self.eq(teleyaml.get('aha:servers'), ('cell://aha', 'cell://foo', ('cell://bar',),
-                                                          f'ssl://visi@aha.loop.vertex.link:{ahaport}'))
+                teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
+                self.eq(teleyaml.get('version'), 1)

synapse/tests/utils.py

@@ -677,7 +677,7 @@ class TstEnv:
 
 class TstOutPut(s_output.OutPutStr):
 
-    def expect(self, substr, throw=True):
+    def expect(self, substr, throw=True, whitespace=True):
         '''
         Check if a string is present in the messages captured by the OutPutStr object.
 
@@ -689,6 +689,11 @@ class TstOutPut(s_output.OutPutStr):
             bool: True if the string is present; False if the string is not present and throw is False.
         '''
         outs = str(self)
+
+        if not whitespace:
+            outs = ' '.join(outs.split())
+            substr = ' '.join(outs.split())
+
         if outs.find(substr) == -1:
             if throw:
                 mesg = 'TestOutPut.expect(%s) not in %s' % (substr, outs)
@@ -1297,34 +1302,20 @@ class SynTest(unittest.TestCase):
         Returns:
             s_cortex.Cortex: A Cortex object.
         '''
-        if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-
-        conf = copy.deepcopy(conf)
+        conf = self.getCellConf(conf=conf)
 
-        mods = conf.get('modules')
-
-        if mods is None:
-            mods = []
-            conf['modules'] = mods
+        mods = list(conf.get('modules', ()))
+        conf['modules'] = mods
 
         mods.insert(0, ('synapse.tests.utils.TestModule', {'key': 'valu'}))
 
         with self.withNexusReplay():
 
-            if dirn is not None:
+            with self.mayTestDir(dirn) as dirn:
 
                 async with await s_cortex.Cortex.anit(dirn, conf=conf) as core:
                     yield core
 
-                return
-
-            with self.getTestDir() as dirn:
-                async with await s_cortex.Cortex.anit(dirn, conf=conf) as core:
-                    yield core
-
     @contextlib.asynccontextmanager
     async def getTestCoreAndProxy(self, conf=None, dirn=None):
         '''
@@ -1342,11 +1333,7 @@ class SynTest(unittest.TestCase):
     @contextlib.asynccontextmanager
     async def getTestJsonStor(self, dirn=None, conf=None):
 
-        if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-        conf = copy.deepcopy(conf)
+        conf = self.getCellConf(conf=conf)
 
         with self.withNexusReplay():
             if dirn is not None:
@@ -1367,20 +1354,10 @@ class SynTest(unittest.TestCase):
         Returns:
             s_cryotank.CryoCell: Test cryocell.
         '''
-        if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-        conf = copy.deepcopy(conf)
+        conf = self.getCellConf(conf=conf)
 
         with self.withNexusReplay():
-            if dirn is not None:
-                async with await s_cryotank.CryoCell.anit(dirn, conf=conf) as cryo:
-                    yield cryo
-
-                return
-
-            with self.getTestDir() as dirn:
+            with self.mayTestDir(dirn) as dirn:
                 async with await s_cryotank.CryoCell.anit(dirn, conf=conf) as cryo:
                     yield cryo
 
@@ -1409,26 +1386,13 @@ class SynTest(unittest.TestCase):
             s_certdir.delCertPath(certpath)
 
     @contextlib.asynccontextmanager
-    async def getTestCell(self, ctor, conf=None, dirn=None):
+    async def getTestCell(self, ctor=s_cell.Cell, conf=None, dirn=None):
         '''
         Get a test Cell.
         '''
-        if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-
-        conf = copy.deepcopy(conf)
-
+        conf = self.getCellConf(conf=conf)
         with self.withNexusReplay():
-            if dirn is not None:
-
-                async with await ctor.anit(dirn, conf=conf) as cell:
-                    yield cell
-
-                return
-
-            with self.getTestDir() as dirn:
+            with self.mayTestDir(dirn) as dirn:
                 async with await ctor.anit(dirn, conf=conf) as cell:
                     yield cell
 
@@ -1451,62 +1415,77 @@ class SynTest(unittest.TestCase):
 
                 yield core, prox, testsvc
 
+    @contextlib.contextmanager
+    def mayTestDir(self, dirn: str | None) -> contextlib.AbstractContextManager[str, None, None]:
+        '''
+        Convenience method to make a temporary directory or use an existing one.
+
+        Args:
+            dirn: Directory to use, or None.
+
+        Returns:
+            The directory to use.
+        '''
+        if dirn is not None:
+            yield dirn
+            return
+
+        with self.getTestDir() as dirn:
+            yield dirn
+
     @contextlib.asynccontextmanager
-    async def getTestAha(self, conf=None, dirn=None):
+    async def getTestAha(self, conf=None, dirn=None, ctor=None):
 
         if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-        conf = copy.deepcopy(conf)
+            conf = {}
+
+        if ctor is None:
+            ctor = s_aha.AhaCell.anit
+
+        conf = s_msgpack.deepcopy(conf)
+
+        hasdmonlisn = 'dmon:listen' in conf
+        hasprovlisn = 'provision:listen' in conf
+
+        network = conf.setdefault('aha:network', 'synapse')
+        hostname = conf.setdefault('dns:name', '00.aha.loop.vertex.link')
+
+        if hostname:
+            conf.setdefault('provision:listen', f'ssl://0.0.0.0:0?hostname={hostname}')
+            conf.setdefault('dmon:listen', f'ssl://0.0.0.0:0?hostname={hostname}&ca={network}')
+
+        conf.setdefault('health:sysctl:checks', False)
 
         with self.withNexusReplay():
-            if dirn:
-                async with await s_aha.AhaCell.anit(dirn, conf=conf) as aha:
-                    yield aha
-            else:
-                with self.getTestDir() as dirn:
-                    async with await s_aha.AhaCell.anit(dirn, conf=conf) as aha:
-                        yield aha
 
-    @contextlib.asynccontextmanager
-    async def getTestAhaProv(self, conf=None, dirn=None):
-        '''
-        Get an Aha cell that is configured for provisioning on aha.loop.vertex.link.
+            with self.mayTestDir(dirn) as dirn:
 
-        Args:
-            conf: Optional configuration information for the Aha cell.
-            dirn: Optional path to create the Aha cell in.
+                if conf.get('aha:network') == 'synapse':
+                    dstpath = os.path.join(dirn, 'certs')
+                    if not os.path.isdir(dstpath):
+                        srcpath = self.getTestFilePath('aha/certs')
+                        shutil.copytree(srcpath, os.path.join(dirn, 'certs'))
 
-        Returns:
-            s_aha.AhaCell: The provisioned Aha cell.
-        '''
-        bconf = {
-            'aha:name': 'aha',
-            'aha:network': 'loop.vertex.link',
-            'provision:listen': 'ssl://aha.loop.vertex.link:0'
-        }
+                async with await ctor(dirn, conf=conf) as aha:
 
-        if conf is None:
-            conf = bconf
-        else:
-            for k, v in bconf.items():
-                conf.setdefault(k, v)
+                    mods = {}
+                    if not hasdmonlisn and hostname:
+                        mods['dmon:listen'] = f'ssl://0.0.0.0:{aha.sockaddr[1]}?hostname={hostname}&ca={network}'
 
-        name = conf.get('aha:name')
-        netw = conf.get('aha:network')
-        dnsname = f'{name}.{netw}'
+                    if not hasprovlisn and hostname:
+                        mods['provision:listen'] = f'ssl://0.0.0.0:{aha.provaddr[1]}?hostname={hostname}'
 
-        async with self.getTestAha(conf=conf, dirn=dirn) as aha:
-            addr, port = aha.provdmon.addr
-            # update the config to reflect the dynamically bound port
-            aha.conf['provision:listen'] = f'ssl://{dnsname}:{port}'
+                    if mods:
+                        aha.modCellConf(mods)
 
-            # do this config ex-post-facto due to port binding...
-            host, ahaport = await aha.dmon.listen(f'ssl://0.0.0.0:0?hostname={dnsname}&ca={netw}')
-            aha.conf['aha:urls'] = (f'ssl://{dnsname}:{ahaport}',)
+                    yield aha
 
-            yield aha
+    def getCellConf(self, conf=None):
+        if conf is None:
+            conf = {}
+        conf = s_msgpack.deepcopy(conf)
+        conf.setdefault('health:sysctl:checks', False)
+        return conf
 
     @contextlib.asynccontextmanager
     async def addSvcToAha(self, aha, svcname, ctor,
@@ -1528,36 +1507,19 @@ class SynTest(unittest.TestCase):
             The config data for the cell is pushed into dirn/cell.yaml.
             The cells are created with the ``ctor.anit()`` function.
         '''
+        ahanetw = aha.conf.req('aha:network')
+        svcfull = f'{svcname}.{ahanetw}'
         onetime = await aha.addAhaSvcProv(svcname, provinfo=provinfo)
 
-        if conf is None:
-            conf = {
-                'health:sysctl:checks': False,
-            }
-
+        conf = self.getCellConf(conf=conf)
         conf['aha:provision'] = onetime
 
-        logger.info(f'Adding {svcname}')
-
-        n = 1  # a simple svcname like "foo"
-        if len(svcname.split('.')) > 1:
-            n = 2  # A replica name like 00.foo
-        if provinfo and 'mirror' in provinfo:
-            n = 1  # A mirror like 01.foo with mirror: foo
-
-        waiter = aha.waiter(n, 'aha:svcadd')
-
-        if dirn:
+        waiter = aha.waiter(1, f'aha:svcadd:{svcfull}')
+        with self.mayTestDir(dirn) as dirn:
             s_common.yamlsave(conf, dirn, 'cell.yaml')
             async with await ctor.anit(dirn) as svc:
-                self.ge(len(await waiter.wait(timeout=12)), n)
+                self.true(await waiter.wait(timeout=12))
                 yield svc
-        else:
-            with self.getTestDir() as dirn:
-                s_common.yamlsave(conf, dirn, 'cell.yaml')
-                async with await ctor.anit(dirn) as svc:
-                    self.ge(len(await waiter.wait(timeout=12)), n)
-                    yield svc
 
     async def addSvcToCore(self, svc, core, svcname='svc'):
         '''
@@ -1592,7 +1554,7 @@ class SynTest(unittest.TestCase):
         return s_telepath.openurl(f'tcp:///{name}', **kwargs)
 
     @contextlib.contextmanager
-    def getTestDir(self, mirror=None, copyfrom=None, chdir=False, startdir=None):
+    def getTestDir(self, mirror=None, copyfrom=None, chdir=False, startdir=None) -> contextlib.AbstractContextManager[str, None, None]:
         '''
         Get a temporary directory for test purposes.
         This destroys the directory afterwards.
@@ -2058,6 +2020,7 @@ class SynTest(unittest.TestCase):
         Assert X is not None
         '''
         self.assertIsNotNone(x, msg=msg)
+        return x
 
     def none(self, x, msg=None):
         '''
@@ -2154,7 +2117,7 @@ class SynTest(unittest.TestCase):
             count += 1
         self.eq(x, count, msg=msg)
 
-    def stormIsInPrint(self, mesg, mesgs, deguid=False):
+    def stormIsInPrint(self, mesg, mesgs, deguid=False, whitespace=True):
         '''
         Check if a string is present in all of the print messages from a stream of storm messages.
 
@@ -2166,6 +2129,9 @@ class SynTest(unittest.TestCase):
             mesg = deguidify(mesg)
 
         print_str = '\n'.join([m[1].get('mesg') for m in mesgs if m[0] == 'print'])
+        if not whitespace:
+            mesg = ' '.join(mesg.split())
+            print_str = ' '.join(print_str.split())
 
         if deguid:
             print_str = deguidify(print_str)

synapse/tools/aha/clone.py

@@ -0,0 +1,50 @@
+import sys
+import asyncio
+import argparse
+
+import synapse.exc as s_exc
+import synapse.telepath as s_telepath
+
+import synapse.lib.output as s_output
+
+descr = '''
+Generate a new clone URL to deploy an AHA mirror.
+
+Examples:
+
+    python -m synapse.tools.aha.clone 01.aha.loop.vertex.link
+
+'''
+
+async def main(argv, outp=s_output.stdout):
+
+    pars = argparse.ArgumentParser(prog='synapse.tools.aha.clone', description=descr)
+    pars.add_argument('dnsname', help='The DNS name of the new AHA server.')
+    pars.add_argument('--port', type=int, default=27492, help='The port that the new AHA server should listen on.')
+    pars.add_argument('--url', default='cell:///vertex/storage', help='The telepath URL to connect to the AHA service.')
+    pars.add_argument('--only-url', help='Only output the URL upon successful execution',
+                      action='store_true', default=False)
+    opts = pars.parse_args(argv)
+
+    async with s_telepath.withTeleEnv():
+
+        try:
+            async with await s_telepath.openurl(opts.url) as aha:
+                curl = await aha.addAhaClone(opts.dnsname, port=opts.port)
+
+                if opts.only_url:
+                    outp.printf(curl)
+                else:
+                    outp.printf(f'one-time use URL: {curl}')
+                return 0
+
+        except Exception as e:
+            mesg = repr(e)
+            if isinstance(e, s_exc.SynErr):
+                mesg = e.errinfo.get('mesg', repr(e))
+
+            outp.printf(f'ERROR: {mesg}')
+            return 1
+
+if __name__ == '__main__':  # pragma: no cover
+    sys.exit(asyncio.run(main(sys.argv[1:])))

synapse/tools/aha/enroll.py

@@ -76,7 +76,8 @@ async def main(argv, outp=s_output.stdout):
                 if isinstance(ahaurls, str):
                     ahaurls = (ahaurls,)
 
-                ahaurls = set(s_telepath.modurl(ahaurls, user=ahauser))
+                certname = f'{ahauser}@{ahanetw}'
+                ahaurls = set(s_telepath.modurl(ahaurls, certname=certname))
                 servers = teleyaml.get('aha:servers')
 
                 # repack the servers so lists are tuplized like values

synapse/tools/backup.py

@@ -148,7 +148,7 @@ def txnbackup(lmdbinfo, srcdir, dstdir, skipdirs=None):
     logger.debug(f'Backup complete. Took [{tock-tick:.2f}] for [{srcdir}]')
     return
 
-def backup_lmdb(env, dstdir, txn=None):
+def backup_lmdb(env: lmdb.Environment, dstdir: str, txn=None):
 
     tick = time.time()
 
@@ -157,7 +157,7 @@ def backup_lmdb(env, dstdir, txn=None):
     env.copy(dstdir, compact=True, txn=txn)
 
     tock = time.time()
-    logger.info(f'backup took: {tock-tick:.2f} seconds')
+    logger.info(f'backup of: {env.path()} took: {tock-tick:.2f} seconds')
 
 def main(argv):
     args = parse_args(argv)

synapse/tools/changelog.py

@@ -466,6 +466,8 @@ async def gen(opts: argparse.Namespace,
 def _gen_model_rst(version, model_ref, changes, current_model, outp: s_output.OutPut, width=80) -> s_autodoc.RstHelp:
     rst = s_autodoc.RstHelp()
     rst.addHead(f'{version} Model Updates', link=f'.. _{model_ref}:')
+    rst.addLines(f'The following model updates were made during the ``{version}`` Synapse release.')
+
     if new_interfaces := changes.get('interfaces').get('new_interfaces'):
         rst.addHead('New Interfaces', lvl=1)
         for interface, info in new_interfaces.items():
@@ -849,7 +851,7 @@ async def format(opts: argparse.Namespace,
             if opts.verbose:
                 outp.printf(model_text)
             if opts.model_doc_dir:
-                fp = s_common.genpath(opts.model_doc_dir, f'model_update_{clean_vers_ref}.rst')
+                fp = s_common.genpath(opts.model_doc_dir, f'update_{clean_vers_ref}.rst')
                 with s_common.genfile(fp) as fd:
                     fd.truncate(0)
                     fd.write(model_text.encode())