pybridge: Implement cockpit-bridge --version

It was defined in argparse, but entirely ignored, so that it started the
protocol. Also add it to the manpage.

This also unbreaks the regular cockpit/ws container builds, as they use
--version to define the tag.

Add an integration test which exercises all non-protocol options.

Fixes #19233

doc/man/cockpit-bridge.xml

@@ -82,6 +82,12 @@
             available to the user running this command.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--version</option></term>
+        <listitem>
+          <para>Show Cockpit version information.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 

src/cockpit/bridge.py

@@ -31,6 +31,7 @@
 from cockpit._vendor.systemd_ctypes import bus, run_async
 
 from . import polyfills
+from ._version import __version__
 from .channel import ChannelRoutingRule
 from .channels import CHANNEL_TYPES
 from .config import Config, Environment
@@ -275,6 +276,9 @@ def main(*, beipack: bool = False) -> None:
     if args.packages:
         Packages().show()
         return
+    elif args.version:
+        print(f'Version: {__version__}\nProtocol: 1')
+        return
     elif args.bridges:
         print(json.dumps(Packages().get_bridge_configs(), indent=2))
         return

test/verify/check-connection

@@ -1173,6 +1173,22 @@ UnixPath=/run/cockpit/session
         b.wait_visible("#nav-system li:contains(Hackices)")
         self.assertFalse(b.is_present("#nav-system li:contains(Services)"))
 
+    def testBridgeCLI(self):
+        m = self.machine
+
+        out = m.execute("cockpit-bridge --help")
+        # this needs to work with both the C and Python bridges
+        self.assertRegex(out, r"[uU]sage:")
+        self.assertIn("--packages", out)
+
+        version = m.execute("cockpit-bridge --version")
+        self.assertIn("Protocol: 1", version)
+        self.assertRegex(version, r"Version: \d{3,}")
+
+        packages = m.execute("cockpit-bridge --packages")
+        self.assertRegex(packages, r"(^|\n)base1\s+.*/usr/share/cockpit/base1")
+        self.assertRegex(packages, r"(^|\n)system\s+.*/usr/share/cockpit/systemd")
+
 
 @testlib.skipDistroPackage()
 class TestReverseProxy(testlib.MachineCase):