From 35822eda74f0d5b208d4c50133fee155949ae224 Mon Sep 17 00:00:00 2001 From: Christo Grabowski Date: Fri, 28 Jul 2023 13:39:41 -0400 Subject: [PATCH 1/6] update field descriptions --- .../source_google_ads/spec.json | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json index 2441f8e31c32a..5af0fbfea70d6 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json @@ -23,34 +23,34 @@ "type": "string", "title": "Developer Token", "order": 0, - "description": "Developer token granted by Google to use their APIs. More instruction on how to find this value in our docs", + "description": "The Developer Token granted by Google to use their APIs. For detailed instructions on finding this value, refer to our documentation.", "airbyte_secret": true }, "client_id": { "type": "string", "title": "Client ID", "order": 1, - "description": "The Client ID of your Google Ads developer application. More instruction on how to find this value in our docs" + "description": "The Client ID of your Google Ads developer application. For detailed instructions on finding this value, refer to our documentation." }, "client_secret": { "type": "string", "title": "Client Secret", "order": 2, - "description": "The Client Secret of your Google Ads developer application. More instruction on how to find this value in our docs", + "description": "The Client Secret of your Google Ads developer application. For detailed instructions on finding this value, refer to our documentation.", "airbyte_secret": true }, "refresh_token": { "type": "string", "title": "Refresh Token", "order": 3, - "description": "The token for obtaining a new access token. More instruction on how to find this value in our docs", + "description": "The token used to obtain a new Access Token. For detailed instructions on finding this value, refer to our documentation.", "airbyte_secret": true }, "access_token": { "type": "string", "title": "Access Token", "order": 4, - "description": "Access Token for making authenticated requests. More instruction on how to find this value in our docs", + "description": "The Access Token for making authenticated requests. For detailed instructions on finding this value, refer to our documentation.", "airbyte_secret": true } } @@ -58,7 +58,7 @@ "customer_id": { "title": "Customer ID(s)", "type": "string", - "description": "Comma separated list of (client) customer IDs. Each customer ID must be specified as a 10-digit number without dashes. More instruction on how to find this value in our docs. Metrics streams like AdGroupAdReport cannot be requested for a manager account.", + "description": "Comma-separated list of (client) customer IDs. Each customer ID must be specified as a 10-digit number without dashes. For detailed instructions on finding this value, refer to our documentation.", "pattern": "^[0-9]{10}(,[0-9]{10})*$", "pattern_descriptor": "The customer ID must be 10 digits. Separate multiple customer IDs using commas.", "examples": ["6783948572,5839201945"], @@ -67,7 +67,7 @@ "start_date": { "type": "string", "title": "Start Date", - "description": "UTC date and time in the format 2017-01-25. Any data before this date will not be replicated.", + "description": "UTC date in the format YYYY-MM-DD. Any data before this date will not be replicated.", "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}$", "pattern_descriptor": "YYYY-MM-DD", "examples": ["2017-01-25"], @@ -77,7 +77,7 @@ "end_date": { "type": "string", "title": "End Date", - "description": "UTC date and time in the format 2017-01-25. Any data after this date will not be replicated.", + "description": "UTC date in the format YYYY-MM-DD. Any data after this date will not be replicated.", "pattern": "^$|^[0-9]{4}-[0-9]{2}-[0-9]{2}$", "pattern_descriptor": "YYYY-MM-DD", "examples": ["2017-01-30"], @@ -97,7 +97,7 @@ "type": "string", "multiline": true, "title": "Custom Query", - "description": "A custom defined GAQL query for building the report. Should not contain segments.date expression because it is used by incremental streams. See Google's query builder for more information.", + "description": "A custom defined GAQL query for building the report. Avoid including the segments.date expression as it is used by incremental streams. For more information, refer to Google's documentation.", "examples": [ "SELECT segments.ad_destination_type, campaign.advertising_channel_sub_type FROM campaign WHERE campaign.status = 'PAUSED'" ] @@ -105,7 +105,7 @@ "table_name": { "type": "string", "title": "Destination Table Name", - "description": "The table name in your destination database for choosen query." + "description": "The table name in your destination database for the chosen query." } } } @@ -113,7 +113,8 @@ "login_customer_id": { "type": "string", "title": "Login Customer ID for Managed Accounts", - "description": "If your access to the customer account is through a manager account, this field is required and must be set to the customer ID of the manager account (10-digit number without dashes). More information about this field you can see here", + "description": "If your access to the customer account is through a manager account, this field is required, and must be set to the 10-digit customer ID of the manager account. For more information about this field, refer to Google's documentation.", + "pattern_descriptor": "The customer ID must be 10 digits, with no dashes.", "pattern": "^([0-9]{10})?$", "examples": ["7349206847"], "order": 4 @@ -121,7 +122,7 @@ "conversion_window_days": { "title": "Conversion Window", "type": "integer", - "description": "A conversion window is the period of time after an ad interaction (such as an ad click or video view) during which a conversion, such as a purchase, is recorded in Google Ads. For more information, see Google's documentation.", + "description": "A conversion window is the number of days after an ad interaction (such as an ad click or video view) during which a conversion, such as a purchase, is recorded in Google Ads. For more information, see Google's documentation.", "minimum": 0, "maximum": 1095, "default": 14, From ab500f46dd1c505741ac60cec8699015faf9096b Mon Sep 17 00:00:00 2001 From: Christo Grabowski Date: Fri, 28 Jul 2023 13:45:34 -0400 Subject: [PATCH 2/6] version bump --- airbyte-integrations/connectors/source-google-ads/Dockerfile | 2 +- airbyte-integrations/connectors/source-google-ads/metadata.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-google-ads/Dockerfile b/airbyte-integrations/connectors/source-google-ads/Dockerfile index c45ed9fe35869..6727c54ae4326 100644 --- a/airbyte-integrations/connectors/source-google-ads/Dockerfile +++ b/airbyte-integrations/connectors/source-google-ads/Dockerfile @@ -13,5 +13,5 @@ COPY main.py ./ ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.7.3 +LABEL io.airbyte.version=0.7.4 LABEL io.airbyte.name=airbyte/source-google-ads diff --git a/airbyte-integrations/connectors/source-google-ads/metadata.yaml b/airbyte-integrations/connectors/source-google-ads/metadata.yaml index b600eeef9970f..60b48bd684c83 100644 --- a/airbyte-integrations/connectors/source-google-ads/metadata.yaml +++ b/airbyte-integrations/connectors/source-google-ads/metadata.yaml @@ -6,7 +6,7 @@ data: connectorSubtype: api connectorType: source definitionId: 253487c0-2246-43ba-a21f-5116b20a2c50 - dockerImageTag: 0.7.3 + dockerImageTag: 0.7.4 dockerRepository: airbyte/source-google-ads githubIssueLabel: source-google-ads icon: google-adwords.svg From 3bd1684a8a96fcb242d935df437cacd7f7408224 Mon Sep 17 00:00:00 2001 From: Christo Grabowski Date: Fri, 28 Jul 2023 13:53:11 -0400 Subject: [PATCH 3/6] changelog update --- docs/integrations/sources/google-ads.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations/sources/google-ads.md b/docs/integrations/sources/google-ads.md index 9b0304d61ffc8..3d6c3a8e10c80 100644 --- a/docs/integrations/sources/google-ads.md +++ b/docs/integrations/sources/google-ads.md @@ -167,6 +167,7 @@ Due to a limitation in the Google Ads API which does not allow getting performan | Version | Date | Pull Request | Subject | |:---------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------| +| `0.7.4` | 2023-07-28 | [28832](https://github.com/airbytehq/airbyte/pull/28832) | Update field descriptions | `0.7.3` | 2023-07-24 | [28510](https://github.com/airbytehq/airbyte/pull/28510) | Set dates with client's timezone | | `0.7.2` | 2023-07-20 | [28535](https://github.com/airbytehq/airbyte/pull/28535) | UI improvement: Make the query field in custom reports a multi-line string field | | `0.7.1` | 2023-07-17 | [28365](https://github.com/airbytehq/airbyte/pull/28365) | 0.3.1 and 0.3.2 follow up: make today the end date, not yesterday | From 2a2daacea011b1e79f1ff815c58811cbf68a0899 Mon Sep 17 00:00:00 2001 From: Christo Grabowski Date: Fri, 28 Jul 2023 13:55:55 -0400 Subject: [PATCH 4/6] add missing cell in table --- docs/integrations/sources/google-ads.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/integrations/sources/google-ads.md b/docs/integrations/sources/google-ads.md index 3d6c3a8e10c80..456b5bfd822fc 100644 --- a/docs/integrations/sources/google-ads.md +++ b/docs/integrations/sources/google-ads.md @@ -167,7 +167,7 @@ Due to a limitation in the Google Ads API which does not allow getting performan | Version | Date | Pull Request | Subject | |:---------|:-----------|:---------------------------------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------| -| `0.7.4` | 2023-07-28 | [28832](https://github.com/airbytehq/airbyte/pull/28832) | Update field descriptions +| `0.7.4` | 2023-07-28 | [28832](https://github.com/airbytehq/airbyte/pull/28832) | Update field descriptions | | `0.7.3` | 2023-07-24 | [28510](https://github.com/airbytehq/airbyte/pull/28510) | Set dates with client's timezone | | `0.7.2` | 2023-07-20 | [28535](https://github.com/airbytehq/airbyte/pull/28535) | UI improvement: Make the query field in custom reports a multi-line string field | | `0.7.1` | 2023-07-17 | [28365](https://github.com/airbytehq/airbyte/pull/28365) | 0.3.1 and 0.3.2 follow up: make today the end date, not yesterday | From a81885e6dd2571ee10a0c3264d9de627510e39c8 Mon Sep 17 00:00:00 2001 From: Christo Grabowski <108154848+ChristoGrab@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:03:39 -0400 Subject: [PATCH 5/6] Update airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json Co-authored-by: Sherif A. Nada --- .../connectors/source-google-ads/source_google_ads/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json index 5af0fbfea70d6..4f873d5490342 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json @@ -97,7 +97,7 @@ "type": "string", "multiline": true, "title": "Custom Query", - "description": "A custom defined GAQL query for building the report. Avoid including the segments.date expression as it is used by incremental streams. For more information, refer to Google's documentation.", + "description": "A custom defined GAQL query for building the report. Avoid including the segments.date field; wherever possible, Airbyte will automatically include it for incremental syncs. For more information, refer to Google's documentation.", "examples": [ "SELECT segments.ad_destination_type, campaign.advertising_channel_sub_type FROM campaign WHERE campaign.status = 'PAUSED'" ] From 4d394e599ec02783b4beffba3f50100c72f3a0f2 Mon Sep 17 00:00:00 2001 From: Christo Grabowski <108154848+ChristoGrab@users.noreply.github.com> Date: Mon, 31 Jul 2023 13:03:49 -0400 Subject: [PATCH 6/6] Update airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json Co-authored-by: Sherif A. Nada --- .../connectors/source-google-ads/source_google_ads/spec.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json index 4f873d5490342..73e4eca612b05 100644 --- a/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json +++ b/airbyte-integrations/connectors/source-google-ads/source_google_ads/spec.json @@ -114,7 +114,7 @@ "type": "string", "title": "Login Customer ID for Managed Accounts", "description": "If your access to the customer account is through a manager account, this field is required, and must be set to the 10-digit customer ID of the manager account. For more information about this field, refer to Google's documentation.", - "pattern_descriptor": "The customer ID must be 10 digits, with no dashes.", + "pattern_descriptor": ": 10 digits, with no dashes.", "pattern": "^([0-9]{10})?$", "examples": ["7349206847"], "order": 4