From cbec46a92b5c35761083e440bdc080a313c66fb6 Mon Sep 17 00:00:00 2001 From: Christophe Duong Date: Mon, 27 Sep 2021 13:52:44 +0200 Subject: [PATCH 1/4] Update Google Analytics Oauth Specs --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- .../connectors/source-google-analytics-v4/Dockerfile | 2 +- .../source_google_analytics_v4/spec.json | 7 ++++--- docs/integrations/sources/google-analytics-v4.md | 1 + 4 files changed, 7 insertions(+), 5 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 cee91b610a7c..d82d38e4b9d1 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -140,7 +140,7 @@ - sourceDefinitionId: eff3616a-f9c3-11eb-9a03-0242ac130003 name: Google Analytics v4 dockerRepository: airbyte/source-google-analytics-v4 - dockerImageTag: 0.1.3 + dockerImageTag: 0.1.4 documentationUrl: https://docs.airbyte.io/integrations/sources/source-google-analytics-v4 icon: google-analytics.svg sourceType: api diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile b/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile index 217496b57004..23771228a3a1 100644 --- a/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile +++ b/airbyte-integrations/connectors/source-google-analytics-v4/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.3 +LABEL io.airbyte.version=0.1.4 LABEL io.airbyte.name=airbyte/source-google-analytics-v4 diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json index 7231817271a2..27753408bc2f 100644 --- a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json +++ b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json @@ -75,11 +75,12 @@ "authSpecification": { "auth_type": "oauth2.0", "oauth2Specification": { + "rootObject": ["credentials", 0], "oauthFlowInitParameters": [ ["credentials", "client_id"], - ["credentials", "client_secret"], - ["credentials", "refresh_token"] - ] + ["credentials", "client_secret"] + ], + "oauthFlowOutputParameters": [["credentials", "refresh_token"]] } } } diff --git a/docs/integrations/sources/google-analytics-v4.md b/docs/integrations/sources/google-analytics-v4.md index cec3487c9612..8a7c085cbee4 100644 --- a/docs/integrations/sources/google-analytics-v4.md +++ b/docs/integrations/sources/google-analytics-v4.md @@ -129,6 +129,7 @@ Incremental sync supports only if you add `ga:date` dimension to your custom rep | Version | Date | Pull Request | Subject | | :------ | :-------- | :----- | :------ | +| `0.1.4` | 2021-09-27 | [???](https://github.com/airbytehq/airbyte/pull/) | Update OAuth Spec File | | 0.1.3 | 2021-09-21 | [6357](https://github.com/airbytehq/airbyte/pull/6357) | Fix oauth workflow parameters | | 0.1.2 | 2021-09-20 | [6306](https://github.com/airbytehq/airbyte/pull/6306) | Support of airbyte OAuth initialization flow | | 0.1.1 | 2021-08-25 | [5655](https://github.com/airbytehq/airbyte/pull/5655) | Corrected validation of empty custom report| From 2549d60fdbc5574a25c735489c8485a40f2e0fba Mon Sep 17 00:00:00 2001 From: Christophe Duong Date: Mon, 27 Sep 2021 14:02:04 +0200 Subject: [PATCH 2/4] Update docs/integrations/sources/google-analytics-v4.md --- docs/integrations/sources/google-analytics-v4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/google-analytics-v4.md b/docs/integrations/sources/google-analytics-v4.md index 8a7c085cbee4..dadf63ad7b1a 100644 --- a/docs/integrations/sources/google-analytics-v4.md +++ b/docs/integrations/sources/google-analytics-v4.md @@ -129,7 +129,7 @@ Incremental sync supports only if you add `ga:date` dimension to your custom rep | Version | Date | Pull Request | Subject | | :------ | :-------- | :----- | :------ | -| `0.1.4` | 2021-09-27 | [???](https://github.com/airbytehq/airbyte/pull/) | Update OAuth Spec File | +| `0.1.4` | 2021-09-27 | [6459](https://github.com/airbytehq/airbyte/pull/6459) | Update OAuth Spec File | | 0.1.3 | 2021-09-21 | [6357](https://github.com/airbytehq/airbyte/pull/6357) | Fix oauth workflow parameters | | 0.1.2 | 2021-09-20 | [6306](https://github.com/airbytehq/airbyte/pull/6306) | Support of airbyte OAuth initialization flow | | 0.1.1 | 2021-08-25 | [5655](https://github.com/airbytehq/airbyte/pull/5655) | Corrected validation of empty custom report| From 963ab06130183f4c087531316871ecfd82f19381 Mon Sep 17 00:00:00 2001 From: Christophe Duong Date: Mon, 27 Sep 2021 17:40:09 +0200 Subject: [PATCH 3/4] Add access_token to list of outputs params --- .../source_google_analytics_v4/spec.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json index 27753408bc2f..164cc0cc9fc2 100644 --- a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json +++ b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json @@ -22,7 +22,8 @@ }, "client_id": { "type": "string" }, "client_secret": { "type": "string", "airbyte_secret": true }, - "refresh_token": { "type": "string", "airbyte_secret": true } + "refresh_token": { "type": "string", "airbyte_secret": true }, + "access_token": { "type": "string", "airbyte_secret": true } }, "required": ["client_id", "client_secret", "refresh_token"], "additionalProperties": false @@ -80,7 +81,10 @@ ["credentials", "client_id"], ["credentials", "client_secret"] ], - "oauthFlowOutputParameters": [["credentials", "refresh_token"]] + "oauthFlowOutputParameters": [ + ["credentials", "access_token"], + ["credentials", "refresh_token"] + ] } } } From e717773d10d7586b28883bbafb603e96e3769db4 Mon Sep 17 00:00:00 2001 From: Christophe Duong Date: Mon, 27 Sep 2021 19:54:29 +0200 Subject: [PATCH 4/4] Don't repeat rootObject in path to oauth properties --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- .../connectors/source-google-analytics-v4/Dockerfile | 2 +- .../source_google_analytics_v4/spec.json | 8 ++++---- docs/integrations/sources/google-analytics-v4.md | 2 +- 4 files changed, 7 insertions(+), 7 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 d82d38e4b9d1..8c50ca5effcd 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -140,7 +140,7 @@ - sourceDefinitionId: eff3616a-f9c3-11eb-9a03-0242ac130003 name: Google Analytics v4 dockerRepository: airbyte/source-google-analytics-v4 - dockerImageTag: 0.1.4 + dockerImageTag: 0.1.5 documentationUrl: https://docs.airbyte.io/integrations/sources/source-google-analytics-v4 icon: google-analytics.svg sourceType: api diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile b/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile index 23771228a3a1..e060667507cc 100644 --- a/airbyte-integrations/connectors/source-google-analytics-v4/Dockerfile +++ b/airbyte-integrations/connectors/source-google-analytics-v4/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.4 +LABEL io.airbyte.version=0.1.5 LABEL io.airbyte.name=airbyte/source-google-analytics-v4 diff --git a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json index 164cc0cc9fc2..b9cb21925c5d 100644 --- a/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json +++ b/airbyte-integrations/connectors/source-google-analytics-v4/source_google_analytics_v4/spec.json @@ -78,12 +78,12 @@ "oauth2Specification": { "rootObject": ["credentials", 0], "oauthFlowInitParameters": [ - ["credentials", "client_id"], - ["credentials", "client_secret"] + ["client_id"], + ["client_secret"] ], "oauthFlowOutputParameters": [ - ["credentials", "access_token"], - ["credentials", "refresh_token"] + ["access_token"], + ["refresh_token"] ] } } diff --git a/docs/integrations/sources/google-analytics-v4.md b/docs/integrations/sources/google-analytics-v4.md index dadf63ad7b1a..3eedd7c3ef4d 100644 --- a/docs/integrations/sources/google-analytics-v4.md +++ b/docs/integrations/sources/google-analytics-v4.md @@ -129,7 +129,7 @@ Incremental sync supports only if you add `ga:date` dimension to your custom rep | Version | Date | Pull Request | Subject | | :------ | :-------- | :----- | :------ | -| `0.1.4` | 2021-09-27 | [6459](https://github.com/airbytehq/airbyte/pull/6459) | Update OAuth Spec File | +| 0.1.5 | 2021-09-27 | [6459](https://github.com/airbytehq/airbyte/pull/6459) | Update OAuth Spec File | | 0.1.3 | 2021-09-21 | [6357](https://github.com/airbytehq/airbyte/pull/6357) | Fix oauth workflow parameters | | 0.1.2 | 2021-09-20 | [6306](https://github.com/airbytehq/airbyte/pull/6306) | Support of airbyte OAuth initialization flow | | 0.1.1 | 2021-08-25 | [5655](https://github.com/airbytehq/airbyte/pull/5655) | Corrected validation of empty custom report|