Skip to content

Commit d16f19d

Browse files
feat/update confluence connector (#424)
1 parent 24263df commit d16f19d

File tree

6 files changed

+266
-101
lines changed

6 files changed

+266
-101
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.5.15-dev0
2+
3+
### Fixes
4+
5+
* **Separate password and api_token for Confluence connector**
6+
17
## 0.5.14
28

39
### Fixes

test/integration/connectors/test_confluence.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async def test_confluence_source(temp_dir):
3030
spaces = ["testteamsp", "MFS"]
3131

3232
# Create connection and indexer configurations
33-
access_config = ConfluenceAccessConfig(password=api_token)
33+
access_config = ConfluenceAccessConfig(api_token=api_token)
3434
connection_config = ConfluenceConnectionConfig(
3535
url=confluence_url,
3636
username=user_email,
@@ -77,7 +77,7 @@ async def test_confluence_source_large(temp_dir):
7777
spaces = ["testteamsp1"]
7878

7979
# Create connection and indexer configurations
80-
access_config = ConfluenceAccessConfig(password=api_token)
80+
access_config = ConfluenceAccessConfig(api_token=api_token)
8181
connection_config = ConfluenceConnectionConfig(
8282
url=confluence_url,
8383
username=user_email,

test/unit/v2/connectors/test_confluence.py

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,54 @@ def test_connection_config_multiple_auth():
1111
with pytest.raises(ValidationError):
1212
ConfluenceConnectionConfig(
1313
access_config=ConfluenceAccessConfig(
14-
password="api_token",
14+
password="password",
1515
token="access_token",
1616
),
1717
username="user_email",
1818
url="url",
1919
)
2020

2121

22+
def test_connection_config_multiple_auth2():
23+
with pytest.raises(ValidationError):
24+
ConfluenceConnectionConfig(
25+
access_config=ConfluenceAccessConfig(
26+
api_token="api_token",
27+
token="access_token",
28+
),
29+
username="user_email",
30+
url="url",
31+
)
32+
33+
34+
def test_connection_config_multiple_auth3():
35+
with pytest.raises(ValidationError):
36+
ConfluenceConnectionConfig(
37+
access_config=ConfluenceAccessConfig(
38+
api_token="api_token",
39+
password="password",
40+
),
41+
username="user_email",
42+
url="url",
43+
)
44+
45+
2246
def test_connection_config_no_auth():
2347
with pytest.raises(ValidationError):
2448
ConfluenceConnectionConfig(access_config=ConfluenceAccessConfig(), url="url")
2549

2650

27-
def test_connection_config_basic_auth():
51+
def test_connection_config_password_auth():
52+
ConfluenceConnectionConfig(
53+
access_config=ConfluenceAccessConfig(password="password"),
54+
url="url",
55+
username="user_email",
56+
)
57+
58+
59+
def test_connection_config_api_token_auth():
2860
ConfluenceConnectionConfig(
29-
access_config=ConfluenceAccessConfig(password="api_token"),
61+
access_config=ConfluenceAccessConfig(api_token="api_token"),
3062
url="url",
3163
username="user_email",
3264
)

0 commit comments

Comments
 (0)