diff --git a/src/fastapi_cloud_cli/utils/api.py b/src/fastapi_cloud_cli/utils/api.py index 5815a753..9bc90046 100644 --- a/src/fastapi_cloud_cli/utils/api.py +++ b/src/fastapi_cloud_cli/utils/api.py @@ -141,6 +141,7 @@ def wrapper(*args: P.args, **kwargs: P.kwargs) -> Generator[T, None, None]: class DeploymentStatus(str, Enum): waiting_upload = "waiting_upload" + upload_cancelled = "upload_cancelled" ready_for_build = "ready_for_build" building = "building" extracting = "extracting" @@ -153,24 +154,27 @@ class DeploymentStatus(str, Enum): verifying_failed = "verifying_failed" verifying_skipped = "verifying_skipped" success = "success" + expired = "expired" failed = "failed" @classmethod def to_human_readable(cls, status: "DeploymentStatus") -> str: return { - cls.waiting_upload: "Waiting for upload", - cls.ready_for_build: "Ready for build", + cls.waiting_upload: "Awaiting Upload", + cls.upload_cancelled: "Upload Cancelled", + cls.ready_for_build: "Build Queued", cls.building: "Building", - cls.extracting: "Extracting", - cls.extracting_failed: "Extracting failed", - cls.building_image: "Building image", - cls.building_image_failed: "Build failed", - cls.deploying: "Deploying", - cls.deploying_failed: "Deploying failed", - cls.verifying: "Verifying", - cls.verifying_failed: "Verifying failed", - cls.verifying_skipped: "Verification skipped", - cls.success: "Success", + cls.extracting: "Extracting Upload", + cls.extracting_failed: "Extraction Failed", + cls.building_image: "Building Image", + cls.building_image_failed: "Build Failed", + cls.deploying: "Deploying Image", + cls.deploying_failed: "Deployment Failed", + cls.verifying: "Verifying Readiness", + cls.verifying_failed: "Verification Failed", + cls.verifying_skipped: "Verification Skipped", + cls.success: "Ready", + cls.expired: "Expired", cls.failed: "Failed", }[status] diff --git a/tests/test_cli_deploy.py b/tests/test_cli_deploy.py index dae8ca99..0cf7f45b 100644 --- a/tests/test_cli_deploy.py +++ b/tests/test_cli_deploy.py @@ -1916,7 +1916,7 @@ def test_verification_failure_after_build_complete( assert result.exit_code == 1 assert "Deployment failed" in result.output - assert "Verifying failed" in result.output + assert "Verification Failed" in result.output assert deployment_data["dashboard_url"] in result.output diff --git a/tests/test_deploy_utils.py b/tests/test_deploy_utils.py index 4c966ec5..893a40b2 100644 --- a/tests/test_deploy_utils.py +++ b/tests/test_deploy_utils.py @@ -58,19 +58,20 @@ def test_includes_paths(path: Path) -> None: @pytest.mark.parametrize( "status,expected", [ - (DeploymentStatus.waiting_upload, "Waiting for upload"), - (DeploymentStatus.ready_for_build, "Ready for build"), + (DeploymentStatus.waiting_upload, "Awaiting Upload"), + (DeploymentStatus.ready_for_build, "Build Queued"), (DeploymentStatus.building, "Building"), - (DeploymentStatus.extracting, "Extracting"), - (DeploymentStatus.extracting_failed, "Extracting failed"), - (DeploymentStatus.building_image, "Building image"), - (DeploymentStatus.building_image_failed, "Build failed"), - (DeploymentStatus.deploying, "Deploying"), - (DeploymentStatus.deploying_failed, "Deploying failed"), - (DeploymentStatus.verifying, "Verifying"), - (DeploymentStatus.verifying_failed, "Verifying failed"), - (DeploymentStatus.verifying_skipped, "Verification skipped"), - (DeploymentStatus.success, "Success"), + (DeploymentStatus.extracting, "Extracting Upload"), + (DeploymentStatus.extracting_failed, "Extraction Failed"), + (DeploymentStatus.building_image, "Building Image"), + (DeploymentStatus.building_image_failed, "Build Failed"), + (DeploymentStatus.deploying, "Deploying Image"), + (DeploymentStatus.deploying_failed, "Deployment Failed"), + (DeploymentStatus.verifying, "Verifying Readiness"), + (DeploymentStatus.verifying_failed, "Verification Failed"), + (DeploymentStatus.verifying_skipped, "Verification Skipped"), + (DeploymentStatus.success, "Ready"), + (DeploymentStatus.expired, "Expired"), (DeploymentStatus.failed, "Failed"), ], )