Merge branch 'master' into github-actions-ci

Author: dethmasque

CHANGELOG.md

@@ -4,11 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.13.0] - 2022-12-02
+
+### Added
+- When running rsconnect bootstrap, you can now specify the jwt secret using the CONNECT_BOOTSTRAP_SECRETKEY environment variable. 
 
 ### Changed
+- Update pip_freeze to use `pip freeze` since Connect filters for valid package paths in the backend and it no longer depends on the undocumented behavior of `pip list --format=freeze`. This reverts the change made in 1.5.2.
 
-Update pip_freeze to use `pip freeze` since Connect filters for valid package paths in the backend and it no longer depends on the undocumented behavior of `pip list --format=freeze`. This reverts the change made in 1.5.2.
+- Renamed the deploy_html `excludes` flag to `exclude` for consistency with other deploy commands.
 
 ## [1.12.1] - 2022-11-07
 

rsconnect/actions.py

@@ -225,8 +225,8 @@ def test_server(connect_server):
     raise RSConnectException("\n".join(failures))
 
 
-def test_rstudio_server(server: api.RStudioServer):
-    with api.RStudioClient(server) as client:
+def test_rstudio_server(server: api.PositServer):
+    with api.PositClient(server) as client:
         try:
             result = client.get_current_user()
             server.handle_bad_response(result)

rsconnect/api.py

@@ -64,9 +64,9 @@ def handle_bad_response(self, response):
                     )
 
 
-class RStudioServer(AbstractRemoteServer):
+class PositServer(AbstractRemoteServer):
     """
-    A class used to represent the server of the shinyapps.io and RStudio Cloud APIs.
+    A class used to represent the server of the shinyapps.io and Posit Cloud APIs.
     """
 
     def __init__(self, remote_name: str, url: str, account_name: str, token: str, secret: str):
