diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7300be4..1d87ab1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -226,10 +226,10 @@ jobs: python3 - <<'PY' import json, os from pathlib import Path - deployment = json.loads((Path(os.environ['RUNNER_TEMP']) / 'deployment.json').read_text())['deployment'] - assert deployment['readyState'] == 'READY' + from tools.prepare_vercel import deployment_url + response = json.loads((Path(os.environ['RUNNER_TEMP']) / 'deployment.json').read_text()) with open(os.environ['GITHUB_OUTPUT'], 'a') as output: - output.write('url=' + deployment['url'] + '\n') + output.write('url=' + deployment_url(response) + '\n') PY - name: Install hosted browser test runtime diff --git a/tools/prepare_vercel.py b/tools/prepare_vercel.py index e4eb75da..72708535 100644 --- a/tools/prepare_vercel.py +++ b/tools/prepare_vercel.py @@ -12,6 +12,17 @@ ROOT = Path(__file__).resolve().parent.parent +def deployment_url(response): + """Accept Vercel's agent envelope and ordinary --json deployment response.""" + deployment = response.get('deployment', response) + if not isinstance(deployment, dict) or deployment.get('readyState') != 'READY': + raise ValueError('Vercel did not return a ready deployment') + url = deployment.get('url') + if not isinstance(url, str) or not url.startswith('https://') or any(c.isspace() for c in url): + raise ValueError('Vercel did not return a valid HTTPS deployment URL') + return url + + def prepare(repository, run_id, commit, output): token = os.environ.get('GH_TOKEN') or os.environ.get('GITHUB_TOKEN') if not token: diff --git a/tools/test_vercel_deploy.py b/tools/test_vercel_deploy.py index a238826e..34cc0c8b 100644 --- a/tools/test_vercel_deploy.py +++ b/tools/test_vercel_deploy.py @@ -16,6 +16,20 @@ class VercelDeployTest(unittest.TestCase): + def test_cli_response_accepts_flat_ci_and_wrapped_agent_modes(self): + deployment = {'url': 'https://farlanding-example.vercel.app', 'readyState': 'READY'} + for response in [deployment, {'status': 'ok', 'deployment': deployment}]: + with self.subTest(response=response): + self.assertEqual(prepare_vercel.deployment_url(response), deployment['url']) + + def test_cli_response_rejects_unready_or_invalid_deployments(self): + for response in [{}, {'readyState': 'BUILDING', 'url': 'https://example.vercel.app'}, + {'deployment': None}, {'readyState': 'READY'}, + {'readyState': 'READY', 'url': 'http://example.vercel.app'}, + {'readyState': 'READY', 'url': 'https://example.vercel.app\nother=value'}]: + with self.subTest(response=response), self.assertRaises(ValueError): + prepare_vercel.deployment_url(response) + def test_preparation_persists_identity_not_expiring_urls_or_tokens(self): metadata = {'artifacts': [{'id': 42, 'name': f'farlanding-web-{COMMIT}', 'expired': False, 'workflow_run': {'id': 99}, 'digest': 'sha256:' + 'a' * 64}]}