From f3fd105243e5b643c4b428344af527c70a7b89c2 Mon Sep 17 00:00:00 2001 From: brianjlai Date: Sat, 16 Sep 2023 23:31:13 -0700 Subject: [PATCH 1/2] fix issue if metrics or dimensions api response does not have name field --- .../connectors/source-google-analytics-data-api/Dockerfile | 2 +- .../source-google-analytics-data-api/metadata.yaml | 2 +- .../source_google_analytics_data_api/source.py | 6 +++--- docs/integrations/sources/google-analytics-data-api.md | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile b/airbyte-integrations/connectors/source-google-analytics-data-api/Dockerfile index 09953f0e5dbf7..dff889abdfd25 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=1.4.0 +LABEL io.airbyte.version=1.4.1 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 1431d9caa5d32..d71a5673217cc 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: 1.4.0 + dockerImageTag: 1.4.1 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/source.py b/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/source.py index dfdbff5711aeb..b3099c704277d 100644 --- a/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/source.py +++ b/airbyte-integrations/connectors/source-google-analytics-data-api/source_google_analytics_data_api/source.py @@ -229,9 +229,9 @@ def parse_response( ) -> Iterable[Mapping]: r = response.json() - dimensions = [h.get("name").replace(":", "_") for h in r.get("dimensionHeaders", [{}])] - metrics = [h.get("name").replace(":", "_") for h in r.get("metricHeaders", [{}])] - metrics_type_map = {h.get("name").replace(":", "_"): h.get("type") for h in r.get("metricHeaders", [{}])} + dimensions = [h.get("name").replace(":", "_") if "name" in h else None for h in r.get("dimensionHeaders", [{}])] + metrics = [h.get("name").replace(":", "_") if "name" in h else None for h in r.get("metricHeaders", [{}])] + metrics_type_map = {h.get("name").replace(":", "_"): h.get("type") for h in r.get("metricHeaders", [{}]) if "name" in h} for row in r.get("rows", []): record = { diff --git a/docs/integrations/sources/google-analytics-data-api.md b/docs/integrations/sources/google-analytics-data-api.md index 2d90d3e675987..42bdf879fb774 100644 --- a/docs/integrations/sources/google-analytics-data-api.md +++ b/docs/integrations/sources/google-analytics-data-api.md @@ -274,6 +274,7 @@ The Google Analytics connector is subject to Google Analytics Data API quotas. P | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------| +| 1.4.1 | 2023-09-17 | [tbd](https://github.com/airbytehq/airbyte/pull/tbd) | Fix None type error when metrics or dimensions response does not have name | | 1.4.0 | 2023-09-15 | [30417](https://github.com/airbytehq/airbyte/pull/30417) | Change start date to optional; add suggested streams and update errors handling | | 1.3.1 | 2023-09-14 | [30424](https://github.com/airbytehq/airbyte/pull/30424) | Fixed duplicated stream issue | | 1.2.0 | 2023-09-11 | [30290](https://github.com/airbytehq/airbyte/pull/30290) | Add new preconfigured reports | From 6fad5561b02411fe3405f5515b72d441c5b88a46 Mon Sep 17 00:00:00 2001 From: brianjlai Date: Sat, 16 Sep 2023 23:40:15 -0700 Subject: [PATCH 2/2] update changelog with pr --- docs/integrations/sources/google-analytics-data-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/google-analytics-data-api.md b/docs/integrations/sources/google-analytics-data-api.md index 42bdf879fb774..74c6ba283f3f6 100644 --- a/docs/integrations/sources/google-analytics-data-api.md +++ b/docs/integrations/sources/google-analytics-data-api.md @@ -274,7 +274,7 @@ The Google Analytics connector is subject to Google Analytics Data API quotas. P | Version | Date | Pull Request | Subject | |:--------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------| -| 1.4.1 | 2023-09-17 | [tbd](https://github.com/airbytehq/airbyte/pull/tbd) | Fix None type error when metrics or dimensions response does not have name | +| 1.4.1 | 2023-09-17 | [30506](https://github.com/airbytehq/airbyte/pull/30506) | Fix None type error when metrics or dimensions response does not have name | | 1.4.0 | 2023-09-15 | [30417](https://github.com/airbytehq/airbyte/pull/30417) | Change start date to optional; add suggested streams and update errors handling | | 1.3.1 | 2023-09-14 | [30424](https://github.com/airbytehq/airbyte/pull/30424) | Fixed duplicated stream issue | | 1.2.0 | 2023-09-11 | [30290](https://github.com/airbytehq/airbyte/pull/30290) | Add new preconfigured reports |