misc: pass enable_ssh to EnvironmentConfig

Also add these arguments to `start` and `restart` commands

Author: morgan-dgk

composer_local_dev/cli.py

@@ -387,20 +387,24 @@ def create(
 @cli.command()
 @optional_environment
 @option_port
+@option_enable_ssh
+@option_ssh_port
 @verbose_mode
 @debug_mode
 @errors.catch_exceptions()
 def start(
     environment: Optional[str],
     web_server_port: Optional[int],
+    enable_ssh: Optional[bool],
+    ssh_port: Optional[int],
     verbose: bool,
     debug: bool,
 ):
     """Start Composer environment."""
     utils.setup_logging(verbose, debug)
     env_path = files.resolve_environment_path(environment)
     env = composer_environment.Environment.load_from_config(
-        env_path, web_server_port
+        env_path, web_server_port,enable_ssh,ssh_port
     )
     console.get_console().print(f"Starting {env.name} composer environment...")
     env.start()
@@ -427,12 +431,16 @@ def stop(environment: Optional[str], verbose: bool, debug: bool):
 @cli.command()
 @optional_environment
 @option_port
+@option_enable_ssh
+@option_ssh_port
 @verbose_mode
 @debug_mode
 @errors.catch_exceptions()
 def restart(
     environment: Optional[str],
     web_server_port: Optional[int],
+    enable_ssh: Optional[bool],
+    ssh_port: Optional[int],
     verbose: bool,
     debug: bool,
 ):
@@ -445,7 +453,7 @@ def restart(
     utils.setup_logging(verbose, debug)
     env_path = files.resolve_environment_path(environment)
     env = composer_environment.Environment.load_from_config(
-        env_path, web_server_port
+        env_path, web_server_port,enable_ssh,ssh_port
     )
     env.restart()
 

composer_local_dev/environment.py

@@ -362,6 +362,7 @@ def __init__(
         self,
         env_dir_path: pathlib.Path,
         port: Optional[int],
+        enable_ssh: Optional[bool] = None,
         ssh_port: Optional[int] = None,
     ):
         self.env_dir_path = env_dir_path
@@ -390,7 +391,11 @@ def __init__(
 
         # Backwards compatibility: don't fail on missing enable_ssh
         if "enable_ssh" in self.config:
-            self.enable_ssh = self.get_str_param("enable_ssh")
+            self.enable_ssh = (
+                enable_ssh
+                if enable_ssh is not None
+                else self.get_str_param("enable_ssh")
+            )
             self.ssh_port = (
                 ssh_port
                 if ssh_port is not None
@@ -574,10 +579,11 @@ def load_from_config(
         cls,
         env_dir_path: pathlib.Path,
         port: Optional[int],
+        enable_ssh: Optional[bool] = None,
         ssh_port: Optional[int] = None,
     ):
         """Create local environment using 'config.json' configuration file."""
-        config = EnvironmentConfig(env_dir_path, port, ssh_port)
+        config = EnvironmentConfig(env_dir_path, port, enable_ssh, ssh_port)
         environment_vars = load_environment_variables(env_dir_path)
         Environment.assert_valid_environment_configuration(
             config, environment_vars

tests/unit/test_cli.py

@@ -182,15 +182,15 @@ def mocked_resolve_env(self, env_path):
         ) as mock_check:
             yield mock_check
 
-    def assert_env_loaded(self, mocked_env, env_path, port=None):
-        mocked_env.load_from_config.assert_called_with(env_path, port)
+    def assert_env_loaded(self, mocked_env, env_path, port=None, enable_ssh=False, ssh_port=None):
+        mocked_env.load_from_config.assert_called_with(env_path, port, enable_ssh, ssh_port)
 
-    def assert_run_command(self, command, mocked_env, env_path, port=None):
+    def assert_run_command(self, command, mocked_env, env_path, port=None, enable_ssh=False, ssh_port=None):
         run_composer_and_assert_exit_code(
             command,
             exit_code=0,
         )
-        self.assert_env_loaded(mocked_env, env_path, port)
+        self.assert_env_loaded(mocked_env, env_path, port, enable_ssh, ssh_port)
 
     @pytest.mark.parametrize("command", ["start", "restart"])
     def test_start_command(