Skip to content

Commit 1e1ca4e

Browse files
committed
Rename cache boolean and fix test catalog
1 parent a323543 commit 1e1ca4e

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"]
@@ -511,7 +502,7 @@ class IssueProperties(JiraStream):
511502
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-properties/#api-rest-api-3-issue-issueidorkey-properties-propertykey-get
512503
"""
513504

514-
top_level_stream = False
505+
use_request_cache = False
515506

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

534-
top_level_stream = False
525+
use_request_cache = False
535526

536527
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
537528
key = stream_slice["key"]
@@ -596,7 +587,7 @@ class IssueVotes(JiraStream):
596587
"""
597588

598589
# parse_response_root = "voters"
599-
top_level_stream = False
590+
use_request_cache = False
600591

601592
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
602593
key = stream_slice["key"]
@@ -616,7 +607,7 @@ class IssueWatchers(JiraStream):
616607
"""
617608

618609
# parse_response_root = "watchers"
619-
top_level_stream = False
610+
use_request_cache = False
620611

621612
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
622613
key = stream_slice["key"]
@@ -634,7 +625,7 @@ class IssueWorklogs(JiraStream):
634625
"""
635626

636627
parse_response_root = "worklogs"
637-
top_level_stream = False
628+
use_request_cache = False
638629

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

716-
top_level_stream = False
707+
use_request_cache = False
717708

718709
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
719710
key = stream_slice["key"]
@@ -745,7 +736,7 @@ class ProjectComponents(JiraStream):
745736
"""
746737

747738
parse_response_root = "values"
748-
top_level_stream = False
739+
use_request_cache = False
749740

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

765-
top_level_stream = False
756+
use_request_cache = False
766757

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

782-
top_level_stream = False
773+
use_request_cache = False
783774

784775
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
785776
key = stream_slice["key"]
@@ -806,7 +797,7 @@ class ProjectVersions(JiraStream):
806797
"""
807798

808799
parse_response_root = "values"
809-
top_level_stream = False
800+
use_request_cache = False
810801

811802
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
812803
key = stream_slice["key"]
@@ -834,7 +825,7 @@ class ScreenTabs(JiraStream):
834825
https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-screen-tabs/#api-rest-api-3-screens-screenid-tabs-get
835826
"""
836827

837-
top_level_stream = False
828+
use_request_cache = False
838829

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

858-
top_level_stream = False
849+
use_request_cache = False
859850

860851
def path(self, stream_slice: Mapping[str, Any] = None, **kwargs) -> str:
861852
screen_id = stream_slice["screen_id"]
@@ -906,7 +897,7 @@ class SprintIssues(V1ApiJiraStream, IncrementalJiraStream):
906897

907898
cursor_field = "updated"
908899
parse_response_root = "issues"
909-
top_level_stream = False
900+
use_request_cache = False
910901

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

0 commit comments

Comments
 (0)