From 07cc7f9f42d5bfa9c8f9ef9a6e07acf423d09351 Mon Sep 17 00:00:00 2001 From: Abhishek Pratap Singh Date: Sun, 17 Aug 2025 00:33:25 +0900 Subject: [PATCH 1/2] Correct variable load correct variable from .secrets.toml --- pr_agent/servers/bitbucket_server_webhook.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pr_agent/servers/bitbucket_server_webhook.py b/pr_agent/servers/bitbucket_server_webhook.py index a38644f0..2e82660b 100644 --- a/pr_agent/servers/bitbucket_server_webhook.py +++ b/pr_agent/servers/bitbucket_server_webhook.py @@ -103,7 +103,7 @@ def should_process_pr_logic(data) -> bool: allowed_folders = get_settings().config.get("allow_only_specific_folders", []) if allowed_folders and pr_id and project_key and repo_slug: from pr_agent.git_providers.bitbucket_server_provider import BitbucketServerProvider - bitbucket_server_url = get_settings().get("BITBUCKET_SERVER.URL", "") + bitbucket_server_url = get_settings().get("BITBUCKET_SERVER.BASE_URL", "") pr_url = f"{bitbucket_server_url}/projects/{project_key}/repos/{repo_slug}/pull-requests/{pr_id}" provider = BitbucketServerProvider(pr_url=pr_url) changed_files = provider.get_files() @@ -146,7 +146,7 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request): pr_id = data["pullRequest"]["id"] repository_name = data["pullRequest"]["toRef"]["repository"]["slug"] project_name = data["pullRequest"]["toRef"]["repository"]["project"]["key"] - bitbucket_server = get_settings().get("BITBUCKET_SERVER.URL") + bitbucket_server = get_settings().get("BITBUCKET_SERVER.BASE_URL") pr_url = f"{bitbucket_server}/projects/{project_name}/repos/{repository_name}/pull-requests/{pr_id}" log_context["api_url"] = pr_url From a3217042f4c76fe7462b20923363ca9cf1dc9e17 Mon Sep 17 00:00:00 2001 From: Abhishek Pratap Singh Date: Sun, 17 Aug 2025 15:27:10 +0900 Subject: [PATCH 2/2] Change bitbucket sever url variable name in secrets template --- pr_agent/servers/bitbucket_server_webhook.py | 4 ++-- pr_agent/settings/.secrets_template.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pr_agent/servers/bitbucket_server_webhook.py b/pr_agent/servers/bitbucket_server_webhook.py index 2e82660b..a38644f0 100644 --- a/pr_agent/servers/bitbucket_server_webhook.py +++ b/pr_agent/servers/bitbucket_server_webhook.py @@ -103,7 +103,7 @@ def should_process_pr_logic(data) -> bool: allowed_folders = get_settings().config.get("allow_only_specific_folders", []) if allowed_folders and pr_id and project_key and repo_slug: from pr_agent.git_providers.bitbucket_server_provider import BitbucketServerProvider - bitbucket_server_url = get_settings().get("BITBUCKET_SERVER.BASE_URL", "") + bitbucket_server_url = get_settings().get("BITBUCKET_SERVER.URL", "") pr_url = f"{bitbucket_server_url}/projects/{project_key}/repos/{repo_slug}/pull-requests/{pr_id}" provider = BitbucketServerProvider(pr_url=pr_url) changed_files = provider.get_files() @@ -146,7 +146,7 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request): pr_id = data["pullRequest"]["id"] repository_name = data["pullRequest"]["toRef"]["repository"]["slug"] project_name = data["pullRequest"]["toRef"]["repository"]["project"]["key"] - bitbucket_server = get_settings().get("BITBUCKET_SERVER.BASE_URL") + bitbucket_server = get_settings().get("BITBUCKET_SERVER.URL") pr_url = f"{bitbucket_server}/projects/{project_name}/repos/{repository_name}/pull-requests/{pr_id}" log_context["api_url"] = pr_url diff --git a/pr_agent/settings/.secrets_template.toml b/pr_agent/settings/.secrets_template.toml index 4e7d156a..74c6e460 100644 --- a/pr_agent/settings/.secrets_template.toml +++ b/pr_agent/settings/.secrets_template.toml @@ -93,7 +93,7 @@ webhook_secret = "" # For Bitbucket app app_key = "" -base_url = "" +url = "" [azure_devops] # For Azure devops personal access token