Merge branch 'master' into vetiver-testing

Author: bcwu

.github/workflows/main.yml

@@ -5,6 +5,8 @@ on:
     tags: ['*']
   pull_request:
     branches: [master]
+  workflow_dispatch:
+
 permissions:
   id-token: write
   contents: write
@@ -14,7 +16,7 @@ jobs:
       matrix:
         # TODO: work on windows-latest compatibility?
         os: [ubuntu-latest]
-        python-version: ['3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
         include:
         - os: macos-latest
           python-version: '3.9'
@@ -28,10 +30,8 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - run: pip install -r requirements.txt
     - run: pip freeze
-    - if: matrix.python-version > '3.5'
-      run: make fmt
-    - if: matrix.python-version >= '3.6'
-      run: make lint
+    - run: make fmt
+    - run: make lint
     - run: python setup.py --version
     - run: make test-${{ matrix.python-version }}
   prerelease-test:
@@ -89,10 +89,10 @@ jobs:
         asset_name: ${{ steps.create_dist.outputs.whl_basename }}
         asset_content_type: application/x-wheel+zip
     - uses: aws-actions/configure-aws-credentials@v1
+      id: creds
       with:
-        aws-access-key-id: ${{ secrets.AWS_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET }}
-        aws-region: us-east-1
+        role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+        aws-region: ${{ secrets.AWS_REGION }}
     - if: github.event_name == 'push' && github.ref == 'refs/heads/master'
       run: make sync-latest-to-s3
     - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
@@ -119,10 +119,10 @@ jobs:
         name: docs
         path: docs/site/
     - uses: aws-actions/configure-aws-credentials@v1
+      id: creds
       with:
-        aws-access-key-id: ${{ secrets.AWS_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET }}
-        aws-region: us-east-1
+        role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+        aws-region: ${{ secrets.AWS_REGION }}
     - if: github.event_name == 'push' && github.ref == 'refs/heads/master'
       run: make sync-latest-docs-to-s3
     - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

.github/workflows/snyk.yml

@@ -0,0 +1,30 @@
+name: snyk
+on:
+  schedule:
+    - cron: "0 10 * * 1" # Monday @ 10am UTC
+  workflow_dispatch:
+
+env:
+  SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+  SNYK_ORG: rstudio-connect
+  SNYK_PROJECT: rsconnect-python
+
+jobs:
+  python-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Run Snyk on dependencies
+        uses: snyk/actions/python@master
+        with:
+          command: monitor
+          args: --file=setup.py --print-deps --project-name=${{ env.SNYK_PROJECT }} --org=${{ env.SNYK_ORG }}
+  python-code:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Run Snyk static analysis
+        uses: snyk/actions/python@master
+        with:
+          command: code test
+          args: --project-name=${{ env.SNYK_PROJECT }} --org=${{ env.SNYK_ORG }} rsconnect/

CHANGELOG.md

@@ -4,6 +4,16 @@ 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).
 
+## [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.
+
+- Renamed the deploy_html `excludes` flag to `exclude` for consistency with other deploy commands.
+
 ## [1.12.1] - 2022-11-07
 
 ### Changed

CONTRIBUTING.md

@@ -5,7 +5,7 @@ tooling](https://packaging.python.org/guides/tool-recommendations/).
 
 To get started, you'll want to:
 - clone the repo into a project directory
-- setup a virtual 3.5+ python environment in the project directory
+- setup a virtual 3.7+ python environment in the project directory
 - activate that virtual environment
 - install the dependencies
 - validate your build environment with some sample commands

Makefile

@@ -37,10 +37,10 @@ SOURCE_DATE_EPOCH := $(shell date +%s)
 export SOURCE_DATE_EPOCH
 
 .PHONY: all-tests
-all-tests: all-images test-3.5 test-3.6 test-3.7 test-3.8 test-3.9 test-3.10
+all-tests: all-images test-3.7 test-3.8 test-3.9 test-3.10
 
 .PHONY: all-images
-all-images: image-3.5 image-3.6 image-3.7 image-3.8 image-3.9 image-3.10
+all-images: image-3.7 image-3.8 image-3.9 image-3.10
 
 image-%:
 	docker build -t rsconnect-python:$* --build-arg BASE_IMAGE=python:$*-slim .
@@ -64,9 +64,6 @@ mock-test-%: clean-stores
 fmt-%:
 	$(RUNNER) 'black .'
 
-.PHONY: fmt-3.5
-fmt-3.5: .fmt-unsupported
-
 .PHONY: .fmt-unsupported
 .fmt-unsupported:
 	@echo ERROR: This python version cannot run the fmting tools
@@ -85,9 +82,6 @@ lint-%:
 	$(RUNNER) 'flake8 tests/'
 	$(RUNNER) 'mypy -p rsconnect'
 
-.PHONY: lint-3.5
-lint-3.5: .lint-unsupported
-
 .PHONY: .lint-unsupported
 .lint-unsupported:
 	@echo ERROR: This python version cannot run the linting tools

README.md

@@ -2,9 +2,7 @@
 
 !!! warning
 
-    As of version 1.7.0, rsconnect-python requires Python version 3.5 or higher. Please see the
-    [official announcement](https://www.rstudio.com/blog/rstudio-connect-2021-08-python-updates/)
-    for details about this decision.
+    As of version 1.14.0, rsconnect-python requires Python version 3.7 or higher.
 
 This package provides a CLI (command-line interface) for interacting
 with and deploying to Posit Connect. This is also used by the

requirements.txt

@@ -1,4 +1,4 @@
-black==22.3.0; python_version >= '3.6'
+black==22.3.0
 click>=7.0.0
 coverage
 flake8
@@ -8,13 +8,12 @@ importlib-metadata
 ipykernel
 ipython
 jupyter_client
-mypy; python_version >= '3.6'
+mypy
 nbconvert
-pyjwt>=2.4.0; python_version >= '3.6'
-pyjwt; python_version < '3.6'
+pyjwt>=2.4.0
 pytest
 pytest-cov
-pytest-mypy; python_version >= '3.5'
+pytest-mypy
 semver>=2.0.0,<3.0.0
 setuptools_scm
 six>=1.14.0

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,12 +847,12 @@ 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:
                     raise RSConnectException("Unable to infer Connect client.")
-            if existing_app_mode and app_mode != existing_app_mode:
+            if existing_app_mode and existing_app_mode not in (None, AppModes.UNKNOWN, app_mode):
                 msg = (
                     "Deploying with mode '%s',\n"
                     + "but the existing deployment has mode '%s'.\n"
@@ -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
 
@@ -1216,17 +1216,6 @@ def prepare_deploy(
         bundle_size: int,
         bundle_hash: str,
     ):
-        accounts = self._rstudio_client.get_accounts()
-        self._server.handle_bad_response(accounts)
-        account = next(
-            filter(lambda acct: acct["name"] == self._server.account_name, accounts.json_data["accounts"]), None
-        )
-        # TODO: also check this during `add` command
-        if account is None:
-            raise RSConnectException(
-                "No account found by name : %s for given user credential" % self._server.account_name
-            )
-
         if app_id is None:
             project_application_id = os.getenv("LUCID_APPLICATION_ID")
             if project_application_id is not None:
@@ -1343,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
@@ -1552,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