Source Jira: fix streams "IssuePropertyKeys", "ScreenTabFields"

airbyte-config-oss/init-oss/src/main/resources/seed/oss_catalog.json

@@ -15695,7 +15695,7 @@
  "sourceDefinitionId": "68e63de2-bb83-4c7e-93fa-a8a9051e3993",
  "name": "Jira",
  "dockerRepository": "airbyte/source-jira",
- "dockerImageTag": "0.3.4",
+ "dockerImageTag": "0.3.5",
  "documentationUrl": "https://docs.airbyte.com/integrations/sources/jira",
  "icon": "jira.svg",
  "sourceType": "api",

airbyte-config-oss/init-oss/src/main/resources/seed/source_definitions.yaml

@@ -1020,7 +1020,7 @@
 - name: Jira
  sourceDefinitionId: 68e63de2-bb83-4c7e-93fa-a8a9051e3993
  dockerRepository: airbyte/source-jira
- dockerImageTag: 0.3.4
+ dockerImageTag: 0.3.5
  documentationUrl: https://docs.airbyte.com/integrations/sources/jira
  icon: jira.svg
  sourceType: api

airbyte-config-oss/init-oss/src/main/resources/seed/source_specs.yaml

@@ -7334,7 +7334,7 @@
  supportsNormalization: false
  supportsDBT: false
  supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-jira:0.3.4"
+- dockerImage: "airbyte/source-jira:0.3.5"
  spec:
  documentationUrl: "https://docs.airbyte.com/integrations/sources/jira"
  connectionSpecification:

airbyte-integrations/connectors/source-jira/Dockerfile

@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.3.4
+LABEL io.airbyte.version=0.3.5
 LABEL io.airbyte.name=airbyte/source-jira

airbyte-integrations/connectors/source-jira/integration_tests/expected_records.jsonl

