From e589daa9c78a4e6b78180603cc338ea770f7fded Mon Sep 17 00:00:00 2001 From: Adam Daley Date: Thu, 5 Nov 2026 18:02:03 +0000 Subject: [PATCH] Use the v2 API namespace when publishing modules --- .github/scripts/test_publish_contract.py | 4 ++-- .github/workflows/publish.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/test_publish_contract.py b/.github/scripts/test_publish_contract.py index 1050688..237ad26 100644 --- a/.github/scripts/test_publish_contract.py +++ b/.github/scripts/test_publish_contract.py @@ -69,7 +69,7 @@ def run_submit(self, exists, replies, step="Submit revision (create or update)", print(json.dumps(response['body']) + '\\n' + str(response['code'])) ''') curl.chmod(0o755) - env = {**os.environ, "PATH": f"{root}:{os.environ['PATH']}", "API_BASE_URL": "https://api.example.test/extensions/v2", "API_TOKEN": "offline", "EXT_ID": "example", "REVISION_ID": "revision", "GITHUB_OUTPUT": str(root / "outputs")} + env = {**os.environ, "PATH": f"{root}:{os.environ['PATH']}", "API_BASE_URL": "https://api.example.test/v2", "API_TOKEN": "offline", "EXT_ID": "example", "REVISION_ID": "revision", "GITHUB_OUTPUT": str(root / "outputs")} if hostile_module and after_api: env.update({"HOSTILE_MODULE": hostile_module, "HOSTILE_SOURCE": hostile_source}) result = subprocess.run(["bash", "-e", "-o", "pipefail", "-c", workflow_run(step)], cwd=root, env=env, capture_output=True, text=True) @@ -131,7 +131,7 @@ def test_explicit_machine_approval_matches_the_merged_api(self): for code in [200, 403, 409]: result, calls, _ = self.run_submit(True, [{"method": "POST", "code": code, "body": {"result": {"status": "approved"}}}], step="Approve revision") self.assertEqual(result.returncode == 0, code == 200, result.stderr) - self.assertEqual(calls, ["POST https://api.example.test/extensions/v2/extensions/example/revisions/revision/approve?notify=false"]) + self.assertEqual(calls, ["POST https://api.example.test/v2/extensions/example/revisions/revision/approve?notify=false"]) def test_retries_preserve_update_method_and_payload(self): result, calls, _ = self.run_submit(True, [{"method": "PUT", "code": 429, "body": {}}, {"method": "PUT", "code": 202, "body": {"result": {"revision_id": "revision", "status": "pending"}}}]) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02bbbbc..4e82909 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ permissions: env: AUTH_TOKEN_URL: https://auth.fossbilling.net/oauth2/token - API_BASE_URL: https://api.fossbilling.net/extensions/v2 + API_BASE_URL: https://api.fossbilling.net/v2 API_AUDIENCE: https://api.fossbilling.net jobs: