From 055fef195d4ce20354bcb234679f17d63f3e10fd Mon Sep 17 00:00:00 2001 From: Arsen Losenko <20901439+arsenlosenko@users.noreply.github.com> Date: Thu, 1 Jun 2023 13:25:14 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Source=20Asana:=20migrate=20?= =?UTF-8?q?to=20advancedAuth=20(#26716)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Source Asana: migrate to advancedAuth * Update changelog and metadata.yml * Add predicate key and predicate value to spec * Update connector version and advancedAuth path --- .../connectors/source-asana/Dockerfile | 2 +- .../connectors/source-asana/metadata.yaml | 2 +- .../source-asana/source_asana/spec.json | 53 ++++++++++++++++--- docs/integrations/sources/asana.md | 1 + 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/airbyte-integrations/connectors/source-asana/Dockerfile b/airbyte-integrations/connectors/source-asana/Dockerfile index 677255da0f151..07ff709fff050 100644 --- a/airbyte-integrations/connectors/source-asana/Dockerfile +++ b/airbyte-integrations/connectors/source-asana/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.1.6 +LABEL io.airbyte.version=0.1.7 LABEL io.airbyte.name=airbyte/source-asana diff --git a/airbyte-integrations/connectors/source-asana/metadata.yaml b/airbyte-integrations/connectors/source-asana/metadata.yaml index 3ee7abd7dcbb8..0cbb9c20b0e96 100644 --- a/airbyte-integrations/connectors/source-asana/metadata.yaml +++ b/airbyte-integrations/connectors/source-asana/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: api connectorType: source definitionId: d0243522-dccf-4978-8ba0-37ed47a0bdbf - dockerImageTag: 0.1.6 + dockerImageTag: 0.1.7 dockerRepository: airbyte/source-asana githubIssueLabel: source-asana icon: asana.svg diff --git a/airbyte-integrations/connectors/source-asana/source_asana/spec.json b/airbyte-integrations/connectors/source-asana/source_asana/spec.json index a7eeab0cd541b..b6903849cb002 100644 --- a/airbyte-integrations/connectors/source-asana/source_asana/spec.json +++ b/airbyte-integrations/connectors/source-asana/source_asana/spec.json @@ -65,12 +65,53 @@ } } }, - "authSpecification": { - "auth_type": "oauth2.0", - "oauth2Specification": { - "rootObject": ["credentials", 0], - "oauthFlowInitParameters": [["client_id"], ["client_secret"]], - "oauthFlowOutputParameters": [["refresh_token"]] + "advanced_auth": { + "auth_flow_type": "oauth2.0", + "predicate_key": [ + "credentials", + "option_title" + ], + "predicate_value": "OAuth Credentials", + "oauth_config_specification": { + "complete_oauth_output_specification": { + "type": "object", + "properties": { + "refresh_token": { + "type": "string", + "path_in_connector_config": [ + "credentials", "refresh_token" + ] + } + } + }, + "complete_oauth_server_input_specification": { + "type": "object", + "properties": { + "client_id": { + "type": "string" + }, + "client_secret": { + "type": "string" + } + } + }, + "complete_oauth_server_output_specification": { + "type": "object", + "properties": { + "client_id": { + "type": "string", + "path_in_connector_config": [ + "credentials", "client_id" + ] + }, + "client_secret": { + "type": "string", + "path_in_connector_config": [ + "credentials","client_secret" + ] + } + } + } } } } diff --git a/docs/integrations/sources/asana.md b/docs/integrations/sources/asana.md index 61942807a9e0b..dede4313e1a3e 100644 --- a/docs/integrations/sources/asana.md +++ b/docs/integrations/sources/asana.md @@ -68,6 +68,7 @@ The connector is restricted by normal Asana [requests limitation](https://develo | Version | Date | Pull Request | Subject | | :------ | :--------- | :------------------------------------------------------- | :--------------------------------------------------------- | +| 0.1.7 | 2023-05-29 | [26716](https://github.com/airbytehq/airbyte/pull/26716) | Remove authSpecification from spec.json, use advancedAuth instead | | 0.1.6 | 2023-05-26 | [26653](https://github.com/airbytehq/airbyte/pull/26653) | Fix order of authentication methods | | 0.1.5 | 2022-11-16 | [19561](https://github.com/airbytehq/airbyte/pull/19561) | Added errors handling, updated SAT with new format | | 0.1.4 | 2022-08-18 | [15749](https://github.com/airbytehq/airbyte/pull/15749) | Add cache to project stream | From 7c6b7da7914df60f1a93f4f603791b444f1bc025 Mon Sep 17 00:00:00 2001 From: Denys Davydov Date: Thu, 1 Jun 2023 13:44:49 +0300 Subject: [PATCH 2/3] :bug: Source Google Analytics Data API: deprecate authSpecification (#26887) * Connector health: source hubspot, gitlab, snapchat-marketing: fix builds * #26230 source GA data api: deprecate authSpecification * source GA data API: update changelog --- .../Dockerfile | 2 +- .../metadata.yaml | 2 +- .../spec.json | 63 +++++++++++++++++-- .../sources/google-analytics-data-api.md | 1 + 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile b/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile index 3a2b5695e8699..e522f2782acf1 100644 --- a/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile +++ b/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile @@ -28,5 +28,5 @@ COPY source_google_analytics_data_api ./source_google_analytics_data_api ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.2.3 +LABEL io.airbyte.version=0.2.4 LABEL io.airbyte.name=airbyte/source-google-analytics-data-api diff --git a/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml b/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml index 01d47a913f521..245b87dc8cdb9 100644 --- a/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml +++ b/airbyte-integrations/connectors/source-google-analytics-data-api/metadata.yaml @@ -7,7 +7,7 @@ data: connectorSubtype: api connectorType: source definitionId: 3cc2eafd-84aa-4dca-93af-322d9dfeec1a - dockerImageTag: 0.2.3 + dockerImageTag: 0.2.4 dockerRepository: airbyte/source-google-analytics-data-api githubIssueLabel: source-google-analytics-data-api icon: google-analytics.svg diff --git a/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/spec.json b/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/spec.json index be07eb2948440..fa001dc23db1c 100644 --- a/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/spec.json +++ b/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/spec.json @@ -109,12 +109,63 @@ } } }, - "authSpecification": { - "auth_type": "oauth2.0", - "oauth2Specification": { - "rootObject": ["credentials", 0], - "oauthFlowInitParameters": [["client_id"], ["client_secret"]], - "oauthFlowOutputParameters": [["access_token"], ["refresh_token"]] + "advanced_auth": { + "auth_flow_type": "oauth2.0", + "predicate_key": [ + "credentials", + "auth_type" + ], + "predicate_value": "Client", + "oauth_config_specification": { + "complete_oauth_output_specification": { + "type": "object", + "properties": { + "access_token": { + "type": "string", + "path_in_connector_config": [ + "credentials", + "access_token" + ] + }, + "refresh_token": { + "type": "string", + "path_in_connector_config": [ + "credentials", + "refresh_token" + ] + } + } + }, + "complete_oauth_server_input_specification": { + "type": "object", + "properties": { + "client_id": { + "type": "string" + }, + "client_secret": { + "type": "string" + } + } + }, + "complete_oauth_server_output_specification": { + "type": "object", + "properties": { + "client_id": { + "type": "string", + "path_in_connector_config": [ + "credentials", + "client_id" + ] + }, + "client_secret": { + "type": "string", + "path_in_connector_config": [ + "credentials", + "client_secret" + ] + } + } + } } } } diff --git a/docs/integrations/sources/google-analytics-data-api.md b/docs/integrations/sources/google-analytics-data-api.md index e98bf33a93da4..7debb0665e8ee 100644 --- a/docs/integrations/sources/google-analytics-data-api.md +++ b/docs/integrations/sources/google-analytics-data-api.md @@ -112,6 +112,7 @@ This connector outputs the following incremental streams: | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:------------------------------------------------------------------------------| +| 0.2.4 | 2023-06-01 | [26887](https://github.com/airbytehq/airbyte/pull/26887) | Remove `authSpecification` from connector spec in favour of `advancedAuth` | | 0.2.3 | 2023-05-16 | [26126](https://github.com/airbytehq/airbyte/pull/26126) | Fix pagination | | 0.2.2 | 2023-05-12 | [25987](https://github.com/airbytehq/airbyte/pull/25987) | Categorized Config Errors Accurately | | 0.2.1 | 2023-05-11 | [26008](https://github.com/airbytehq/airbyte/pull/26008) | Added handling for `429 - potentiallyThresholdedRequestsPerHour` error | From 7b55372e54d219e1bfd4d953237ddda2d8ddde67 Mon Sep 17 00:00:00 2001 From: Anatolii Yatsuk <35109939+tolik0@users.noreply.github.com> Date: Thu, 1 Jun 2023 13:58:12 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Source=20Hubspot:=20migrate?= =?UTF-8?q?=20to=20advancedAuth=20(#26831)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove authSpecification from connector specification in favour of advancedAuth --- .../connectors/source-hubspot/Dockerfile | 2 +- .../connectors/source-hubspot/metadata.yaml | 2 +- .../source-hubspot/source_hubspot/spec.yaml | 53 ++++++++++++++----- docs/integrations/sources/hubspot.md | 1 + 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/airbyte-integrations/connectors/source-hubspot/Dockerfile b/airbyte-integrations/connectors/source-hubspot/Dockerfile index ba362dd76af75..844d6ba0c7df4 100644 --- a/airbyte-integrations/connectors/source-hubspot/Dockerfile +++ b/airbyte-integrations/connectors/source-hubspot/Dockerfile @@ -34,5 +34,5 @@ COPY source_hubspot ./source_hubspot ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.8.2 +LABEL io.airbyte.version=0.8.3 LABEL io.airbyte.name=airbyte/source-hubspot diff --git a/airbyte-integrations/connectors/source-hubspot/metadata.yaml b/airbyte-integrations/connectors/source-hubspot/metadata.yaml index b3d5e7c4f3002..d3a108e829621 100644 --- a/airbyte-integrations/connectors/source-hubspot/metadata.yaml +++ b/airbyte-integrations/connectors/source-hubspot/metadata.yaml @@ -5,7 +5,7 @@ data: connectorSubtype: api connectorType: source definitionId: 36c891d9-4bd9-43ac-bad2-10e12756272c - dockerImageTag: 0.8.2 + dockerImageTag: 0.8.3 dockerRepository: airbyte/source-hubspot githubIssueLabel: source-hubspot icon: hubspot.svg diff --git a/airbyte-integrations/connectors/source-hubspot/source_hubspot/spec.yaml b/airbyte-integrations/connectors/source-hubspot/source_hubspot/spec.yaml index da0dc0ef91b24..8dd2b446cc2c8 100644 --- a/airbyte-integrations/connectors/source-hubspot/source_hubspot/spec.yaml +++ b/airbyte-integrations/connectors/source-hubspot/source_hubspot/spec.yaml @@ -33,7 +33,7 @@ connectionSpecification: properties: credentials_title: type: string - title: Credentials + title: Auth Type description: Name of the credentials const: OAuth Credentials order: 0 @@ -74,7 +74,7 @@ connectionSpecification: properties: credentials_title: type: string - title: Credentials + title: Auth Type description: Name of the credentials set const: Private App Credentials order: 0 @@ -86,14 +86,41 @@ connectionSpecification: if you need help finding this token. type: string airbyte_secret: true -authSpecification: - auth_type: oauth2.0 - oauth2Specification: - rootObject: - - credentials - - "0" - oauthFlowInitParameters: - - ["client_id"] - - ["client_secret"] - oauthFlowOutputParameters: - - ["refresh_token"] +advanced_auth: + auth_flow_type: oauth2.0 + predicate_key: + - credentials + - credentials_title + predicate_value: OAuth Credentials + oauth_config_specification: + complete_oauth_output_specification: + type: object + additionalProperties: false + properties: + refresh_token: + type: string + path_in_connector_config: + - credentials + - refresh_token + complete_oauth_server_input_specification: + type: object + additionalProperties: false + properties: + client_id: + type: string + client_secret: + type: string + complete_oauth_server_output_specification: + type: object + additionalProperties: false + properties: + client_id: + type: string + path_in_connector_config: + - credentials + - client_id + client_secret: + type: string + path_in_connector_config: + - credentials + - client_secret diff --git a/docs/integrations/sources/hubspot.md b/docs/integrations/sources/hubspot.md index ea2da45f776c2..8e665933e30b9 100644 --- a/docs/integrations/sources/hubspot.md +++ b/docs/integrations/sources/hubspot.md @@ -146,6 +146,7 @@ Now that you have set up the Hubspot source connector, check out the following H ## Changelog | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------| +| 0.8.3 | 2023-05-31 | [26831](https://github.com/airbytehq/airbyte/pull/26831) | Remove authSpecification from connector specification in favour of advancedAuth | | 0.8.2 | 2023-05-16 | [26418](https://github.com/airbytehq/airbyte/pull/26418) | Added custom availability strategy which catches permission errors from parent streams | | 0.8.1 | 2023-05-29 | [26719](https://github.com/airbytehq/airbyte/pull/26719) | Handle issue when `state` value is literally `"" (empty str)` | | 0.8.0 | 2023-04-10 | [16032](https://github.com/airbytehq/airbyte/pull/16032) | Add new stream `Custom Object` |