Skip to content

Commit 520b4dc

Browse files
committed
Rename cache boolean and fix test catalog
1 parent c25b629 commit 520b4dc

File tree

2 files changed

+21
-30
lines changed

2 files changed

+21
-30
lines changed

airbyte-integrations/connectors/source-jira/integration_tests/configured_catalog.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
},
200200
"sync_mode": "full_refresh",
201201
"destination_sync_mode": "overwrite"
202-
}
202+
},
203203
{
204204
"stream": {
205205
"name": "time_tracking",

airbyte-integrations/connectors/source-jira/source_jira/streams.py

+20-29
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,7 @@ class JiraStream(HttpStream, ABC):
4040

4141
primary_key = "id"
4242
parse_response_root = None
43-
44-
# To prevent dangerous behavior, the `vcr` library prohibits the use of nested caching.
45-
# Here's an example of dangerous behavior:
46-
# cache = Cassette.use('whatever')
47-
# with cache:
48-
# with cache:
49-
# pass
50-
#
51-
# Therefore, we will only use `cache` for the top-level stream, so as not to cause possible difficulties.
52-
top_level_stream = True
43+
use_request_cache = True
5344

5445
def __init__(self, domain: str, projects: List[str], **kwargs):
5546
super(JiraStream, self).__init__(**kwargs)
@@ -97,7 +88,7 @@ def request_headers(
9788
return {"Accept": "application/json"}
9889

9990
def read_records(self, **kwargs) -> Iterable[Mapping[str, Any]]:
100-
if self.top_level_stream:
91+
if self.use_request_cache:
10192
with self._cache:
10293
yield from super().read_records(**kwargs)
10394
else:
@@ -206,7 +197,7 @@ class BoardIssues(V1ApiJiraStream, IncrementalJiraStream):
206197

207198
cursor_field = "updated"
208199
parse_response_root = "issues"
209-
top_level_stream = False
200+
use_request_cache = False
210201

211202
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
212203
board_id = stream_slice["board_id"]
@@ -280,7 +271,7 @@ class EpicIssues(IncrementalJiraStream):
280271

281272
cursor_field = "updated"
282273
parse_response_root = "issues"
283-
top_level_stream = False
274+
use_request_cache = False
284275

285276
def __init__(self, start_date: str = "", **kwargs):
286277
super().__init__(**kwargs)
@@ -325,7 +316,7 @@ class FilterSharing(JiraStream):
325316
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-filter-sharing/#api-rest-api-3-filter-id-permission-get
326317
"""
327318

328-
top_level_stream = False
319+
use_request_cache = False
329320

330321
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
331322
filter_id = stream_slice["filter_id"]
@@ -396,7 +387,7 @@ class IssueComments(JiraStream):
396387
"""
397388

398389
parse_response_root = "comments"
399-
top_level_stream = False
390+
use_request_cache = False
400391

401392
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
402393
key = stream_slice["key"]
@@ -437,7 +428,7 @@ class IssueCustomFieldContexts(JiraStream):
437428
"""
438429

439430
parse_response_root = "values"
440-
top_level_stream = False
431+
use_request_cache = False
441432

442433
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
443434
field_id = stream_slice["field_id"]
@@ -512,7 +503,7 @@ class IssueProperties(JiraStream):
512503
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-properties/#api-rest-api-3-issue-issueidorkey-properties-propertykey-get
513504
"""
514505

515-
top_level_stream = False
506+
use_request_cache = False
516507

517508
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
518509
key = stream_slice["key"]
@@ -532,7 +523,7 @@ class IssueRemoteLinks(JiraStream):
532523
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-remote-links/#api-rest-api-3-issue-issueidorkey-remotelink-get
533524
"""
534525

535-
top_level_stream = False
526+
use_request_cache = False
536527

537528
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
538529
key = stream_slice["key"]
@@ -597,7 +588,7 @@ class IssueVotes(JiraStream):
597588
"""
598589

599590
# parse_response_root = "voters"
600-
top_level_stream = False
591+
use_request_cache = False
601592

602593
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
603594
key = stream_slice["key"]
@@ -617,7 +608,7 @@ class IssueWatchers(JiraStream):
617608
"""
618609

619610
# parse_response_root = "watchers"
620-
top_level_stream = False
611+
use_request_cache = False
621612

622613
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
623614
key = stream_slice["key"]
@@ -635,7 +626,7 @@ class IssueWorklogs(JiraStream):
635626
"""
636627

637628
parse_response_root = "worklogs"
638-
top_level_stream = False
629+
use_request_cache = False
639630

640631
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
641632
key = stream_slice["key"]
@@ -714,7 +705,7 @@ class ProjectAvatars(JiraStream):
714705
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-project-avatars/#api-rest-api-3-project-projectidorkey-avatars-get
715706
"""
716707

717-
top_level_stream = False
708+
use_request_cache = False
718709

719710
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
720711
key = stream_slice["key"]
@@ -746,7 +737,7 @@ class ProjectComponents(JiraStream):
746737
"""
747738

748739
parse_response_root = "values"
749-
top_level_stream = False
740+
use_request_cache = False
750741

751742
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
752743
key = stream_slice["key"]
@@ -763,7 +754,7 @@ class ProjectEmail(JiraStream):
763754
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-project-email/#api-rest-api-3-project-projectid-email-get
764755
"""
765756

766-
top_level_stream = False
757+
use_request_cache = False
767758

768759
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
769760
project_id = stream_slice["project_id"]
@@ -780,7 +771,7 @@ class ProjectPermissionSchemes(JiraStream):
780771
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-project-permission-schemes/#api-rest-api-3-project-projectkeyorid-securitylevel-get
781772
"""
782773

783-
top_level_stream = False
774+
use_request_cache = False
784775

785776
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
786777
key = stream_slice["key"]
@@ -807,7 +798,7 @@ class ProjectVersions(JiraStream):
807798
"""
808799

809800
parse_response_root = "values"
810-
top_level_stream = False
801+
use_request_cache = False
811802

812803
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
813804
key = stream_slice["key"]
@@ -836,7 +827,7 @@ class ScreenTabs(JiraStream):
836827
"""
837828

838829
raise_on_http_errors = False
839-
top_level_stream = False
830+
use_request_cache = False
840831

841832
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
842833
screen_id = stream_slice["screen_id"]
@@ -857,7 +848,7 @@ class ScreenTabFields(JiraStream):
857848
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-screen-tab-fields/#api-rest-api-3-screens-screenid-tabs-tabid-fields-get
858849
"""
859850

860-
top_level_stream = False
851+
use_request_cache = False
861852

862853
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
863854
screen_id = stream_slice["screen_id"]
@@ -909,7 +900,7 @@ class SprintIssues(V1ApiJiraStream, IncrementalJiraStream):
909900

910901
cursor_field = "updated"
911902
parse_response_root = "issues"
912-
top_level_stream = False
903+
use_request_cache = False
913904

914905
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
915906
sprint_id = stream_slice["sprint_id"]

0 commit comments

Comments
 (0)