From 9e878d0d9abbfdda1db9e6156963177e82c7a4ef Mon Sep 17 00:00:00 2001 From: Ori Kotek Date: Sun, 27 Aug 2023 10:11:46 +0300 Subject: [PATCH] Bitbucket server --- pr_agent/servers/atlassian-connect.json | 2 +- pr_agent/servers/bitbucket_app.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pr_agent/servers/atlassian-connect.json b/pr_agent/servers/atlassian-connect.json index f976cf80..1ff50865 100644 --- a/pr_agent/servers/atlassian-connect.json +++ b/pr_agent/servers/atlassian-connect.json @@ -9,7 +9,7 @@ "authentication": { "type": "jwt" }, - "baseUrl": "https://53e2-212-199-118-78.ngrok-free.app", + "baseUrl": "base_url", "lifecycle": { "installed": "/installed", "uninstalled": "/uninstalled" diff --git a/pr_agent/servers/bitbucket_app.py b/pr_agent/servers/bitbucket_app.py index 69209b94..cc6491d4 100644 --- a/pr_agent/servers/bitbucket_app.py +++ b/pr_agent/servers/bitbucket_app.py @@ -54,9 +54,11 @@ async def get_bearer_token(shared_secret: str, client_key: str): @router.get("/") async def handle_manifest(request: Request, response: Response): - manifest = open("atlassian-connect.json", "rt").read() + cur_dir = os.path.dirname(os.path.abspath(__file__)) + manifest = open(os.path.join(cur_dir, "atlassian-connect.json"), "rt").read() try: manifest = manifest.replace("app_key", get_settings().bitbucket.app_key) + manifest = manifest.replace("base_url", get_settings().bitbucket.base_url) except: logging.error("Failed to replace api_key in Bitbucket manifest, trying to continue") manifest_obj = json.loads(manifest)