Skip to content

Commit 2ab5869

Browse files
committed
Confluence: remove extra try catch
1 parent 9c70389 commit 2ab5869

3 files changed

Lines changed: 22 additions & 24 deletions

File tree

atlassian/compass/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ def upload_package_dependencies_lock_file(
6161

6262
def delete_package_dependencies(self, component_id, source_id):
6363
"""Delete package dependencies for a component and source."""
64-
path = self.url_joiner(
65-
self.api_root, f"compass/v1/package_dependencies/lock_file/{component_id}/{source_id}"
66-
)
64+
path = self.url_joiner(self.api_root, f"compass/v1/package_dependencies/lock_file/{component_id}/{source_id}")
6765
return self.delete(path)
6866

6967
def get_forge_app_attachment(self, component_id, forge_app_id, key, not_json_response=True):

atlassian/confluence/cloud/cloud.py

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,7 @@ def get_page_by_id(
157157
if expand:
158158
params["expand"] = ",".join(expand)
159159

160-
try:
161-
return self.get(endpoint, params=params)
162-
except Exception as e:
163-
log.error(f"Failed to retrieve page with ID {page_id}: {e}")
164-
raise
160+
return self.get(endpoint, params=params)
165161

166162
def get_pages(
167163
self,
@@ -444,11 +440,7 @@ def create_page(
444440
if parent_id:
445441
data["parentId"] = parent_id
446442

447-
try:
448-
return self.post(endpoint, data=data)
449-
except Exception as e:
450-
log.error(f"Failed to create page: {e}")
451-
raise
443+
return self.post(endpoint, data=data)
452444

453445
def update_page(
454446
self,
@@ -503,12 +495,8 @@ def update_page(
503495

504496
# First, get the current page to get its version
505497
if version is None:
506-
try:
507-
current_page = self.get_page_by_id(page_id, get_body=False)
508-
version = current_page.get("version", {}).get("number", 1)
509-
except Exception as e:
510-
log.error(f"Failed to retrieve page for update: {e}")
511-
raise
498+
current_page = self.get_page_by_id(page_id, get_body=False)
499+
version = current_page.get("version", {}).get("number", 1)
512500

513501
# Prepare update data
514502
data = {
@@ -528,11 +516,7 @@ def update_page(
528516
if representation:
529517
data["body"][body_format]["representation"] = representation
530518

531-
try:
532-
return self.put(endpoint, data=data)
533-
except Exception as e:
534-
log.error(f"Failed to update page: {e}")
535-
raise
519+
return self.put(endpoint, data=data)
536520

537521
def delete_page(self, page_id: str) -> bool:
538522
"""

tests/confluence/test_confluence_cloud.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
"""
55

66
import pytest
7+
import logging
78
from unittest.mock import patch
89

910
from atlassian.confluence import ConfluenceCloud
11+
from atlassian.confluence.cloud.cloud import ConfluenceCloud as ConfluenceCloudV2
1012
from atlassian.errors import ApiError
1113

1214

@@ -26,6 +28,20 @@ def test_init_defaults(self):
2628
assert confluence.api_root == "wiki/api/v2"
2729
assert confluence.cloud is True
2830

31+
@patch.object(ConfluenceCloudV2, "get_page_by_id")
32+
@patch.object(ConfluenceCloudV2, "put")
33+
def test_update_page_does_not_log_and_swallow_api_errors(self, mock_put, mock_get_page, caplog):
34+
confluence_cloud = ConfluenceCloudV2("https://test.atlassian.net", token="test-token")
35+
mock_get_page.return_value = {"version": {"number": 3}}
36+
error = RuntimeError("update failed")
37+
mock_put.side_effect = error
38+
39+
with caplog.at_level(logging.ERROR, logger="atlassian.confluence.cloud.cloud"):
40+
with pytest.raises(RuntimeError, match="update failed"):
41+
confluence_cloud.update_page("123", title="Updated")
42+
43+
assert not caplog.records
44+
2945
def test_init_custom_values(self):
3046
"""Test ConfluenceCloud client initialization with custom values."""
3147
confluence = ConfluenceCloud(

0 commit comments

Comments
 (0)