@@ -76,7 +76,7 @@ def __init__(self, remote_name: str, url: str, account_name: str, token: str, se
         self.secret = secret
 
 
-class ShinyappsServer(RStudioServer):
+class ShinyappsServer(PositServer):
     """
     A class to encapsulate the information needed to interact with an
     instance of the shinyapps.io server.
@@ -89,16 +89,16 @@ def __init__(self, url: str, account_name: str, token: str, secret: str):
         super().__init__(remote_name=remote_name, url=url, account_name=account_name, token=token, secret=secret)
 
 
-class CloudServer(RStudioServer):
+class CloudServer(PositServer):
     """
     A class to encapsulate the information needed to interact with an
-    instance of the RStudio Cloud server.
+    instance of the Posit Cloud server.
     """
 
     def __init__(self, url: str, account_name: str, token: str, secret: str):
-        remote_name = "RStudio Cloud"
-        if url == "rstudio.cloud" or url is None:
-            url = "https://api.rstudio.cloud"
+        remote_name = "Posit Cloud"
+        if url in {"posit.cloud", "rstudio.cloud", None}:
+            url = "https://api.posit.cloud"
         super().__init__(remote_name=remote_name, url=url, account_name=account_name, token=token, secret=secret)
 
 
@@ -475,7 +475,7 @@ def setup_remote_server(
         if api_key:
             self.remote_server = RSConnectServer(url, api_key, insecure, ca_data)
         elif token and secret:
-            if url and "rstudio.cloud" in url:
+            if url and ("rstudio.cloud" in url or "posit.cloud" in url):
                 self.remote_server = CloudServer(url, account_name, token, secret)
             else:
                 self.remote_server = ShinyappsServer(url, account_name, token, secret)
@@ -485,8 +485,8 @@ def setup_remote_server(
     def setup_client(self, cookies=None, timeout=30, **kwargs):
         if isinstance(self.remote_server, RSConnectServer):
             self.client = RSConnectClient(self.remote_server, cookies, timeout)
-        elif isinstance(self.remote_server, RStudioServer):
-            self.client = RStudioClient(self.remote_server, timeout)
+        elif isinstance(self.remote_server, PositServer):
+            self.client = PositClient(self.remote_server, timeout)
         else:
             raise RSConnectException("Unable to infer Connect client.")
 
@@ -515,7 +515,7 @@ def validate_server(
     ):
         if (url and api_key) or isinstance(self.remote_server, RSConnectServer):
             self.validate_connect_server(name, url, api_key, insecure, cacert, api_key_is_required)
-        elif (url and token and secret) or isinstance(self.remote_server, RStudioServer):
+        elif (url and token and secret) or isinstance(self.remote_server, PositServer):
             self.validate_rstudio_server(url, account_name, token, secret)
         else:
             raise RSConnectException("Unable to validate server from information provided.")
@@ -596,11 +596,11 @@ def validate_rstudio_server(
         secret = secret or self.remote_server.secret
         server = (
             CloudServer(url, account_name, token, secret)
-            if "rstudio.cloud" in url
+            if "rstudio.cloud" in url or "posit.cloud" in url
             else ShinyappsServer(url, account_name, token, secret)
         )
 
-        with RStudioClient(server) as client:
+        with PositClient(server) as client:
             try:
                 result = client.get_current_user()
                 server.handle_bad_response(result)
@@ -657,7 +657,7 @@ def check_server_capabilities(self, capability_functions):
         :param details_source: the source for obtaining server details, gather_server_details(),
         by default.
         """
-        if isinstance(self.remote_server, RStudioServer):
+        if isinstance(self.remote_server, PositServer):
             return self
 
         details = self.server_details
@@ -847,7 +847,7 @@ def validate_app_mode(self, *args, **kwargs):
                 if isinstance(self.remote_server, RSConnectServer):
                     app = get_app_info(self.remote_server, app_id)
                     existing_app_mode = AppModes.get_by_ordinal(app.get("app_mode", 0), True)
-                elif isinstance(self.remote_server, RStudioServer):
+                elif isinstance(self.remote_server, PositServer):
                     app = get_rstudio_app_info(self.remote_server, app_id)
                     existing_app_mode = AppModes.get_by_cloud_name(app.json_data["mode"])
                 else:
@@ -1008,14 +1008,14 @@ def __init__(
         self.output_id = output_id
 
 
-class RStudioClient(HTTPServer):
+class PositClient(HTTPServer):
     """
-    An HTTP client to call the RStudio Cloud and shinyapps.io APIs.
+    An HTTP client to call the Posit Cloud and shinyapps.io APIs.
     """
 
     _TERMINAL_STATUSES = {"success", "failed", "error"}
 
-    def __init__(self, rstudio_server: RStudioServer, timeout: int = 30):
+    def __init__(self, rstudio_server: PositServer, timeout: int = 30):
         self._token = rstudio_server.token
         try:
             self._key = base64.b64decode(rstudio_server.secret)
@@ -1156,7 +1156,7 @@ class ShinyappsService:
     Encapsulates operations involving multiple API calls to shinyapps.io.
     """
 
-    def __init__(self, rstudio_client: RStudioClient, server: ShinyappsServer):
+    def __init__(self, rstudio_client: PositClient, server: ShinyappsServer):
         self._rstudio_client = rstudio_client
         self._server = server
 
@@ -1202,10 +1202,10 @@ def do_deploy(self, bundle_id, app_id):
 
 class CloudService:
     """
-    Encapsulates operations involving multiple API calls to RStudio Cloud.
+    Encapsulates operations involving multiple API calls to Posit Cloud.
     """
 
-    def __init__(self, rstudio_client: RStudioClient, server: CloudServer):
+    def __init__(self, rstudio_client: PositClient, server: CloudServer):
         self._rstudio_client = rstudio_client
         self._server = server
 
@@ -1332,7 +1332,7 @@ def get_app_info(connect_server, app_id):
 
 
 def get_rstudio_app_info(server, app_id):
-    with RStudioClient(server) as client:
+    with PositClient(server) as client:
         result = client.get_application(app_id)
         server.handle_bad_response(result)
         return result
@@ -1541,7 +1541,7 @@ def find_unique_name(remote_server: TargetableServer, name: str):
             mapping_function=lambda client, app: app["name"],
         )
     elif isinstance(remote_server, ShinyappsServer):
-        client = RStudioClient(remote_server)
+        client = PositClient(remote_server)
         existing_names = client.get_applications_like_name(name)
     else:
         # non-unique names are permitted in cloud

rsconnect/bundle.py

@@ -190,8 +190,8 @@ def write_manifest(
     nb_name: str,
     environment: Environment,
     output_dir: str,
-    hide_all_input: bool,
-    hide_tagged_input: bool,
+    hide_all_input: bool = False,
+    hide_tagged_input: bool = False,
     image: str = None,
 ) -> typing.Tuple[list, list]:
     """Create a manifest for source publishing the specified notebook.

rsconnect/main.py

@@ -152,13 +152,13 @@ def rstudio_args(func):
         "--token",
         "-T",
         envvar=["SHINYAPPS_TOKEN", "RSCLOUD_TOKEN"],
-        help="The shinyapps.io/RStudio Cloud token.",
+        help="The shinyapps.io/Posit Cloud token.",
     )
     @click.option(
         "--secret",
         "-S",
         envvar=["SHINYAPPS_SECRET", "RSCLOUD_SECRET"],
-        help="The shinyapps.io/RStudio Cloud token secret.",
+        help="The shinyapps.io/Posit Cloud token secret.",
     )
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
@@ -245,8 +245,9 @@ def cli(future):
     certificate file to use for TLS.  The last two items are only relevant if the
     URL specifies the "https" protocol.
 
-    For RStudio Cloud and shinyapps.io, the information needed to connect includes
-    the account, auth token, auth secret, and server ('rstudio.cloud' or 'shinyapps.io').
+    For Posit Cloud, the information needed to connect includes the auth token, auth
+    secret, and server ('posit.cloud'). For shinyapps.io, the auth token, auth secret,
+    server ('shinyapps.io'), and account are needed.
     """
     global future_enabled
     future_enabled = future
@@ -284,7 +285,7 @@ def _test_server_and_api(server, api_key, insecure, ca_cert):
     return real_server, me
 
 
-def _test_rstudio_creds(server: api.RStudioServer):
+def _test_rstudio_creds(server: api.PositServer):
     with cli_feedback("Checking {} credential".format(server.remote_name)):
         test_rstudio_server(server)
 
@@ -433,7 +434,7 @@ def add(ctx, name, server, api_key, insecure, cacert, account, token, secret, ve
     old_server = server_store.get_by_name(name)
 
     if token:
-        if server and "rstudio.cloud" in server:
+        if server and ("rstudio.cloud" in server or "posit.cloud" in server):
             real_server = api.CloudServer(server, account, token, secret)
         else:
             real_server = api.ShinyappsServer(server, account, token, secret)
@@ -1040,7 +1041,6 @@ def deploy_quarto(
 )
 @click.option(
     "--exclude",
-    "--excludes",
     "-x",
     multiple=True,
     help=(
@@ -1061,7 +1061,7 @@ def deploy_html(
     path: str = None,
     entrypoint: str = None,
     extra_files=None,
-    excludes=None,
+    exclude=None,
     title: str = None,
     env_vars: typing.Dict[str, str] = None,
     verbose: bool = False,
@@ -1089,7 +1089,7 @@ def deploy_html(
             path,
             entrypoint,
             extra_files,
-            excludes,
+            exclude,
         )
         .deploy_bundle()
         .save_deployed_info()

rsconnect/validation.py

@@ -35,15 +35,15 @@ def validate_connection_options(url, api_key, insecure, cacert, account_name, to
 
     if present_connect_options and present_shinyapps_options:
         raise RSConnectException(
-            "Connect options ({}) may not be passed alongside shinyapps.io or RStudio Cloud options ({}).".format(
+            "Connect options ({}) may not be passed alongside shinyapps.io or Posit Cloud options ({}).".format(
                 ", ".join(present_connect_options), ", ".join(present_shinyapps_options)
             )
         )
 
-    if url and 'rstudio.cloud' in url:
+    if url and ('posit.cloud' in url or 'rstudio.cloud' in url):
         if len(present_cloud_options) != len(cloud_options):
             raise RSConnectException(
-                "-T/--token and -S/--secret must be provided for RStudio Cloud."
+                "-T/--token and -S/--secret must be provided for Posit Cloud."
             )
     elif present_shinyapps_options:
         if len(present_shinyapps_options) != len(shinyapps_options):