Skip to content

Ingest: Confluence source connector - separate auth parameters for API token and personal access token #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

Ingest: Confluence source connector - separate auth parameters for API token and personal access token #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions snippets/general-shared-text/confluence-cli-api.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ The following environment variables:
- `CONFLUENCE_URL` - The target Confluence site's URL, represented by `--url` (CLI) or `url` (Python).
- One of the following:

- For API token authentication: `CONFLUENCE_USERNAME` and `CONFLUENCE_TOKEN` - The name or email address,and API token of the target Confluence user, represented by `--username` (CLI) or `username` (Python) and `--token` (CLI) or `token` (Python), respectively.
- For personal access token (PAT) authentication: `CONFLUENCE_TOKEN` - The PAT for the target Confluence user, represented by `--token` (CLI) or `token` (Python).
- For API token authentication: `CONFLUENCE_USERNAME` and `CONFLUENCE_API_TOKEN` - The name or email address, and API token of the target Confluence user, represented by `--username` (CLI) or `username` (Python) and `--api-token` (CLI) or `api-token` (Python), respectively.
- For personal access token (PAT) authentication: `CONFLUENCE_PERSONAL_ACCESS_TOKEN` - The PAT for the target Confluence user, represented by `--token` (CLI) or `token` (Python).
- For password authentication: `CONFLUENCE_USERNAME` and `CONFLUENCE_PASSWORD` - The name or email address, and password of the target Confluence user, represented by `--username` (CLI) or `username` (Python) and `--password` (CLI) or `password` (Python), respectively.

Additional settings include:
Expand Down
4 changes: 2 additions & 2 deletions snippets/source_connectors/confluence.sh.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# For API token authentication:
unstructured-ingest \
confluence \
--token $CONFLUENCE_TOKEN \
--api-token $CONFLUENCE_API_TOKEN \
--url $CONFLUENCE_URL \
--username $CONFLUENCE_USERNAME \
--cloud \
Expand All @@ -24,7 +24,7 @@ unstructured-ingest \
# For personal access token (PAT) authentication:
unstructured-ingest \
confluence \
--token $CONFLUENCE_TOKEN \
--token $CONFLUENCE_PERSONAL_ACCESS_TOKEN \
--url $CONFLUENCE_URL \
--spaces luke,paul \
--max-num-of-spaces 500 \
Expand Down
4 changes: 2 additions & 2 deletions snippets/source_connectors/confluence.v2.py.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if __name__ == "__main__":
# For API token authentication:
source_connection_config=ConfluenceConnectionConfig(
access_config=ConfluenceAccessConfig(
token=os.getenv("CONFLUENCE_TOKEN")
api_token=os.getenv("CONFLUENCE_API_TOKEN")
),
url=os.getenv("CONFLUENCE_URL"),
username=os.getenv("CONFLUENCE_USERNAME"),
Expand All @@ -46,7 +46,7 @@ if __name__ == "__main__":
# For personal access token (PAT) authentication:
# source_connection_config=ConfluenceConnectionConfig(
# access_config=ConfluenceAccessConfig(
# token=os.getenv("CONFLUENCE_TOKEN")
# token=os.getenv("CONFLUENCE_PERSON_ACCESS_TOKEN")
# ),
# url=os.getenv("CONFLUENCE_URL")
# ),
Expand Down