Improve clarity on suggested URL for user when deploying a draft (#682)

Author: amol-

rsconnect/api.py

@@ -573,7 +573,7 @@ def deploy(
         # http://ADDRESS/preview/APP_GUID/BUNDLE_ID
         # Using replace makes this a bit more robust to changes in the URL structure
         # like connect being served on a subpath.
-        preview_url = app["url"].replace("/content/", "/preview/") + f"/{app_bundle['id']}"
+        preview_url = app["url"].replace("/content/", "/preview/").rstrip("/") + f"/{app_bundle['id']}"
 
         return {
             "task_id": task["task_id"],
@@ -1131,14 +1131,16 @@ def emit_task_log(
                 raise_on_error,
             )
             log_lines = self.remote_server.handle_bad_response(log_lines)
-            app_config = self.client.app_config(self.deployed_info["app_id"])
-            app_config = self.remote_server.handle_bad_response(app_config)
-            app_dashboard_url = app_config.get("config_url")
+
             log_callback.info("Deployment completed successfully.")
-            log_callback.info("\t Dashboard content URL: %s", app_dashboard_url)
-            log_callback.info(
-                "\t Direct content URL: %s", self.deployed_info["preview_url"] or self.deployed_info["app_url"]
-            )
+            if self.deployed_info.get("preview_url"):
+                log_callback.info("\t Preview content URL: %s", self.deployed_info["preview_url"])
+            else:
+                app_config = self.client.app_config(self.deployed_info["app_id"])
+                app_config = self.remote_server.handle_bad_response(app_config)
+                app_dashboard_url = app_config.get("config_url")
+                log_callback.info("\t Dashboard content URL: %s", app_dashboard_url)
+                log_callback.info("\t Direct content URL: %s", self.deployed_info["app_url"])
 
         return self
 

tests/test_main.py

@@ -252,7 +252,7 @@ def post_application_deploy_callback(request, uri, response_headers):
                 assert "Direct content URL: http://fake_server/content/1234-5678-9012-3456" in caplog.text
             else:
                 assert (
-                    "Direct content URL: http://fake_server/preview/1234-5678-9012-3456/FAKE_BUNDLE_ID" in caplog.text
+                    "Preview content URL: http://fake_server/preview/1234-5678-9012-3456/FAKE_BUNDLE_ID" in caplog.text
                 )
         finally:
             if original_api_key_value: