Merge pull request fastapi#38 from fastapilabs/09-17-_always_fetch_app_and_team_fix_dashboard_url

♻️  Always fetch app and team, fix dashboard url

Author: patrick91

src/fastapi_cli/commands/deploy.py

@@ -6,7 +6,7 @@
 from enum import Enum
 from itertools import cycle
 from pathlib import Path
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Union
 
 import rignore
 import typer
@@ -163,6 +163,16 @@ def _get_apps(team_slug: str) -> List[AppResponse]:
     return [AppResponse.model_validate(app) for app in data]
 
 
+def _get_team(team_id: str) -> Team:
+    with APIClient() as client:
+        response = client.get(f"/teams/{team_id}")
+        response.raise_for_status()
+
+        data = response.json()
+
+    return Team.model_validate(data)
+
+
 class DeploymentResponse(BaseModel):
     id: str
     app_id: str
@@ -202,9 +212,7 @@ def _get_deployment(app_id: str, deployment_id: str) -> DeploymentResponse:
 ]
 
 
-def _configure_app(
-    toolkit: RichToolkit, path_to_deploy: Path
-) -> Tuple[AppConfig, AppResponse]:
+def _configure_app(toolkit: RichToolkit, path_to_deploy: Path) -> AppConfig:
     if not toolkit.confirm(f"Setup and deploy [blue]{path_to_deploy}[/]?", tag="dir"):
         raise typer.Exit(0)
 
@@ -271,7 +279,7 @@ def _configure_app(
 
     write_app_config(path_to_deploy, app_config)
 
-    return app_config, app
+    return app_config
 
 
 def _wait_for_deployment(
@@ -348,33 +356,31 @@ def deploy(
         path_to_deploy = path or Path.cwd()
 
         app_config = get_app_config(path_to_deploy)
-        app_data: Optional[AppResponse] = None
 
         if not app_config:
-            app_config, app_data = _configure_app(
-                toolkit, path_to_deploy=path_to_deploy
-            )
+            app_config = _configure_app(toolkit, path_to_deploy=path_to_deploy)
         else:
             toolkit.print("Deploying app...")
             toolkit.print_line()
 
-            with toolkit.progress("Checking app...", transient=True) as progress:
-                app_data = _get_app(app_config.app_id)
+        with toolkit.progress("Checking app...", transient=True) as progress:
+            app = _get_app(app_config.app_id)
+            team = _get_team(app_config.team_id)
 
-                if not app_data:
-                    progress.set_error(
-                        "App not found. Make sure you're logged in the correct account."
-                    )
+            if not app:
+                progress.set_error(
+                    "App not found. Make sure you're logged in the correct account."
+                )
 
-                    raise typer.Exit(1)
+                raise typer.Exit(1)
 
         toolkit.print_line()
 
         archive_path = archive(path or Path.cwd())  # noqa: F841
 
         with toolkit.progress(title="Creating deployment") as progress:
             with handle_http_errors(progress):
-                deployment = _create_deployment(app_data.id)
+                deployment = _create_deployment(app.id)
 
                 progress.log(
                     f"Deployment created successfully! Deployment slug: {deployment.slug}"
@@ -390,13 +396,11 @@ def deploy(
 
         check_deployment_url = (
             settings.base_frontend_url
-            + f"/apps/{app_data.slug}/deployments/{deployment.id}"
+            + f"/{team.slug}/apps/{app.slug}/deployments/{deployment.id}"
         )
 
         if not skip_wait:
-            _wait_for_deployment(
-                toolkit, app_data.id, deployment.id, check_deployment_url
-            )
+            _wait_for_deployment(toolkit, app.id, deployment.id, check_deployment_url)
         else:
             toolkit.print(
                 f"Check the status of your deployment at [link]{check_deployment_url}[/link]"

tests/test_cli_deploy.py

@@ -247,6 +247,21 @@ def test_creates_and_uploads_deployment_then_fails(
         )
     )
 
+    respx_mock.get("/apps/1234").mock(
+        return_value=Response(200, json={"slug": "demo", "id": "1234"})
+    )
+
+    respx_mock.get("/teams/123").mock(
+        return_value=Response(
+            200,
+            json={
+                "name": "team1",
+                "slug": "team1",
+                "id": "123",
+            },
+        )
+    )
+
     respx_mock.post(
         "/apps/1234/deployments/",
     ).mock(
@@ -326,6 +341,21 @@ def test_exists_successfully_when_deployment_is_done(
         )
     )
 
+    respx_mock.get("/apps/1234").mock(
+        return_value=Response(200, json={"slug": "demo", "id": "1234"})
+    )
+
+    respx_mock.get("/teams/123").mock(
+        return_value=Response(
+            200,
+            json={
+                "name": "team1",
+                "slug": "team1",
+                "id": "123",
+            },
+        )
+    )
+
     respx_mock.post(
         "/apps/1234/deployments/",
     ).mock(
@@ -395,6 +425,19 @@ def test_exists_successfully_when_deployment_is_done_when_app_is_configured(
         return_value=Response(200, json={"slug": "demo", "id": "1234"})
     )
 
+    respx_mock.get(
+        "/teams/123",
+    ).mock(
+        return_value=Response(
+            200,
+            json={
+                "name": "team1",
+                "slug": "team1",
+                "id": "123",
+            },
+        )
+    )
+
     respx_mock.post(
         "/apps/1234/deployments/",
     ).mock(
@@ -459,6 +502,16 @@ def test_shows_error_when_app_does_not_exist(
     config_path.write_text('{"app_id": "some-random-id", "team_id": "123"}')
 
     respx_mock.get("/apps/some-random-id").mock(return_value=Response(404))
+    respx_mock.get("/teams/123").mock(
+        return_value=Response(
+            200,
+            json={
+                "name": "team1",
+                "slug": "team1",
+                "id": "123",
+            },
+        )
+    )
 
     with changing_dir(tmp_path):
         result = runner.invoke(app, ["deploy"])
@@ -468,6 +521,26 @@ def test_shows_error_when_app_does_not_exist(
         assert "App not found" in result.output
 
 
+@pytest.mark.respx(base_url=settings.base_api_url)
+def test_returns_error_when_team_not_found(
+    logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
+) -> None:
+    config_path = tmp_path / ".fastapi" / "cloud.json"
+
+    config_path.parent.mkdir(parents=True, exist_ok=True)
+    config_path.write_text('{"app_id": "1234", "team_id": "some-random-id"}')
+
+    respx_mock.get("/apps/1234").mock(
+        return_value=Response(200, json={"slug": "demo", "id": "1234"})
+    )
+    respx_mock.get("/teams/some-random-id").mock(return_value=Response(404))
+
+    with changing_dir(tmp_path):
+        result = runner.invoke(app, ["deploy"])
+
+        assert result.exit_code == 1
+
+
 @pytest.mark.respx(base_url=settings.base_api_url)
 def test_can_skip_waiting(
     logged_in_cli: None, tmp_path: Path, respx_mock: respx.MockRouter
@@ -491,6 +564,20 @@ def test_can_skip_waiting(
         )
     )
 
+    respx_mock.get("/apps/1234").mock(
+        return_value=Response(200, json={"slug": "demo", "id": "1234"})
+    )
+    respx_mock.get("/teams/123").mock(
+        return_value=Response(
+            200,
+            json={
+                "name": "team1",
+                "slug": "team1",
+                "id": "123",
+            },
+        )
+    )
+
     respx_mock.post(
         "/apps/1234/deployments/",
     ).mock(