remove validate_new_server_options in favor of validate_connection_options

Author: Matthew Lynch

rsconnect/api.py

@@ -385,14 +385,14 @@ def setup_remote_server(
         secret: str = None,
     ):
         validation.validate_connection_options(
-            name=name,
             url=url,
             api_key=api_key,
             insecure=insecure,
             cacert=cacert,
             account_name=account_name,
             token=token,
             secret=secret,
+            name=name,
         )
 
         if cacert and not ca_data:

rsconnect/main.py

@@ -303,12 +303,12 @@ def add(name, server, api_key, insecure, cacert, account, token, secret, verbose
 
     set_verbosity(verbose)
 
-    validation.validate_new_server_options(
+    validation.validate_connection_options(
         url=server,
         api_key=api_key,
         insecure=insecure,
         cacert=cacert,
-        account=account,
+        account_name=account,
         token=token,
         secret=secret,
     )

rsconnect/validation.py

@@ -7,11 +7,7 @@ def _get_present_options(options: typing.Dict[str, typing.Optional[str]]) -> typ
     return [k for k, v in options.items() if v]
 
 
-def validate_new_server_options(url, api_key, insecure, cacert, account, token, secret):
-    validate_connection_options(None, url, api_key, insecure, cacert, account, token, secret)
-
-
-def validate_connection_options(name, url, api_key, insecure, cacert, account_name, token, secret):
+def validate_connection_options(url, api_key, insecure, cacert, account_name, token, secret, name=None):
     """
     Validates provided Connect or shinyapps.io connection options and returns which target to use given the provided
     options.