@@ -1,5 +1,3 @@
-{"stream": "application_roles", "data": {"key": "jira-servicedesk", "groups": ["jira-administrators", "jira-software-users", "jira-users", "Test group 1", "Test group 0", "atlassian-addons-admin", "integration-test-group", "jira-servicemanagement-users-airbyteio", "jira-admins-airbyteio", "site-admins", "Test group 10", "administrators"], "groupDetails": [{"name": "jira-software-users", "groupId": "4452b254-035d-469a-a422-1f4666dce50e", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"}, {"name": "Test group 0", "groupId": "ee8d15d1-6462-406a-b0a6-8065b7e4cdd7", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=ee8d15d1-6462-406a-b0a6-8065b7e4cdd7"}, {"name": "administrators", "groupId": "0ca6e087-7a61-4986-a269-98fe268854a1", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=0ca6e087-7a61-4986-a269-98fe268854a1"}, {"name": "integration-test-group", "groupId": "5f1ec851-f8da-4f90-ab42-8dc50a9f99d8", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=5f1ec851-f8da-4f90-ab42-8dc50a9f99d8"}, {"name": "jira-users", "groupId": "2513da2e-08cf-4415-9bcd-cbbd32fa227d", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=2513da2e-08cf-4415-9bcd-cbbd32fa227d"}, {"name": "jira-admins-airbyteio", "groupId": "2d55cbe0-4cab-46a4-853e-ec31162ab9a3", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=2d55cbe0-4cab-46a4-853e-ec31162ab9a3"}, {"name": "jira-servicemanagement-users-airbyteio", "groupId": "aab99a7c-3ce3-4123-b580-e4e00460754d", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"}, {"name": "atlassian-addons-admin", "groupId": "90b9ffb1-ed26-4b5e-af59-8f684900ce83", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=90b9ffb1-ed26-4b5e-af59-8f684900ce83"}, {"name": "jira-administrators", "groupId": "58582f33-a5a6-43b9-92a6-ff0bbacb49ae", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=58582f33-a5a6-43b9-92a6-ff0bbacb49ae"}, {"name": "Test group 1", "groupId": "bda1faf1-1a1a-42d1-82e4-a428c8b8f67c", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=bda1faf1-1a1a-42d1-82e4-a428c8b8f67c"}, {"name": "site-admins", "groupId": "76dad095-fc1a-467a-88b4-fde534220985", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=76dad095-fc1a-467a-88b4-fde534220985"}, {"name": "Test group 10", "groupId": "e9f74708-e33c-4158-919d-6457f50c6e74", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=e9f74708-e33c-4158-919d-6457f50c6e74"}], "name": "Jira Service Desk", "defaultGroups": ["jira-servicemanagement-users-airbyteio"], "defaultGroupsDetails": [{"name": "jira-servicemanagement-users-airbyteio", "groupId": "aab99a7c-3ce3-4123-b580-e4e00460754d", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"}], "selectedByDefault": false, "defined": true, "numberOfSeats": 50000, "remainingSeats": 49996, "userCount": 4, "userCountDescription": "agents", "hasUnlimitedSeats": false, "platform": false}, "emitted_at": 1680707458440}
-{"stream": "application_roles", "data": {"key": "jira-software", "groups": ["jira-users", "Test group 1", "Test group 0", "system-administrators", "atlassian-addons-admin", "jira-servicemanagement-users-airbyteio", "jira-admins-airbyteio", "site-admins", "jira-administrators", "jira-software-users", "integration-test-group", "Test group 10", "administrators"], "groupDetails": [{"name": "administrators", "groupId": "0ca6e087-7a61-4986-a269-98fe268854a1", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=0ca6e087-7a61-4986-a269-98fe268854a1"}, {"name": "jira-users", "groupId": "2513da2e-08cf-4415-9bcd-cbbd32fa227d", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=2513da2e-08cf-4415-9bcd-cbbd32fa227d"}, {"name": "jira-administrators", "groupId": "58582f33-a5a6-43b9-92a6-ff0bbacb49ae", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=58582f33-a5a6-43b9-92a6-ff0bbacb49ae"}, {"name": "Test group 1", "groupId": "bda1faf1-1a1a-42d1-82e4-a428c8b8f67c", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=bda1faf1-1a1a-42d1-82e4-a428c8b8f67c"}, {"name": "system-administrators", "groupId": "ed0ab3a1-afa4-4ff5-a878-fc90c1574818", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=ed0ab3a1-afa4-4ff5-a878-fc90c1574818"}, {"name": "site-admins", "groupId": "76dad095-fc1a-467a-88b4-fde534220985", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=76dad095-fc1a-467a-88b4-fde534220985"}, {"name": "jira-software-users", "groupId": "4452b254-035d-469a-a422-1f4666dce50e", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"}, {"name": "Test group 0", "groupId": "ee8d15d1-6462-406a-b0a6-8065b7e4cdd7", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=ee8d15d1-6462-406a-b0a6-8065b7e4cdd7"}, {"name": "integration-test-group", "groupId": "5f1ec851-f8da-4f90-ab42-8dc50a9f99d8", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=5f1ec851-f8da-4f90-ab42-8dc50a9f99d8"}, {"name": "jira-servicemanagement-users-airbyteio", "groupId": "aab99a7c-3ce3-4123-b580-e4e00460754d", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"}, {"name": "jira-admins-airbyteio", "groupId": "2d55cbe0-4cab-46a4-853e-ec31162ab9a3", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=2d55cbe0-4cab-46a4-853e-ec31162ab9a3"}, {"name": "atlassian-addons-admin", "groupId": "90b9ffb1-ed26-4b5e-af59-8f684900ce83", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=90b9ffb1-ed26-4b5e-af59-8f684900ce83"}, {"name": "Test group 10", "groupId": "e9f74708-e33c-4158-919d-6457f50c6e74", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=e9f74708-e33c-4158-919d-6457f50c6e74"}], "name": "Jira Software", "defaultGroups": ["jira-software-users"], "defaultGroupsDetails": [{"name": "jira-software-users", "groupId": "4452b254-035d-469a-a422-1f4666dce50e", "self": "https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"}], "selectedByDefault": false, "defined": true, "numberOfSeats": 10, "remainingSeats": 6, "userCount": 4, "userCountDescription": "users", "hasUnlimitedSeats": false, "platform": false}, "emitted_at": 1680707458442}
 {"stream": "avatars", "data": {"id": "10351", "isSystemAvatar": true, "isSelected": false, "isDeletable": false, "urls": {"16x16": "/secure/useravatar?size=xsmall&avatarId=10351", "24x24": "/secure/useravatar?size=small&avatarId=10351", "32x32": "/secure/useravatar?size=medium&avatarId=10351", "48x48": "/secure/useravatar?avatarId=10351"}}, "emitted_at": 1680707459749}
 {"stream": "avatars", "data": {"id": "10352", "isSystemAvatar": true, "isSelected": false, "isDeletable": false, "urls": {"16x16": "/secure/useravatar?size=xsmall&avatarId=10352", "24x24": "/secure/useravatar?size=small&avatarId=10352", "32x32": "/secure/useravatar?size=medium&avatarId=10352", "48x48": "/secure/useravatar?avatarId=10352"}}, "emitted_at": 1680707459749}
 {"stream": "boards", "data": {"id": 1, "self": "https://airbyteio.atlassian.net/rest/agile/1.0/board/1", "name": "IT board", "type": "scrum", "location": {"projectId": 10000, "displayName": "integration-tests (IT)", "projectName": "integration-tests", "projectKey": "IT", "projectTypeKey": "software", "avatarURI": "https://airbyteio.atlassian.net/rest/api/2/universal_avatar/view/type/project/avatar/10424?size=small", "name": "integration-tests (IT)"}, "projectId": "10000", "projectKey": "IT"}, "emitted_at": 1680707460336}
@@ -93,3 +91,5 @@
 {"stream": "workflow_statuses", "data": {"self": "https://airbyteio.atlassian.net/rest/api/3/status/10007", "description": "This was auto-generated by Jira Service Management during workflow import", "iconUrl": "https://airbyteio.atlassian.net/images/icons/status_generic.gif", "name": "Work in progress", "untranslatedName": "Work in progress", "id": "10007", "statusCategory": {"self": "https://airbyteio.atlassian.net/rest/api/3/statuscategory/4", "id": 4, "key": "indeterminate", "colorName": "yellow", "name": "In Progress"}}, "emitted_at": 1680707702649}
 {"stream": "workflow_status_categories", "data": {"self": "https://airbyteio.atlassian.net/rest/api/3/statuscategory/4", "id": 4, "key": "indeterminate", "colorName": "yellow", "name": "In Progress"}, "emitted_at": 1680707703366}
 {"stream": "workflow_status_categories", "data": {"self": "https://airbyteio.atlassian.net/rest/api/3/statuscategory/3", "id": 3, "key": "done", "colorName": "green", "name": "Done"}, "emitted_at": 1680707703367}
+{"stream":"application_roles","data":{"key":"jira-servicedesk","groups":["jira-administrators","jira-software-users","jira-users","Test group 1","Test group 0","atlassian-addons-admin","integration-test-group","jira-servicemanagement-users-airbyteio","jira-admins-airbyteio","site-admins","Test group 10","administrators"],"groupDetails":[{"name":"jira-software-users","groupId":"4452b254-035d-469a-a422-1f4666dce50e","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"},{"name":"Test group 0","groupId":"ee8d15d1-6462-406a-b0a6-8065b7e4cdd7","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=ee8d15d1-6462-406a-b0a6-8065b7e4cdd7"},{"name":"administrators","groupId":"0ca6e087-7a61-4986-a269-98fe268854a1","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=0ca6e087-7a61-4986-a269-98fe268854a1"},{"name":"integration-test-group","groupId":"5f1ec851-f8da-4f90-ab42-8dc50a9f99d8","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=5f1ec851-f8da-4f90-ab42-8dc50a9f99d8"},{"name":"jira-users","groupId":"2513da2e-08cf-4415-9bcd-cbbd32fa227d","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=2513da2e-08cf-4415-9bcd-cbbd32fa227d"},{"name":"jira-admins-airbyteio","groupId":"2d55cbe0-4cab-46a4-853e-ec31162ab9a3","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=2d55cbe0-4cab-46a4-853e-ec31162ab9a3"},{"name":"jira-servicemanagement-users-airbyteio","groupId":"aab99a7c-3ce3-4123-b580-e4e00460754d","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"},{"name":"atlassian-addons-admin","groupId":"90b9ffb1-ed26-4b5e-af59-8f684900ce83","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=90b9ffb1-ed26-4b5e-af59-8f684900ce83"},{"name":"jira-administrators","groupId":"58582f33-a5a6-43b9-92a6-ff0bbacb49ae","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=58582f33-a5a6-43b9-92a6-ff0bbacb49ae"},{"name":"Test group 1","groupId":"bda1faf1-1a1a-42d1-82e4-a428c8b8f67c","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=bda1faf1-1a1a-42d1-82e4-a428c8b8f67c"},{"name":"site-admins","groupId":"76dad095-fc1a-467a-88b4-fde534220985","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=76dad095-fc1a-467a-88b4-fde534220985"},{"name":"Test group 10","groupId":"e9f74708-e33c-4158-919d-6457f50c6e74","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=e9f74708-e33c-4158-919d-6457f50c6e74"}],"name":"Jira Service Desk","defaultGroups":["jira-servicemanagement-users-airbyteio"],"defaultGroupsDetails":[{"name":"jira-servicemanagement-users-airbyteio","groupId":"aab99a7c-3ce3-4123-b580-e4e00460754d","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"}],"selectedByDefault":false,"defined":true,"numberOfSeats":50000,"remainingSeats":49996,"userCount":4,"userCountDescription":"agents","hasUnlimitedSeats":false,"platform":false},"emitted_at":1680851828744}
+{"stream":"application_roles","data":{"key":"jira-software","groups":["jira-users","Test group 1","Test group 0","system-administrators","atlassian-addons-admin","jira-servicemanagement-users-airbyteio","jira-admins-airbyteio","site-admins","jira-administrators","jira-software-users","integration-test-group","Test group 10","administrators"],"groupDetails":[{"name":"administrators","groupId":"0ca6e087-7a61-4986-a269-98fe268854a1","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=0ca6e087-7a61-4986-a269-98fe268854a1"},{"name":"jira-users","groupId":"2513da2e-08cf-4415-9bcd-cbbd32fa227d","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=2513da2e-08cf-4415-9bcd-cbbd32fa227d"},{"name":"jira-administrators","groupId":"58582f33-a5a6-43b9-92a6-ff0bbacb49ae","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=58582f33-a5a6-43b9-92a6-ff0bbacb49ae"},{"name":"Test group 1","groupId":"bda1faf1-1a1a-42d1-82e4-a428c8b8f67c","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=bda1faf1-1a1a-42d1-82e4-a428c8b8f67c"},{"name":"system-administrators","groupId":"ed0ab3a1-afa4-4ff5-a878-fc90c1574818","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=ed0ab3a1-afa4-4ff5-a878-fc90c1574818"},{"name":"site-admins","groupId":"76dad095-fc1a-467a-88b4-fde534220985","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=76dad095-fc1a-467a-88b4-fde534220985"},{"name":"jira-software-users","groupId":"4452b254-035d-469a-a422-1f4666dce50e","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"},{"name":"Test group 0","groupId":"ee8d15d1-6462-406a-b0a6-8065b7e4cdd7","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=ee8d15d1-6462-406a-b0a6-8065b7e4cdd7"},{"name":"integration-test-group","groupId":"5f1ec851-f8da-4f90-ab42-8dc50a9f99d8","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=5f1ec851-f8da-4f90-ab42-8dc50a9f99d8"},{"name":"jira-servicemanagement-users-airbyteio","groupId":"aab99a7c-3ce3-4123-b580-e4e00460754d","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=aab99a7c-3ce3-4123-b580-e4e00460754d"},{"name":"jira-admins-airbyteio","groupId":"2d55cbe0-4cab-46a4-853e-ec31162ab9a3","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=2d55cbe0-4cab-46a4-853e-ec31162ab9a3"},{"name":"atlassian-addons-admin","groupId":"90b9ffb1-ed26-4b5e-af59-8f684900ce83","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=90b9ffb1-ed26-4b5e-af59-8f684900ce83"},{"name":"Test group 10","groupId":"e9f74708-e33c-4158-919d-6457f50c6e74","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=e9f74708-e33c-4158-919d-6457f50c6e74"}],"name":"Jira Software","defaultGroups":["jira-software-users"],"defaultGroupsDetails":[{"name":"jira-software-users","groupId":"4452b254-035d-469a-a422-1f4666dce50e","self":"https://airbyteio.atlassian.net/rest/api/3/group?groupId=4452b254-035d-469a-a422-1f4666dce50e"}],"selectedByDefault":false,"defined":true,"numberOfSeats":10,"remainingSeats":6,"userCount":4,"userCountDescription":"users","hasUnlimitedSeats":false,"platform":false},"emitted_at":1680851828745}

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

@@ -500,7 +500,7 @@ class IssuePropertyKeys(JiraStream):
  https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-properties/#api-rest-api-3-issue-issueidorkey-properties-get
  """
 
- extract_field = "key"
+ extract_field = "keys"
  use_cache = True
 
  def path(self, stream_slice: Mapping[str, Any], **kwargs) -> str:
@@ -1035,7 +1035,7 @@ def path(self, stream_slice: Mapping[str, Any], **kwargs) -> str:
  def read_records(self, stream_slice: Optional[Mapping[str, Any]] = None, **kwargs) -> Iterable[Mapping[str, Any]]:
  for screen in read_full_refresh(self.screens_stream):
  for tab in self.screen_tabs_stream.read_tab_records(stream_slice={"screen_id": screen["id"]}, **kwargs):
- if id in tab: # Check for proper tab record since the ScreenTabs stream doesn't throw http errors
+ if "id" in tab: # Check for proper tab record since the ScreenTabs stream doesn't throw http errors
  yield from super().read_records(stream_slice={"screen_id": screen["id"], "tab_id": tab["id"]}, **kwargs)
 
 

airbyte-integrations/connectors/source-jira/unit_tests/responses/issue_property_keys.json

@@ -1,5 +1,5 @@
 {
- "key": [
+ "keys": [
  {
  "self": "https://airbyteio.atlassian.net/rest/api/3/priority/1",
  "statusColor": "#d04437",
@@ -21,4 +21,4 @@
  "key": "TESTKEY13-1"
  }
  ]
-}
+}