Merge branch 'deploy-shiny-without-add' into shinyapps

Author: bcwu

rsconnect/actions.py

@@ -967,6 +967,7 @@ def deploy_python_shiny(
         log_callback,
     )
 
+
 def deploy_dash_app(
     connect_server: api.RSConnectServer,
     directory: str,
@@ -1540,6 +1541,7 @@ def gatherer(
 gather_basic_deployment_info_for_bokeh = _generate_gather_basic_deployment_info_for_python(AppModes.BOKEH_APP)
 gather_basic_deployment_info_for_shiny = _generate_gather_basic_deployment_info_for_python(AppModes.PYTHON_SHINY)
 
+
 def _gather_basic_deployment_info_for_framework(
     remote_server: api.TargetableServer,
     app_store: AppStore,

rsconnect/main.py

@@ -133,6 +133,40 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
+def shinyapps_args(func):
+    @click.option(
+        "--account",
+        "-A",
+        envvar="SHINYAPPS_ACCOUNT",
+        help="The shinyapps.io account name.",
+    )
+    @click.option(
+        "--token",
+        "-T",
+        envvar="SHINYAPPS_TOKEN",
+        help="The shinyapps.io token.",
+    )
+    @click.option(
+        "--secret",
+        "-S",
+        envvar="SHINYAPPS_SECRET",
+        help="The shinyapps.io token secret.",
+    )
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
+def _passthrough(func):
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 def validate_env_vars(ctx, param, all_values):
     vars = {}
 
@@ -280,24 +314,7 @@ def _test_shinyappsio_creds(server: api.ShinyappsServer):
     type=click.File(),
     help="The path to trusted TLS CA certificates.",
 )
-@click.option(
-    "--account",
-    "-a",
-    envvar="SHINYAPPS_ACCOUNT",
-    help="The shinyapps.io account name.",
-)
-@click.option(
-    "--token",
-    "-T",
-    envvar="SHINYAPPS_TOKEN",
-    help="The shinyapps.io token.",
-)
-@click.option(
-    "--secret",
-    "-S",
-    envvar="SHINYAPPS_SECRET",
-    help="The shinyapps.io token secret.",
-)
+@shinyapps_args
 @click.option("--verbose", "-v", is_flag=True, help="Print detailed messages.")
 def add(name, server, api_key, insecure, cacert, account, token, secret, verbose):
 
@@ -728,24 +745,7 @@ def deploy_notebook(
 )
 @server_args
 @content_args
-@click.option(
-    "--account",
-    "-a",
-    envvar="SHINYAPPS_ACCOUNT",
-    help="The shinyapps.io account name.",
-)
-@click.option(
-    "--token",
-    "-T",
-    envvar="SHINYAPPS_TOKEN",
-    help="The shinyapps.io token.",
-)
-@click.option(
-    "--secret",
-    "-S",
-    envvar="SHINYAPPS_SECRET",
-    help="The shinyapps.io token secret.",
-)
+@shinyapps_args
 @click.argument("file", type=click.Path(exists=True, dir_okay=True, file_okay=True))
 @cli_exception_handler
 def deploy_manifest(
@@ -984,7 +984,9 @@ def deploy_html(
     )
 
 
-def generate_deploy_python(app_mode, alias, min_version):
+def generate_deploy_python(app_mode, alias, min_version, supported_by_shinyapps=False):
+    shinyapps = shinyapps_args if supported_by_shinyapps else _passthrough
+
     # noinspection SpellCheckingInspection
     @deploy.command(
         name=alias,
@@ -998,6 +1000,7 @@ def generate_deploy_python(app_mode, alias, min_version):
     )
     @server_args
     @content_args
+    @shinyapps
     @click.option(
         "--entrypoint",
         "-e",
@@ -1056,6 +1059,9 @@ def deploy_app(
         api_key: str,
         insecure: bool,
         cacert: typing.IO,
+        account: str,
+        token: str,
+        secret: str,
         entrypoint,
         exclude,
         new: bool,
@@ -1110,7 +1116,9 @@ def deploy_app(
 deploy_dash_app = generate_deploy_python(app_mode=AppModes.DASH_APP, alias="dash", min_version="1.8.2")
 deploy_streamlit_app = generate_deploy_python(app_mode=AppModes.STREAMLIT_APP, alias="streamlit", min_version="1.8.4")
 deploy_bokeh_app = generate_deploy_python(app_mode=AppModes.BOKEH_APP, alias="bokeh", min_version="1.8.4")
-deploy_shiny = generate_deploy_python(app_mode=AppModes.PYTHON_SHINY, alias="shiny", min_version="2022.07.0")
+deploy_shiny = generate_deploy_python(
+    app_mode=AppModes.PYTHON_SHINY, alias="shiny", min_version="2022.07.0", supported_by_shinyapps=True
+)
 
 
 @deploy.command(

rsconnect/validation.py

@@ -13,7 +13,7 @@ def validate_connection_options(url, api_key, insecure, cacert, account_name, to
     options.
     """
     connect_options = {"-k/--api-key": api_key, "-i/--insecure": insecure, "-c/--cacert": cacert}
-    shinyapps_options = {"-T/--token": token, "-S/--secret": secret, "-a/--account": account_name}
+    shinyapps_options = {"-T/--token": token, "-S/--secret": secret, "-A/--account": account_name}
     options_mutually_exclusive_with_name = {"-s/--server": url, **connect_options, **shinyapps_options}
     present_options_mutually_exclusive_with_name = _get_present_options(options_mutually_exclusive_with_name)
 
@@ -25,7 +25,7 @@ def validate_connection_options(url, api_key, insecure, cacert, account_name, to
         )
     if not name and not url and not shinyapps_options:
         raise RSConnectException(
-            "You must specify one of -n/--name OR -s/--server OR -a/--account, -T/--token, -S/--secret."
+            "You must specify one of -n/--name OR -s/--server OR -A/--account, -T/--token, -S/--secret."
         )
 
     present_connect_options = _get_present_options(connect_options)
@@ -40,4 +40,4 @@ def validate_connection_options(url, api_key, insecure, cacert, account_name, to
 
     if present_shinyapps_options:
         if len(present_shinyapps_options) != 3:
-            raise RSConnectException("-a/--account, -T/--token, and -S/--secret must all be provided for shinyapps.io.")
+            raise RSConnectException("-A/--account, -T/--token, and -S/--secret must all be provided for shinyapps.io.")

tests/test_main.py

@@ -333,7 +333,7 @@ def test_add_shinyapps_missing_options(self):
             self.assertEqual(result.exit_code, 1, result.output)
             self.assertEqual(
                 str(result.exception),
-                "-a/--account, -T/--token, and -S/--secret must all be provided for shinyapps.io.",
+                "-A/--account, -T/--token, and -S/--secret must all be provided for shinyapps.io.",
             )
         finally:
             if original_api_key_value: