diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 7709769c0f497..461fcb72ed4a9 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -2046,11 +2046,15 @@ - name: Zendesk Support sourceDefinitionId: 79c1aa37-dae3-42ae-b333-d1c105477715 dockerRepository: airbyte/source-zendesk-support - dockerImageTag: 0.2.21 + dockerImageTag: 0.2.23 documentationUrl: https://docs.airbyte.com/integrations/sources/zendesk-support icon: zendesk-support.svg sourceType: api releaseStage: generally_available + allowedHosts: + hosts: + - "${subdomain}.zendesk.com" + - zendesk.com - name: Zendesk Talk sourceDefinitionId: c8630570-086d-4a40-99ae-ea5b18673071 dockerRepository: airbyte/source-zendesk-talk diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index 07c46b2a7f61b..a41f08e6dbcb8 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -16468,7 +16468,7 @@ path_in_connector_config: - "credentials" - "client_secret" -- dockerImage: "airbyte/source-zendesk-support:0.2.21" +- dockerImage: "airbyte/source-zendesk-support:0.2.23" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/zendesk-support" connectionSpecification: diff --git a/airbyte-integrations/connectors/source-zendesk-support/Dockerfile b/airbyte-integrations/connectors/source-zendesk-support/Dockerfile index 4010966ca4e23..a329d8582ca67 100644 --- a/airbyte-integrations/connectors/source-zendesk-support/Dockerfile +++ b/airbyte-integrations/connectors/source-zendesk-support/Dockerfile @@ -25,5 +25,5 @@ COPY source_zendesk_support ./source_zendesk_support ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.2.21 +LABEL io.airbyte.version=0.2.23 LABEL io.airbyte.name=airbyte/source-zendesk-support diff --git a/airbyte-integrations/connectors/source-zendesk-support/integration_tests/expected_records.jsonl b/airbyte-integrations/connectors/source-zendesk-support/integration_tests/expected_records.jsonl index 8da3eda908f6e..04a9054365c06 100644 --- a/airbyte-integrations/connectors/source-zendesk-support/integration_tests/expected_records.jsonl +++ b/airbyte-integrations/connectors/source-zendesk-support/integration_tests/expected_records.jsonl @@ -35,10 +35,10 @@ {"stream":"schedules","data":{"id":4567312249615,"name":"Test Schedule","time_zone":"New Caledonia","created_at":"2022-03-25T10:23:34Z","updated_at":"2022-03-25T10:23:34Z","intervals":[{"start_time":1980,"end_time":2460},{"start_time":3420,"end_time":3900},{"start_time":4860,"end_time":5340},{"start_time":6300,"end_time":6780},{"start_time":7740,"end_time":8220}]},"emitted_at":1673880699938} {"stream":"sla_policies","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/slas/policies/360001110696.json","id":360001110696,"title":"test police","description":"for tests","position":1,"filter":{"all":[{"field":"assignee_id","operator":"is","value":361089721035}],"any":[]},"policy_metrics":[{"priority":"high","metric":"first_reply_time","target":61,"business_hours":false}],"created_at":"2021-07-16T11:05:31Z","updated_at":"2021-07-16T11:05:31Z"},"emitted_at":1673880700970} {"stream":"sla_policies","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/slas/policies/360001113715.json","id":360001113715,"title":"test police 2","description":"test police 2","position":2,"filter":{"all":[{"field":"organization_id","operator":"is","value":360033549136}],"any":[]},"policy_metrics":[{"priority":"high","metric":"first_reply_time","target":121,"business_hours":false}],"created_at":"2021-07-16T11:06:01Z","updated_at":"2021-07-16T11:06:01Z"},"emitted_at":1673880700970} -{"stream":"tags","data":{"name":"support","count":2},"emitted_at":1673880702342} -{"stream":"tags","data":{"name":"custom","count":2},"emitted_at":1673880702342} -{"stream":"tags","data":{"name":"tag2","count":1},"emitted_at":1673880702343} +{"stream":"tags","data":{"name":"test","count":3},"emitted_at":1673880702342} +{"stream":"tags","data":{"name":"tag2","count":1},"emitted_at":1673880702342} {"stream":"tags","data":{"name":"tag1","count":1},"emitted_at":1673880702343} +{"stream":"tags","data":{"name":"tag","count":1},"emitted_at":1673880702343} {"stream":"ticket_audits","data":{"id":5909514817039,"ticket_id":25,"created_at":"2022-11-22T17:02:04Z","author_id":-1,"metadata":{"system":{},"custom":{}},"events":[{"id":5909514817167,"type":"Notification","subject":"Request #{{ticket.id}}: How would you rate the support you received?","body":"Hello {{ticket.requester.name}},\n\nWe'd love to hear what you think of our customer service. Please take a moment to answer one simple question by clicking either link below:\n\n{{satisfaction.rating_section}}\n\nHere's a reminder of what this request was about:\n\n{{ticket.comments_formatted}}\n","recipients":[360786799676]},{"id":5909514817295,"type":"Change","value":"offered","field_name":"satisfaction_score","previous_value":"unoffered"}],"via":{"channel":"rule","source":{"to":{},"from":{"deleted":false,"title":"Request customer satisfaction rating (system automation)","id":360021281435},"rel":"automation"}}},"emitted_at":1673880705813} {"stream":"ticket_audits","data":{"id":5909508365711,"ticket_id":141,"created_at":"2022-11-22T17:02:04Z","author_id":-1,"metadata":{"system":{},"custom":{}},"events":[{"id":5909502407183,"type":"Notification","subject":"Request #{{ticket.id}}: How would you rate the support you received?","body":"Hello {{ticket.requester.name}},\n\nWe'd love to hear what you think of our customer service. Please take a moment to answer one simple question by clicking either link below:\n\n{{satisfaction.rating_section}}\n\nHere's a reminder of what this request was about:\n\n{{ticket.comments_formatted}}\n","recipients":[360786799676]}],"via":{"channel":"rule","source":{"to":{},"from":{"deleted":false,"title":"Request customer satisfaction rating (system automation)","id":360021281435},"rel":"automation"}}},"emitted_at":1673880705814} {"stream":"ticket_audits","data":{"id":5909492139663,"ticket_id":130,"created_at":"2022-11-22T17:02:04Z","author_id":-1,"metadata":{"system":{},"custom":{}},"events":[{"id":5909502411919,"type":"Notification","subject":"Request #{{ticket.id}}: How would you rate the support you received?","body":"Hello {{ticket.requester.name}},\n\nWe'd love to hear what you think of our customer service. Please take a moment to answer one simple question by clicking either link below:\n\n{{satisfaction.rating_section}}\n\nHere's a reminder of what this request was about:\n\n{{ticket.comments_formatted}}\n","recipients":[360786799676]}],"via":{"channel":"rule","source":{"to":{},"from":{"deleted":false,"title":"Request customer satisfaction rating (system automation)","id":360021281435},"rel":"automation"}}},"emitted_at":1673880705814} @@ -59,14 +59,14 @@ {"stream":"ticket_comments","data":{"id":5163373140367,"via":{"channel":"web","source":{"from":{},"to":{"name":"Team Airbyte","address":"integration-test@airbyte.io"},"rel":null}},"via_reference_id":null,"type":"Comment","author_id":360786799676,"body":"test to","html_body":"
test to
","plain_body":"test to","public":true,"attachments":[],"audit_id":5163373140239,"created_at":"2022-07-18T16:39:48Z","event_type":"Comment","ticket_id":130,"timestamp":1658162388},"emitted_at":1673880707856} {"stream":"ticket_comments","data":{"id":5163387030799,"via":{"channel":"web","source":{"from":{},"to":{"name":"Team Airbyte","address":"integration-test@airbyte.io"},"rel":null}},"via_reference_id":null,"type":"Comment","author_id":360786799676,"body":"test to","html_body":"
test to
","plain_body":"test to","public":true,"attachments":[],"audit_id":5163387030671,"created_at":"2022-07-18T16:41:30Z","event_type":"Comment","ticket_id":131,"timestamp":1658162490},"emitted_at":1673880707857} {"stream":"ticket_comments","data":{"id":5163440081679,"via":{"channel":"web","source":{"from":{},"to":{"name":"Team Airbyte","address":"integration-test@airbyte.io"},"rel":null}},"via_reference_id":null,"type":"Comment","author_id":360786799676,"body":"test to","html_body":"
test to
","plain_body":"test to","public":true,"attachments":[],"audit_id":5163440081551,"created_at":"2022-07-18T16:45:41Z","event_type":"Comment","ticket_id":132,"timestamp":1658162740},"emitted_at":1673880707857} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833076.json","id":360002833076,"type":"subject","title":"Subject","raw_title":"Subject","description":"","raw_description":"","position":1,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Subject","raw_title_in_portal":"Subject","visible_in_portal":true,"editable_in_portal":true,"required_in_portal":true,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null},"emitted_at":1673880709692} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833096.json","id":360002833096,"type":"description","title":"Description","raw_title":"Description","description":"Please enter the details of your request. A member of our support staff will respond as soon as possible.","raw_description":"Please enter the details of your request. A member of our support staff will respond as soon as possible.","position":2,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Description","raw_title_in_portal":"Description","visible_in_portal":true,"editable_in_portal":true,"required_in_portal":true,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null},"emitted_at":1673880709693} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833116.json","id":360002833116,"type":"status","title":"Status","raw_title":"Status","description":"Request status","raw_description":"Request status","position":3,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Status","raw_title_in_portal":"Status","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"system_field_options":[{"name":"Open","value":"open"},{"name":"Pending","value":"pending"},{"name":"Solved","value":"solved"}],"sub_type_id":0},"emitted_at":1673880709694} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833136.json","id":360002833136,"type":"tickettype","title":"Type","raw_title":"Type","description":"Request type","raw_description":"Request type","position":4,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Type","raw_title_in_portal":"Type","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":true,"agent_description":null,"system_field_options":[{"name":"Question","value":"question"},{"name":"Incident","value":"incident"},{"name":"Problem","value":"problem"},{"name":"Task","value":"task"}]},"emitted_at":1673880709694} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833156.json","id":360002833156,"type":"priority","title":"Priority","raw_title":"Priority","description":"Request priority","raw_description":"Request priority","position":5,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Priority","raw_title_in_portal":"Priority","visible_in_portal":true,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":true,"agent_description":null,"system_field_options":[{"name":"Low","value":"low"},{"name":"Normal","value":"normal"},{"name":"High","value":"high"},{"name":"Urgent","value":"urgent"}],"sub_type_id":0},"emitted_at":1673880709694} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833176.json","id":360002833176,"type":"group","title":"Group","raw_title":"Group","description":"Request group","raw_description":"Request group","position":6,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Group","raw_title_in_portal":"Group","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null},"emitted_at":1673880709695} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833196.json","id":360002833196,"type":"assignee","title":"Assignee","raw_title":"Assignee","description":"Agent assigned to your request","raw_description":"Agent assigned to your request","position":7,"active":true,"required":true,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Assignee","raw_title_in_portal":"Assignee","visible_in_portal":true,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null},"emitted_at":1673880709695} -{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/5616655556879.json","id":5616655556879,"type":"custom_status","title":"Ticket status","raw_title":"Ticket status","description":"Request ticket status","raw_description":"Request ticket status","position":9999,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Ticket status","raw_title_in_portal":"Ticket status","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2022-10-05T05:41:30Z","updated_at":"2022-10-05T05:41:30Z","removable":false,"agent_description":null,"custom_statuses":[{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044356.json","id":4044356,"status_category":"new","agent_label":"New","end_user_label":"Open","description":"Ticket is awaiting assignment to an agent","end_user_description":"We are working on a response for you","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044376.json","id":4044376,"status_category":"open","agent_label":"Open","end_user_label":"Open","description":"Staff is working on the ticket","end_user_description":"We are working on a response for you","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044396.json","id":4044396,"status_category":"pending","agent_label":"Pending","end_user_label":"Awaiting your reply","description":"Staff is waiting for the requester to reply","end_user_description":"We are waiting for you to respond","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044416.json","id":4044416,"status_category":"hold","agent_label":"On-hold","end_user_label":"Open","description":"Staff is waiting for a third party","end_user_description":"We are working on a response for you","active":false,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2022-11-21T03:53:49Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044436.json","id":4044436,"status_category":"solved","agent_label":"Solved","end_user_label":"Solved","description":"The ticket has been solved","end_user_description":"This request has been solved","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"}]},"emitted_at":1673880709695} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833076.json","id":360002833076,"type":"subject","title":"Subject","raw_title":"Subject","description":"","raw_description":"","position":1,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Subject","raw_title_in_portal":"Subject","visible_in_portal":true,"editable_in_portal":true,"required_in_portal":true,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"key":null},"emitted_at":1676458396549} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833096.json","id":360002833096,"type":"description","title":"Description","raw_title":"Description","description":"Please enter the details of your request. A member of our support staff will respond as soon as possible.","raw_description":"Please enter the details of your request. A member of our support staff will respond as soon as possible.","position":2,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Description","raw_title_in_portal":"Description","visible_in_portal":true,"editable_in_portal":true,"required_in_portal":true,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"key":null},"emitted_at":1676458396550} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833116.json","id":360002833116,"type":"status","title":"Status","raw_title":"Status","description":"Request status","raw_description":"Request status","position":3,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Status","raw_title_in_portal":"Status","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"system_field_options":[{"name":"Open","value":"open"},{"name":"Pending","value":"pending"},{"name":"Solved","value":"solved"}],"sub_type_id":0,"key":null},"emitted_at":1676458396551} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833136.json","id":360002833136,"type":"tickettype","title":"Type","raw_title":"Type","description":"Request type","raw_description":"Request type","position":4,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Type","raw_title_in_portal":"Type","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":true,"agent_description":null,"system_field_options":[{"name":"Question","value":"question"},{"name":"Incident","value":"incident"},{"name":"Problem","value":"problem"},{"name":"Task","value":"task"}],"key":null},"emitted_at":1676458396551} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833156.json","id":360002833156,"type":"priority","title":"Priority","raw_title":"Priority","description":"Request priority","raw_description":"Request priority","position":5,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Priority","raw_title_in_portal":"Priority","visible_in_portal":true,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":true,"agent_description":null,"system_field_options":[{"name":"Low","value":"low"},{"name":"Normal","value":"normal"},{"name":"High","value":"high"},{"name":"Urgent","value":"urgent"}],"sub_type_id":0,"key":null},"emitted_at":1676458396551} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833176.json","id":360002833176,"type":"group","title":"Group","raw_title":"Group","description":"Request group","raw_description":"Request group","position":6,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Group","raw_title_in_portal":"Group","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"key":null},"emitted_at":1676458396552} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/360002833196.json","id":360002833196,"type":"assignee","title":"Assignee","raw_title":"Assignee","description":"Agent assigned to your request","raw_description":"Agent assigned to your request","position":7,"active":true,"required":true,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Assignee","raw_title_in_portal":"Assignee","visible_in_portal":true,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2020-12-11T18:34:05Z","updated_at":"2020-12-11T18:34:05Z","removable":false,"agent_description":null,"key":null},"emitted_at":1676458396552} +{"stream":"ticket_fields","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_fields/5616655556879.json","id":5616655556879,"type":"custom_status","title":"Ticket status","raw_title":"Ticket status","description":"Request ticket status","raw_description":"Request ticket status","position":9999,"active":true,"required":false,"collapsed_for_agents":false,"regexp_for_validation":null,"title_in_portal":"Ticket status","raw_title_in_portal":"Ticket status","visible_in_portal":false,"editable_in_portal":false,"required_in_portal":false,"tag":null,"created_at":"2022-10-05T05:41:30Z","updated_at":"2022-10-05T05:41:30Z","removable":false,"agent_description":null,"key":null,"custom_statuses":[{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044356.json","id":4044356,"status_category":"new","agent_label":"New","end_user_label":"Open","description":"Ticket is awaiting assignment to an agent","end_user_description":"We are working on a response for you","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044376.json","id":4044376,"status_category":"open","agent_label":"Open","end_user_label":"Open","description":"Staff is working on the ticket","end_user_description":"We are working on a response for you","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044396.json","id":4044396,"status_category":"pending","agent_label":"Pending","end_user_label":"Awaiting your reply","description":"Staff is waiting for the requester to reply","end_user_description":"We are waiting for you to respond","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044416.json","id":4044416,"status_category":"hold","agent_label":"On-hold","end_user_label":"Open","description":"Staff is waiting for a third party","end_user_description":"We are working on a response for you","active":false,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2022-11-21T03:53:49Z"},{"url":"https://d3v-airbyte.zendesk.com/api/v2/custom_statuses/4044436.json","id":4044436,"status_category":"solved","agent_label":"Solved","end_user_label":"Solved","description":"The ticket has been solved","end_user_description":"This request has been solved","active":true,"default":true,"created_at":"2021-10-14T19:56:30Z","updated_at":"2021-10-14T19:56:30Z"}]},"emitted_at":1676458396552} {"stream":"ticket_forms","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_forms/360000084116.json","id":360000084116,"name":"Default Ticket Form","raw_name":"Default Ticket Form","display_name":"Default Ticket Form","raw_display_name":"Default Ticket Form","end_user_visible":true,"position":1,"ticket_field_ids":[360002833076,360002833096,360002833116,360002833136,360002833156,360002833176,360002833196],"active":true,"default":true,"created_at":"2020-12-11T18:34:37Z","updated_at":"2020-12-11T18:34:37Z","in_all_brands":true,"restricted_brand_ids":[],"end_user_conditions":[],"agent_conditions":[]},"emitted_at":1673880710920} {"stream":"ticket_metrics","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_metrics/5527084754447.json","id":5527084754447,"ticket_id":145,"created_at":"2022-09-19T14:53:49Z","updated_at":"2022-09-19T14:53:49Z","group_stations":0,"assignee_stations":0,"reopens":0,"replies":0,"assignee_updated_at":null,"requester_updated_at":"2022-09-19T14:53:49Z","status_updated_at":"2022-09-19T14:53:49Z","initially_assigned_at":null,"assigned_at":null,"solved_at":null,"latest_comment_added_at":"2022-09-19T14:53:49Z","reply_time_in_minutes":{"calendar":null,"business":null},"first_resolution_time_in_minutes":{"calendar":null,"business":null},"full_resolution_time_in_minutes":{"calendar":null,"business":null},"agent_wait_time_in_minutes":{"calendar":null,"business":null},"requester_wait_time_in_minutes":{"calendar":null,"business":null},"on_hold_time_in_minutes":{"calendar":0,"business":0}},"emitted_at":1673880712544} {"stream":"ticket_metrics","data":{"url":"https://d3v-airbyte.zendesk.com/api/v2/ticket_metrics/5527080505487.json","id":5527080505487,"ticket_id":144,"created_at":"2022-09-19T14:43:42Z","updated_at":"2022-09-19T14:43:42Z","group_stations":0,"assignee_stations":0,"reopens":0,"replies":0,"assignee_updated_at":null,"requester_updated_at":"2022-09-19T14:43:42Z","status_updated_at":"2022-09-19T14:43:42Z","initially_assigned_at":null,"assigned_at":null,"solved_at":null,"latest_comment_added_at":"2022-09-19T14:43:42Z","reply_time_in_minutes":{"calendar":null,"business":null},"first_resolution_time_in_minutes":{"calendar":null,"business":null},"full_resolution_time_in_minutes":{"calendar":null,"business":null},"agent_wait_time_in_minutes":{"calendar":null,"business":null},"requester_wait_time_in_minutes":{"calendar":null,"business":null},"on_hold_time_in_minutes":{"calendar":0,"business":0}},"emitted_at":1673880712544} diff --git a/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/streams.py b/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/streams.py index 83b12f2ba984a..ce81a696f0b76 100644 --- a/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/streams.py +++ b/airbyte-integrations/connectors/source-zendesk-support/source_zendesk_support/streams.py @@ -110,6 +110,8 @@ def send_future(self, request: requests.PreparedRequest, **kwargs) -> Future: class BaseSourceZendeskSupportStream(HttpStream, ABC): + raise_on_http_errors = True + def __init__(self, subdomain: str, start_date: str, ignore_pagination: bool = False, **kwargs): super().__init__(**kwargs) @@ -186,6 +188,13 @@ def parse_response(self, response: requests.Response, stream_state: Mapping[str, if not cursor_date or updated > cursor_date: yield record + def should_retry(self, response: requests.Response) -> bool: + if response.status_code == 403: + self.logger.error(f"Skipping stream {self.name}: Check permissions, error message: {response.json().get('error')}.") + setattr(self, "raise_on_http_errors", False) + return False + return super().should_retry(response) + class SourceZendeskSupportStream(BaseSourceZendeskSupportStream): """Basic Zendesk class""" diff --git a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py index edc0c09d42230..655a68e7df6f1 100644 --- a/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py +++ b/airbyte-integrations/connectors/source-zendesk-support/unit_tests/unit_test.py @@ -135,7 +135,7 @@ def test_check(response, check_passed): [ ({"ticket_forms": [{"id": 1, "updated_at": "2021-07-08T00:05:45Z"}]}, 200, 18, []), ({"error": "Not sufficient permissions"}, 403, 17, [ - "An exception occurred while trying to access TicketForms stream: 403 Client" + "Skipping stream ticket_forms: Check permissions, error message: Not sufficient permissions." ]), ], ids=["forms_accessible", "forms_inaccessible"], @@ -144,7 +144,7 @@ def test_full_access_streams(caplog, requests_mock, ticket_forms_response, statu requests_mock.get("/api/v2/ticket_forms", status_code=status_code, json=ticket_forms_response) result = SourceZendeskSupport().streams(config=TEST_CONFIG) assert len(result) == expected_n_streams - logged_warnings = iter([record for record in caplog.records if record.levelname == "WARNING"]) + logged_warnings = iter([record for record in caplog.records if record.levelname == "ERROR"]) for msg in expected_warnings: assert msg in next(logged_warnings).message diff --git a/docs/integrations/sources/zendesk-support.md b/docs/integrations/sources/zendesk-support.md index 86a0bea5000f7..8fe640bb4f490 100644 --- a/docs/integrations/sources/zendesk-support.md +++ b/docs/integrations/sources/zendesk-support.md @@ -60,7 +60,9 @@ The Zendesk connector ideally should not run into Zendesk API limitations under | Version | Date | Pull Request | Subject | |:---------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `0.2.21` | 2023-01-27 | [22027](https://github.com/airbytehq/airbyte/pull/22027) | Set `AvailabilityStrategy` for streams explicitly to `None` | +| `0.2.23` | 2023-02-15 | [23035](https://github.com/airbytehq/airbyte/pull/23035) | Handle 403 Error | +| `0.2.22` | 2023-02-14 | [22483](https://github.com/airbytehq/airbyte/pull/22483) | Fix test; handle 400 error | +| `0.2.21` | 2023-01-27 | [22027](https://github.com/airbytehq/airbyte/pull/22027) | Set `AvailabilityStrategy` for streams explicitly to `None` | | `0.2.20` | 2022-12-28 | [20900](https://github.com/airbytehq/airbyte/pull/20900) | Remove synchronous time.sleep, add logging, reduce backoff time | | `0.2.19` | 2022-12-09 | [19967](https://github.com/airbytehq/airbyte/pull/19967) | Fix reading response for more than 100k records | | `0.2.18` | 2022-11-29 | [19432](https://github.com/airbytehq/airbyte/pull/19432) | Revert changes from version 0.2.15, use a test read instead |