Merge branch 'master' into bcwu-1.14.1

Author: bcwu

.github/pull_request_template.md

@@ -29,7 +29,5 @@
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply: -->
 <!--- If you need clarification on any of these, feel free to ask. We're here to help! -->
-- [ ] I have read the **CONTRIBUTING** document.
-- [ ] My code follows the code style of this project.
-- [ ] I have updated the documentation as needed.
-- [ ] I have added tests to cover my changes.
+- [ ] I have added tests to cover my changes.
+- [ ] I have updated [CHANGELOG.md](../CHANGELOG.md) to cover notable changes.

rsconnect/api.py

@@ -236,7 +236,10 @@ def deploy(self, app_id, app_name, app_title, title_is_default, tarball, env_var
             # assume app exists. if it was deleted then Connect will
             # raise an error
             app = self.app_get(app_id)
-            self._server.handle_bad_response(app)
+            try:
+                self._server.handle_bad_response(app)
+            except RSConnectException as e:
+                raise RSConnectException(f"{e} Try setting the --new flag to overwrite the previous deployment.")
 
         app_guid = app["guid"]
         if env_vars:
@@ -845,11 +848,21 @@ def validate_app_mode(self, *args, **kwargs):
                 # Don't read app metadata if app-id is specified. Instead, we need
                 # to get this from the remote.
                 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)
+                    try:
+                        app = get_app_info(self.remote_server, app_id)
+                        existing_app_mode = AppModes.get_by_ordinal(app.get("app_mode", 0), True)
+                    except RSConnectException as e:
+                        raise RSConnectException(
+                            f"{e} Try setting the --new flag to overwrite the previous deployment."
+                        )
                 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"])
+                    try:
+                        app = get_rstudio_app_info(self.remote_server, app_id)
+                        existing_app_mode = AppModes.get_by_cloud_name(app.json_data["mode"])
+                    except RSConnectException as e:
+                        raise RSConnectException(
+                            f"{e} Try setting the --new flag to overwrite the previous deployment."
+                        )
                 else:
                     raise RSConnectException("Unable to infer Connect client.")
             if existing_app_mode and existing_app_mode not in (None, AppModes.UNKNOWN, app_mode):

tests/test_api.py

@@ -1,4 +1,7 @@
 from unittest import TestCase
+from unittest.mock import Mock, patch
+
+from rsconnect.exception import RSConnectException
 from .utils import (
     require_api_key,
     require_connect,
@@ -73,3 +76,15 @@ def test_connect_authorization_header(self):
         none_connect_server = RSConnectServer("http://test-server", None)
         none_connect_client = RSConnectClient(none_connect_server)
         self.assertEqual(none_connect_client.get_authorization(), None)
+
+
+class RSConnectClientTestCase(TestCase):
+    def test_deploy_existing_application_with_failure(self):
+        with patch.object(RSConnectClient, "__init__", lambda _, server, cookies, timeout: None):
+            client = RSConnectClient(Mock(), Mock(), Mock())
+            client.app_get = Mock(return_value=Mock())
+            client._server = Mock(spec=RSConnectServer)
+            client._server.handle_bad_response = Mock(side_effect=RSConnectException(""))
+            app_id = Mock()
+            with self.assertRaises(RSConnectException):
+                client.deploy(app_id, app_name=None, app_title=None, title_is_default=None, tarball=None)