From 0f8f6a5f2406b62b198e5b59beb87f2b0b0aa524 Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 11:25:14 +0200 Subject: [PATCH 1/6] 9017 Fix fetching and update schema for `filters` stream --- .../connectors/source-jira/source_jira/schemas/filters.json | 6 ++++++ .../connectors/source-jira/source_jira/streams.py | 5 +++++ docs/integrations/sources/jira.md | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json index 5fb025213844..91f2a33d6e86 100644 --- a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json +++ b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json @@ -2,6 +2,9 @@ "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { + "expand": { + "type": "string" + }, "self": { "type": "string", "description": "The URL of the filter.", @@ -2590,6 +2593,9 @@ } } }, + "isWritable": { + "type": "boolean" + }, "subscriptions": { "type": "array", "description": "The users that are subscribed to the filter.", diff --git a/airbyte-integrations/connectors/source-jira/source_jira/streams.py b/airbyte-integrations/connectors/source-jira/source_jira/streams.py index c11b12a02fbf..eb33f5c79731 100644 --- a/airbyte-integrations/connectors/source-jira/source_jira/streams.py +++ b/airbyte-integrations/connectors/source-jira/source_jira/streams.py @@ -286,6 +286,11 @@ class Filters(JiraStream): def path(self, **kwargs) -> str: return "filter/search" + def request_params(self, **kwargs) -> MutableMapping[str, Any]: + params = super().request_params(**kwargs) + params["expand"] = "description,owner,jql,viewUrl,searchUrl,favourite,favouritedCount,sharePermissions,isWritable,subscriptions" + return params + class FilterSharing(JiraStream): """ diff --git a/docs/integrations/sources/jira.md b/docs/integrations/sources/jira.md index 5941e07a078f..b085b67daa11 100644 --- a/docs/integrations/sources/jira.md +++ b/docs/integrations/sources/jira.md @@ -85,7 +85,8 @@ The Jira connector should not run into Jira API limitations under normal usage. | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | -| 0.2.16 | 2021-12-21 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | +| 0.2.17 | 2021-12-21 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | +| 0.2.16 | 2021-12-23 | [\#9079](https://github.com/airbytehq/airbyte/pull/9079) | Update schema for `filters` stream + fix fetching `filters` stream | | 0.2.15 | 2021-11-01 | [\#7398](https://github.com/airbytehq/airbyte/pull/7398) | Add option to render fields in HTML format and fix sprint_issue ids | | 0.2.14 | 2021-10-27 | [\#7408](https://github.com/airbytehq/airbyte/pull/7408) | Fix normalization step error. Fix schemas. Fix `acceptance-test-config.yml`. Fix `streams.py`. | | 0.2.13 | 2021-10-20 | [\#7222](https://github.com/airbytehq/airbyte/pull/7222) | Source Jira: Make recently added configs optional for backwards compatibility | From d8fe196364fccdcc06b2a1729c788f1d0d75b47b Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 16:26:26 +0200 Subject: [PATCH 2/6] 9017 Bump connector's version --- airbyte-integrations/connectors/source-jira/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-jira/Dockerfile b/airbyte-integrations/connectors/source-jira/Dockerfile index ed82b96a277c..91d703b008cc 100644 --- a/airbyte-integrations/connectors/source-jira/Dockerfile +++ b/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.2.16 +LABEL io.airbyte.version=0.2.17 LABEL io.airbyte.name=airbyte/source-jira From 0dd505cb9fed0cae84f049b50f06b3e386c18fba Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 16:29:26 +0200 Subject: [PATCH 3/6] 9017 Update docs --- docs/integrations/sources/jira.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/integrations/sources/jira.md b/docs/integrations/sources/jira.md index b085b67daa11..e5f6b4a04d3f 100644 --- a/docs/integrations/sources/jira.md +++ b/docs/integrations/sources/jira.md @@ -85,8 +85,8 @@ The Jira connector should not run into Jira API limitations under normal usage. | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | -| 0.2.17 | 2021-12-21 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | -| 0.2.16 | 2021-12-23 | [\#9079](https://github.com/airbytehq/airbyte/pull/9079) | Update schema for `filters` stream + fix fetching `filters` stream | +| 0.2.17 | 2021-12-23 | [\#9079](https://github.com/airbytehq/airbyte/pull/9079) | Update schema for `filters` stream + fix fetching `filters` stream | +| 0.2.16 | 2021-12-23 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | | 0.2.15 | 2021-11-01 | [\#7398](https://github.com/airbytehq/airbyte/pull/7398) | Add option to render fields in HTML format and fix sprint_issue ids | | 0.2.14 | 2021-10-27 | [\#7408](https://github.com/airbytehq/airbyte/pull/7408) | Fix normalization step error. Fix schemas. Fix `acceptance-test-config.yml`. Fix `streams.py`. | | 0.2.13 | 2021-10-20 | [\#7222](https://github.com/airbytehq/airbyte/pull/7222) | Source Jira: Make recently added configs optional for backwards compatibility | From 1b965f2f8f90636c72d16ac40e15cae96a1fd6eb Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 16:50:14 +0200 Subject: [PATCH 4/6] 9017 Update docs --- docs/integrations/sources/jira.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/jira.md b/docs/integrations/sources/jira.md index e5f6b4a04d3f..b87fad64a0e4 100644 --- a/docs/integrations/sources/jira.md +++ b/docs/integrations/sources/jira.md @@ -86,7 +86,7 @@ The Jira connector should not run into Jira API limitations under normal usage. | Version | Date | Pull Request | Subject | | :--- | :--- | :--- | :--- | | 0.2.17 | 2021-12-23 | [\#9079](https://github.com/airbytehq/airbyte/pull/9079) | Update schema for `filters` stream + fix fetching `filters` stream | -| 0.2.16 | 2021-12-23 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | +| 0.2.16 | 2021-12-21 | [\#8999](https://github.com/airbytehq/airbyte/pull/8999) | Update connector fields title/description | | 0.2.15 | 2021-11-01 | [\#7398](https://github.com/airbytehq/airbyte/pull/7398) | Add option to render fields in HTML format and fix sprint_issue ids | | 0.2.14 | 2021-10-27 | [\#7408](https://github.com/airbytehq/airbyte/pull/7408) | Fix normalization step error. Fix schemas. Fix `acceptance-test-config.yml`. Fix `streams.py`. | | 0.2.13 | 2021-10-20 | [\#7222](https://github.com/airbytehq/airbyte/pull/7222) | Source Jira: Make recently added configs optional for backwards compatibility | From a1c5a8da51c00b0e2f5cd07cf8c8e113a1e01385 Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 17:13:33 +0200 Subject: [PATCH 5/6] 9017 Set additionalProperties to false --- .../connectors/source-jira/source_jira/schemas/filters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json index 91f2a33d6e86..31c9d2e29ff1 100644 --- a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json +++ b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json @@ -2862,6 +2862,6 @@ } } }, - "additionalProperties": true, + "additionalProperties": false, "description": "Details of a filter." } From 7f03e1071c4c099395f2ccd9840fbb405367b123 Mon Sep 17 00:00:00 2001 From: oleh Date: Thu, 23 Dec 2021 17:52:10 +0200 Subject: [PATCH 6/6] 9017 Bump connector's version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 99d33201ce44..13b72ff0a739 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -322,7 +322,7 @@ - name: Jira sourceDefinitionId: 68e63de2-bb83-4c7e-93fa-a8a9051e3993 dockerRepository: airbyte/source-jira - dockerImageTag: 0.2.16 + dockerImageTag: 0.2.17 documentationUrl: https://docs.airbyte.io/integrations/sources/jira icon: jira.svg sourceType: api 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 5d02033c3cdd..53642e8cdee1 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -3136,7 +3136,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-jira:0.2.16" +- dockerImage: "airbyte/source-jira:0.2.17" spec: documentationUrl: "https://docs.airbyte.io/integrations/sources/jira" connectionSpecification: