Fix Click 8.2.0 compatibility issues

- Handle MultiCommand missing command error in service connect
- Fix test inputs for confirmation prompts
- Remove deprecated parameter. Looks like this option is the new default
  behavior

Author: jstvz

cumulusci/cli/service.py

@@ -83,6 +83,25 @@ def list_commands(self, ctx):
         services = self._get_services_config(runtime)
         return sorted(services.keys())
 
+    def invoke(self, ctx):
+        """Override to show available services instead of 'Missing command' error"""
+        try:
+            return super().invoke(ctx)
+        except click.UsageError as e:
+            if "Missing command" in str(e):
+                # No subcommand provided - list available services
+                services = self.list_commands(ctx)
+                if services:
+                    click.echo("Available services:")
+                    for service in services:
+                        click.echo(f"  {service}")
+                else:
+                    click.echo("No services available to configure.")
+                return
+            else:
+                # Re-raise other usage errors
+                raise
+
     def _build_param(self, attribute: str, details: dict) -> click.Option:
         required = details.get("required", False)
         default_factory: Optional[Callable] = self._get_callable_default(
@@ -267,6 +286,7 @@ def callback(*args, **kwargs):
     cls=ConnectServiceCommand,
     name="connect",
     help="Connect an external service to CumulusCI",
+    no_args_is_help=False,
 )
 def service_connect():
     pass

cumulusci/cli/tests/test_service.py

@@ -106,9 +106,10 @@ def test_service_connect__attr_with_default_value():
     # but input of an empty line accepts the default.
     assert "attr (example) [PRESET]: " in result.output
     service_config = runtime.keychain.get_service("test", "test-alias")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "PRESET"
         assert service_config.attr == "PRESET"
 
@@ -132,9 +133,10 @@ def test_service_connect__attr_with_default_factory():
 
     # The service should have the attribute value returned by the default factory.
     service_config = runtime.keychain.get_service("test", "test-alias")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "CALCULATED"
         assert service_config.attr == "CALCULATED"
 
@@ -155,13 +157,14 @@ def test_service_connect__alias_already_exists():
         "test-type",
         "already-exists",
         runtime=runtime,
-        input="new\ny\n",
+        input="new\ny\nn\n",
     )
 
     service_config = runtime.keychain.get_service("test-type", "already-exists")
-    with mock.patch(
-        "cumulusci.core.config.base_config.STRICT_GETATTR", False
-    ), pytest.warns(DeprecationWarning, match="attr"):
+    with (
+        mock.patch("cumulusci.core.config.base_config.STRICT_GETATTR", False),
+        pytest.warns(DeprecationWarning, match="attr"),
+    ):
         assert service_config.lookup("attr") == "new"
         assert service_config.attr == "new"
 
@@ -536,7 +539,7 @@ def test_service_connect__connected_app():
         "connect",
         "connected_app",
         "new",
-        input="\n\nID\nSECRET\n",
+        input="\n\nID\nSECRET\nn\n",
         runtime=runtime,
     )
 
@@ -559,7 +562,7 @@ def test_service_connect__connected_app__with_cli_options():
         "new",
         "--login_url",
         "https://custom",
-        input="\nID\nSECRET\n",  # not prompted for login_url
+        input="\nID\nSECRET\nn\n",  # not prompted for login_url
         runtime=runtime,
     )
 

cumulusci/cli/tests/utils.py

@@ -17,7 +17,7 @@ def run_click_command(cmd, *args, **kw):
 
 def run_cli_command(*args, runtime=None, input=None, **kw):
     """Run a click command with arg parsing and injected CCI runtime object."""
-    runner = CliRunner(mix_stderr=False)
+    runner = CliRunner()
     result = runner.invoke(
         cli,
         args,

cumulusci/tests/test_integration_infrastructure.py

@@ -35,13 +35,15 @@ def _capture_orgid_using_task():
 
 class TestIntegrationInfrastructure:
     "Test our two plugins for doing integration testing"
+
     remembered_cli_specified_org_id = None
 
     @pytest.mark.vcr()
     def test_prepare_for__test_integration_tests(
         self, create_task, run_code_without_recording
     ):
         "Delete a VCR Cassette to ensure next test creates it."
+
         # only delete the cassette if we can replace it
         def delete_cassette():
             if first_cassette.exists():
@@ -81,7 +83,7 @@ def setup():
 
         run_code_without_recording(setup)
 
-    def test_file_was_not_created(self, capture_orgid_using_task):
+    def test_file_was_not_created(self):
         filename = (
             Path(__file__).parent
             / "cassettes/TestIntegrationInfrastructure.test_run_code_without_recording.yaml"