Skip to content
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.

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

[Integration][Jira] Adds teams kind #1227

Merged
merged 124 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
3b24b06
feat(jira): Add get paginated users method
shariff-6 Dec 3, 2024
9037a53
Add users kind synchronization
shariff-6 Dec 3, 2024
5c92ba5
Adds user kind and relation to issue
shariff-6 Dec 3, 2024
c1c5ba2
Update version for jira
shariff-6 Dec 3, 2024
5230ec2
Fixes lint
shariff-6 Dec 3, 2024
a384af8
Adds new line at EOF
shariff-6 Dec 3, 2024
5fc0b8d
Removes accountId property
shariff-6 Dec 3, 2024
890d180
Renamed _get_paginated_users to _get_users_data
shariff-6 Dec 3, 2024
c28c60b
Fixes Lint
shariff-6 Dec 3, 2024
b0452c6
Update integrations/jira/CHANGELOG.md
shariff-6 Dec 3, 2024
35c967b
Merge branch 'main' into PORT-11704-Jira-enhancements
PeyGis Dec 3, 2024
232295a
Add user-related webhook events and handling for Jira integration
shariff-6 Dec 3, 2024
1c68475
Merge branch 'PORT-11704-Jira-enhancements' of https://github.com/por…
shariff-6 Dec 3, 2024
9e1823e
Adds get_single_user function
shariff-6 Dec 3, 2024
bcc9ee7
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 3, 2024
ff2e7fc
Fixes lint
shariff-6 Dec 3, 2024
247fd84
Rearranged mapping, set jiraUser to be created before jiraIssue
shariff-6 Dec 4, 2024
af30be6
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 4, 2024
8a6dcfa
Updates changelog version
shariff-6 Dec 4, 2024
7d59c4d
Refactor Jira webhook handler to process user, project, and issue events
shariff-6 Dec 4, 2024
7b8ee04
Add check for missing webhook event
shariff-6 Dec 4, 2024
b029918
- Replaced multiple if-elif conditions with a match statement to hand…
shariff-6 Dec 4, 2024
81e5380
Fixes lint
shariff-6 Dec 4, 2024
79e914e
Corrects log message placement
shariff-6 Dec 4, 2024
df7a584
feat: add support for team synchronization in Jira integration
shariff-6 Dec 11, 2024
49045b5
chore: update Jira integration spec to support teams and organisation ID
shariff-6 Dec 11, 2024
541a091
Refactor Jira client for enhanced API handling and pagination
shariff-6 Dec 11, 2024
95c6085
Add Jira Team blueprint and enhance relations in blueprints.json
shariff-6 Dec 11, 2024
697ff11
Add team integration to port-app-config.yaml
shariff-6 Dec 11, 2024
7ebd886
Adds unit tests
shariff-6 Dec 11, 2024
d1b5ee7
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 11, 2024
f25feee
Fixes lint
shariff-6 Dec 12, 2024
e21d1fe
Refactor: Centralize Jira client initialization
shariff-6 Dec 12, 2024
025a4eb
Removes team relation from user kind
shariff-6 Dec 12, 2024
7a08a78
Removes redundant test
shariff-6 Dec 12, 2024
c909004
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 12, 2024
6f59a80
Updates Changelog
shariff-6 Dec 12, 2024
96ca242
Updates orgId description
shariff-6 Dec 12, 2024
6b1dd47
Adds type hints to tests
shariff-6 Dec 12, 2024
76ecac9
improve: Add type hints and error handling in Jira client
shariff-6 Dec 12, 2024
1b7418c
Removes displayName property, and teamRelation
shariff-6 Dec 12, 2024
52ce5c4
refactor(jira): improve client type safety and method signatures
shariff-6 Dec 12, 2024
82781a4
fix(jira): add missing org_id parameters to team and user handlers
shariff-6 Dec 12, 2024
0c8a9dd
fix(jira-tests): update test cases to pass required org_id parameter
shariff-6 Dec 12, 2024
d35f2a6
feat(test): updates paginated issues test to simpler approach
shariff-6 Dec 13, 2024
b8a4e02
feat: update user-team mapping to support multiple teams
shariff-6 Dec 13, 2024
b98db1e
Removes unused imports, and updates fuction to use PAGE_SIZE variab;e
shariff-6 Dec 13, 2024
b34c2e3
Merge branch 'main' into PORT-11704-Jira-enhancements
PeyGis Dec 13, 2024
047be0a
fixes lint
shariff-6 Dec 13, 2024
ad92951
Merge branch 'PORT-11704-Jira-enhancements' of https://github.com/por…
shariff-6 Dec 13, 2024
7fbc532
refactor(jira): enrich teams with members and reuse cursor-based pagi…
shariff-6 Dec 16, 2024
260543f
refactor(jira): remove user enrichment with teams
shariff-6 Dec 16, 2024
e978ad3
feat(jira): add team member relations mapping
shariff-6 Dec 16, 2024
f1d5c37
feat(jira): add team selector with member inclusion flag
shariff-6 Dec 16, 2024
841694f
test(jira): update team tests and remove user mapping test
shariff-6 Dec 16, 2024
9e861d4
fix: improve team members pagination test
shariff-6 Dec 16, 2024
d14f909
Merge branch 'main' into PORT-11704-Jira-enhancements
PeyGis Dec 16, 2024
6178e18
Update integrations/jira/.port/resources/blueprints.json
shariff-6 Dec 16, 2024
6783ee1
refactor(jira): move resource config handling to main.py
shariff-6 Dec 16, 2024
001d2b2
Merge branch 'PORT-11704-Jira-enhancements' of https://github.com/por…
shariff-6 Dec 16, 2024
41bf641
refactor(jira): simplify client test after moving resource config to …
shariff-6 Dec 16, 2024
3117b95
Removes unused imports
shariff-6 Dec 16, 2024
49352e6
Remove unused import
shariff-6 Dec 16, 2024
559aac6
Removes unused imports
shariff-6 Dec 17, 2024
5349751
Fixes lint
shariff-6 Dec 17, 2024
d99e672
refactor(jira): optimize team member fetching and add rate limiting
shariff-6 Dec 17, 2024
80e2764
Resets page size to 50
shariff-6 Dec 17, 2024
94492dc
refactor: move teams enrichment logic to main.py
shariff-6 Dec 17, 2024
6c0430a
Merge branch 'main' into PORT-11704-Jira-enhancements
PeyGis Dec 17, 2024
2260a8a
- Remove redundant webhook event type logging
shariff-6 Dec 18, 2024
f302b98
Merge branch 'PORT-11704-Jira-enhancements' of https://github.com/por…
shariff-6 Dec 18, 2024
545ed45
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 18, 2024
f5307fb
Update integrations/jira/.port/spec.yaml
shariff-6 Dec 19, 2024
488ae8d
Updates changelog and updates atlassianOrganizationId description
shariff-6 Dec 19, 2024
cd17a4a
refactor(jira): improve code organization and type hints
shariff-6 Dec 23, 2024
2e0780e
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 23, 2024
d856b15
Updated Changelog
shariff-6 Dec 23, 2024
af4d387
Updates version and changelog
shariff-6 Dec 23, 2024
4f253d1
Removes unused imports
shariff-6 Dec 23, 2024
f062741
Update to use built in type hints
shariff-6 Dec 23, 2024
4b21ed3
refactor(client): separate fetch_team_members into standalone method
shariff-6 Dec 23, 2024
e433ee4
Fixes lint
shariff-6 Dec 23, 2024
d5f4774
fix: update log levels for non-critical errors
shariff-6 Dec 23, 2024
6314ac4
Updates log level to warning
shariff-6 Dec 24, 2024
a5ccf25
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 28, 2024
6680a5d
Fixes lint
shariff-6 Dec 28, 2024
64956b8
- Remove unused JiraResourcesConfig definition
shariff-6 Dec 28, 2024
d67f437
Updates integration version
shariff-6 Dec 28, 2024
3da7fb7
Fixes lint, removes unused imports
shariff-6 Dec 28, 2024
5be52ba
Adds params, to get_paginated_projects
shariff-6 Dec 29, 2024
7b7815b
Fixes lint
shariff-6 Dec 29, 2024
4e63c40
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 30, 2024
826f861
Update integrations/jira/.port/spec.yaml
shariff-6 Dec 31, 2024
b01260d
Updates Changelog
shariff-6 Dec 31, 2024
6fb7c2d
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 31, 2024
1c5f586
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Dec 31, 2024
947a712
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Jan 3, 2025
c347740
Updates changelog
shariff-6 Jan 3, 2025
ae6fd0a
Add error handling for Jira API requests
shariff-6 Jan 7, 2025
1fb774c
Fixes lint
shariff-6 Jan 7, 2025
1e9aac6
refactor(jira): simplify cursor pagination data extraction
shariff-6 Jan 7, 2025
29a1dac
- Replace Optional[dict] with empty dict defaults for method parameters
shariff-6 Jan 7, 2025
6bba4a3
refactor(jira): refactor issue pagination to use params dictionary
shariff-6 Jan 7, 2025
43d49cc
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Jan 7, 2025
b8f7209
Updates changelog
shariff-6 Jan 7, 2025
2abd914
Fixes lint
shariff-6 Jan 7, 2025
8bb59c2
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Jan 8, 2025
9439048
Updates Changelog
shariff-6 Jan 8, 2025
ba46cac
- Replaced default `{}` arguments with `None` to avoid unintended sid…
shariff-6 Jan 8, 2025
01a6cb0
- Replaced verbose parameter initialization with `initial_params or {…
shariff-6 Jan 8, 2025
626b971
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Jan 9, 2025
ec38774
Adds usage description to Organisation ID description
shariff-6 Jan 9, 2025
529fcd5
Updates version and Changelog
shariff-6 Jan 9, 2025
ad50026
Fixes lint
shariff-6 Jan 9, 2025
ce1f8ec
Update integrations/jira/CHANGELOG.md
shariff-6 Jan 10, 2025
f3b91ec
Merge branch 'PORT-11704-Jira-enhancements' of https://github.com/por…
shariff-6 Jan 9, 2025
abe8020
Update integrations/jira/.port/spec.yaml
shariff-6 Jan 13, 2025
3f1da48
Update integrations/jira/main.py
shariff-6 Jan 13, 2025
7660d6c
Removes unused JiraResourceConfig, replaced by specific JiraIssueConfig
shariff-6 Jan 13, 2025
1989573
Merge branch 'main' of https://github.com/port-labs/ocean into PORT-1…
shariff-6 Jan 13, 2025
fe45ddc
Updated Changlog and version
shariff-6 Jan 13, 2025
00e1e2e
Fixes lint
shariff-6 Jan 13, 2025
e6d5dc9
Remove unused imports
shariff-6 Jan 13, 2025
7a61769
Merge branch 'main' into PORT-11704-Jira-enhancements
Tankilevitch Jan 13, 2025
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
Prev Previous commit
Next Next commit
Add check for missing webhook event
shariff-6 committed Dec 4, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 7b8ee04cf55ccc87befcdd5f4693466a0e80b20d
4 changes: 4 additions & 0 deletions integrations/jira/main.py
Original file line number Diff line number Diff line change
@@ -83,6 +83,10 @@ async def handle_webhook_request(data: dict[str, Any]) -> dict[str, Any]:
logger.info(f'Received webhook event of type: {data.get("webhookEvent")}')

webhook_event = data.get("webhookEvent")
if not webhook_event:
logger.error("Missing webhook event")
return {"ok": False, "error": "Missing webhook event"}

logger.info(f"Processing webhook event: {webhook_event}")

# Process user event