Merge pull request fastapi#34 from fastapilabs/09-16-_store_app_id_instead_of_slug

♻️  Store app id instead of slug

Author: patrick91

src/fastapi_cli/commands/deploy.py

@@ -229,7 +229,11 @@ def _configure_app(
 
         progress.log(f"App created successfully! App slug: {app_data.slug}")
 
-    return write_app_config(path_to_deploy, slug=app_data.slug), app_data
+    app_config = AppConfig(app_id=app_data.id)
+
+    write_app_config(path_to_deploy, app_config)
+
+    return app_config, app_data
 
 
 def _wait_for_deployment(
@@ -318,11 +322,11 @@ def deploy(
                 toolkit, path_to_deploy=path_to_deploy
             )
         else:
-            toolkit.print(f"Deploying app [blue]{app_config.slug}[blue]...")
+            toolkit.print("Deploying app...")
             toolkit.print_line()
 
             with toolkit.progress("Checking app...", transient=True) as progress:
-                app_data = _get_app(app_config.slug)
+                app_data = _get_app(app_config.app_id)
 
                 if not app_data:
                     progress.set_error(
@@ -353,7 +357,7 @@ def deploy(
 
         check_deployment_url = (
             settings.base_frontend_url
-            + f"/apps/{app_config.slug}/deployments/{deployment.id}"
+            + f"/apps/{app_data.slug}/deployments/{deployment.id}"
         )
 
         if not skip_wait:

src/fastapi_cli/utils/apps.py

@@ -5,7 +5,7 @@
 
 
 class AppConfig(BaseModel):
-    slug: str
+    app_id: str
 
 
 def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
@@ -17,15 +17,11 @@ def get_app_config(path_to_deploy: Path) -> Optional[AppConfig]:
     return AppConfig.model_validate_json(config_path.read_text(encoding="utf-8"))
 
 
-def write_app_config(path_to_deploy: Path, slug: str) -> AppConfig:
+def write_app_config(path_to_deploy: Path, app_config: AppConfig) -> None:
     config_path = path_to_deploy / ".fastapi/cloud.json"
     config_path.parent.mkdir(parents=True, exist_ok=True)
 
-    app_config = AppConfig(slug=slug)
-
     config_path.write_text(
         app_config.model_dump_json(),
         encoding="utf-8",
     )
-
-    return app_config

tests/test_cli_deploy.py

@@ -346,9 +346,9 @@ def test_exists_successfully_when_deployment_is_done_when_app_is_configured(
     config_path = tmp_path / ".fastapi" / "cloud.json"
 
     config_path.parent.mkdir(parents=True, exist_ok=True)
-    config_path.write_text('{"slug": "demo"}')
+    config_path.write_text('{"app_id": "1234"}')
 
-    respx_mock.get("/apps/demo").mock(
+    respx_mock.get("/apps/1234").mock(
         return_value=Response(200, json={"slug": "demo", "id": "1234"})
     )
 
@@ -413,9 +413,9 @@ def test_shows_error_when_app_does_not_exist(
     config_path = tmp_path / ".fastapi" / "cloud.json"
 
     config_path.parent.mkdir(parents=True, exist_ok=True)
-    config_path.write_text('{"slug": "demo"}')
+    config_path.write_text('{"app_id": "some-random-id"}')
 
-    respx_mock.get("/apps/demo").mock(return_value=Response(404))
+    respx_mock.get("/apps/some-random-id").mock(return_value=Response(404))
 
     with changing_dir(tmp_path):
         result = runner.invoke(app, ["deploy"])