@@ -64,15 +64,6 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
6464 if cli_args .table :
6565 cli_args .format = 'table'
6666
67- if cli_args .deprecated_ssl is not None :
68- click .secho (
69- "Warning: The --ssl/--no-ssl CLI options are deprecated and will be removed in a future release. "
70- "Please use the \" default_ssl_mode\" config option or --ssl-mode CLI flag instead. "
71- f"See issue { ISSUES_URL } /1507" ,
72- err = True ,
73- fg = "yellow" ,
74- )
75-
7667 # ssh_port and ssh_config_path have truthy defaults and are not included
7768 if (
7869 any ([
@@ -223,25 +214,12 @@ def run_from_cli_args(cli_args: 'CliArgs', client_factory: ClientFactory) -> Non
223214 keepalive_ticks = cli_args .keepalive_ticks if cli_args .keepalive_ticks is not None else mycli .default_keepalive_ticks
224215 ssl_mode = cli_args .ssl_mode or mycli .ssl_mode
225216
226- # if there is a mismatch between the ssl_mode value and other sources of ssl config, show a warning
227- # specifically using "is False" to not pickup the case where cli_args.deprecated_ssl is None (not set by the user)
228- if cli_args .deprecated_ssl and ssl_mode == "off" or cli_args .deprecated_ssl is False and ssl_mode in ("auto" , "on" ):
229- click .secho (
230- f"Warning: The current ssl_mode value of '{ ssl_mode } ' is overriding the value provided by "
231- f"either the --ssl/--no-ssl CLI options or a DSN URI parameter (ssl={ cli_args .deprecated_ssl } )." ,
232- err = True ,
233- fg = "yellow" ,
234- )
235-
236- # configure SSL if ssl_mode is auto/on or if
237- # cli_args.deprecated_ssl = True (from --ssl or a DSN URI) and ssl_mode is None
238- if ssl_mode in ("auto" , "on" ) or (cli_args .deprecated_ssl and ssl_mode is None ):
217+ if ssl_mode in ("auto" , "on" ):
239218 if cli_args .socket and ssl_mode == 'auto' :
240219 ssl = None
241220 else :
242221 ssl = {
243222 "mode" : ssl_mode ,
244- "enable" : cli_args .deprecated_ssl , # todo: why is this set at all?
245223 "ca" : cli_args .ssl_ca and os .path .expanduser (cli_args .ssl_ca ),
246224 "cert" : cli_args .ssl_cert and os .path .expanduser (cli_args .ssl_cert ),
247225 "key" : cli_args .ssl_key and os .path .expanduser (cli_args .ssl_key ),
0 commit comments