From b06f2acda03d6e3de5636c7979e226b5c49646f1 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Wed, 15 Jun 2022 10:00:27 -0500 Subject: [PATCH 1/6] feature/google-ads-api-default --- .circleci/config.yml | 10 +++++----- .github/pull_request_template.md | 1 - CHANGELOG.md | 4 ++++ README.md | 5 +++-- dbt_project.yml | 4 ++-- integration_tests/dbt_project.yml | 2 +- packages.yml | 9 +++++++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df07d36..730080f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: dbt deps dbt seed --target postgres --full-refresh dbt run --target postgres --full-refresh - dbt run --target postgres --full-refresh --vars '{api_source: google_ads}' + dbt run --target postgres --full-refresh --vars '{api_source: adwords}' dbt test --target postgres - run: name: "Run Tests - Spark" @@ -42,7 +42,7 @@ jobs: dbt deps dbt seed --target spark --full-refresh dbt run --target spark --full-refresh - dbt run --target spark --full-refresh --vars '{api_source: google_ads}' + dbt run --target spark --full-refresh --vars '{api_source: adwords}' dbt test --target spark - run: name: "Run Tests - Redshift" @@ -53,7 +53,7 @@ jobs: dbt deps dbt seed --target redshift --full-refresh dbt run --target redshift --full-refresh - dbt run --target redshift --full-refresh --vars '{api_source: google_ads}' + dbt run --target redshift --full-refresh --vars '{api_source: adwords}' dbt test --target redshift - run: name: "Run Tests - Snowflake" @@ -64,7 +64,7 @@ jobs: dbt deps dbt seed --target snowflake --full-refresh dbt run --target snowflake --full-refresh - dbt run --target snowflake --full-refresh --vars '{api_source: google_ads}' + dbt run --target snowflake --full-refresh --vars '{api_source: adwords}' dbt test --target snowflake - run: name: "Run Tests - BigQuery" @@ -78,5 +78,5 @@ jobs: dbt deps dbt seed --target bigquery --full-refresh dbt run --target bigquery --full-refresh - dbt run --target bigquery --full-refresh --vars '{api_source: google_ads}' + dbt run --target bigquery --full-refresh --vars '{api_source: adwords}' dbt test --target bigquery \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 35f658d..f450926 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,3 @@ -Pull Request **Are you a current Fivetran customer?** diff --git a/CHANGELOG.md b/CHANGELOG.md index 5370ff6..e99078d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# dbt_google_ads v0.7.0 +## 🚨 Breaking Changes 🚨 +- The `api_source` variable is now defaulted to `google_ads` as opposed to `adwords`. The Adwords API has since been depricated by Google and is now no longer the standard API for the Google Ads connector. Please ensure you are using a Google Ads API version of the Fivetran connector before upgrading this package. + - Please note, the `adwords` version of this package will be fully removed from the package in August of 2022. # dbt_google_ads v0.6.1 - Updated google_ads__url_ad_adapter link in README (Thank you to @bkimjin! ([#26](https://github.com/fivetran/dbt_google_ads/issues/26))) # dbt_google_ads v0.6.0 diff --git a/README.md b/README.md index 91da20c..e4fa62c 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,9 @@ packages: ## Configuration -As previously mentioned, package allows users to leverage either the Adwords API or the Google Ads API. You will be able to determine which API your connector is using by navigating within your Fivetran UI to the `setup` tab -> `edit connection details` link -> and reference the `API configuration` used. +This package allows users to leverage either the Adwords API or the Google Ads API. You will be able to determine which API your connector is using by navigating within your Fivetran UI to the `setup` tab -> `edit connection details` link -> and reference the `API configuration` used. You will want to refer to the respective configuration steps below based off the API used by your connector. +> **Note**: All new Google Ads Fivetran connectors will be setup with the Google Ads API. If you are unable to infer the API type based on the above steps, it is most likely that you are using the Google Ads API. ### Google Ads API Configuration If your connector is setup using the Google Ads API then you will need to configure your `dbt_project.yml` with the below variable: @@ -42,7 +43,7 @@ If your connector is setup using the Google Ads API then you will need to config config-version: 2 vars: - api_source: google_ads ## adwords by default + api_source: google_ads ## google_ads by default, but may be changed to 'adwords' if using a previous version of the connector. ``` ### Adwords API Configuration diff --git a/dbt_project.yml b/dbt_project.yml index 934ccd1..1f52a16 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'google_ads' -version: '0.6.1' +version: '0.7.0' config-version: 2 require-dbt-version: [">=1.0.0", "<2.0.0"] models: @@ -17,7 +17,7 @@ vars: ad_group_history: "{{ ref('stg_google_ads__ad_group_history') }}" ad_history: "{{ ref('stg_google_ads__ad_history') }}" ad_final_url_history: "{{ ref('stg_google_ads__ad_final_url_history') }}" - api_source: adwords + api_source: google_ads google_ads__url_passthrough_metrics: [] google_ads__criteria_passthrough_metrics: [] google_ads__ad_stats_passthrough_metrics: [] diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 9f4405c..361fe6a 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'google_ads_integration_tests' -version: '0.6.1' +version: '0.7.0' profile: 'integration_tests' config-version: 2 diff --git a/packages.yml b/packages.yml index 65d6332..5ccf9bb 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,8 @@ packages: -- package: fivetran/google_ads_source - version: [">=0.6.0", "<0.7.0"] +# - package: fivetran/google_ads_source +# version: [">=0.7.0", "<0.8.0"] + + ## TO SWITCH BEFORE MERGE + - git: https://github.com/fivetran/dbt_google_ads_source.git + revision: feature/google-ads-api-default + warn-unpinned: false \ No newline at end of file From 11154004629f45660e07a47bc90ba718cce7f7bd Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Wed, 15 Jun 2022 10:01:31 -0500 Subject: [PATCH 2/6] changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e99078d..9f38f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # dbt_google_ads v0.7.0 ## 🚨 Breaking Changes 🚨 -- The `api_source` variable is now defaulted to `google_ads` as opposed to `adwords`. The Adwords API has since been depricated by Google and is now no longer the standard API for the Google Ads connector. Please ensure you are using a Google Ads API version of the Fivetran connector before upgrading this package. +- The `api_source` variable is now defaulted to `google_ads` as opposed to `adwords`. The Adwords API has since been depricated by Google and is now no longer the standard API for the Google Ads connector. Please ensure you are using a Google Ads API version of the Fivetran connector before upgrading this package. ([#32](https://github.com/fivetran/dbt_google_ads/pull/32)) - Please note, the `adwords` version of this package will be fully removed from the package in August of 2022. # dbt_google_ads v0.6.1 - Updated google_ads__url_ad_adapter link in README (Thank you to @bkimjin! ([#26](https://github.com/fivetran/dbt_google_ads/issues/26))) From f29b185f4d10b9477cade8ff0a02f9a66e3a1462 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Wed, 15 Jun 2022 10:58:55 -0500 Subject: [PATCH 3/6] version upgrade in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e4fa62c..78e8e54 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Include in your `packages.yml` ```yaml packages: - package: fivetran/google_ads - version: [">=0.6.0", "<0.7.0"] + version: [">=0.7.0", "<0.8.0"] ``` ## Configuration From 5e6fd38742ac0f6621425803a1728b94070e44e3 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Mon, 27 Jun 2022 16:40:12 -0500 Subject: [PATCH 4/6] review updates --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f38f1e..ddd6909 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # dbt_google_ads v0.7.0 ## 🚨 Breaking Changes 🚨 -- The `api_source` variable is now defaulted to `google_ads` as opposed to `adwords`. The Adwords API has since been depricated by Google and is now no longer the standard API for the Google Ads connector. Please ensure you are using a Google Ads API version of the Fivetran connector before upgrading this package. ([#32](https://github.com/fivetran/dbt_google_ads/pull/32)) - - Please note, the `adwords` version of this package will be fully removed from the package in August of 2022. +- The `api_source` variable is now defaulted to `google_ads` as opposed to `adwords`. The Adwords API has since been deprecated by Google and is now no longer the standard API for the Google Ads connector. Please ensure you are using a Google Ads API version of the Fivetran connector before upgrading this package. ([#32](https://github.com/fivetran/dbt_google_ads/pull/32)) + - Please note, the `adwords` version of this package will be fully removed from the package in August of 2022. This means, models under `models/adwords_connector` will be removed in favor of `models/google_ads_connector` models. # dbt_google_ads v0.6.1 - Updated google_ads__url_ad_adapter link in README (Thank you to @bkimjin! ([#26](https://github.com/fivetran/dbt_google_ads/issues/26))) # dbt_google_ads v0.6.0 From 6a889144f3332808f9d14513c24cc0965840a732 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Mon, 27 Jun 2022 16:47:38 -0500 Subject: [PATCH 5/6] README edit for sunset --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 78e8e54..37d42e1 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ packages: This package allows users to leverage either the Adwords API or the Google Ads API. You will be able to determine which API your connector is using by navigating within your Fivetran UI to the `setup` tab -> `edit connection details` link -> and reference the `API configuration` used. You will want to refer to the respective configuration steps below based off the API used by your connector. -> **Note**: All new Google Ads Fivetran connectors will be setup with the Google Ads API. If you are unable to infer the API type based on the above steps, it is most likely that you are using the Google Ads API. +> **Note**: As of April, 2022 all Fivetran Google Ads connectors leverage the Google Ads API rather than Adwords. Additionally, please be aware that the Adwords API version of the package will be sunset in August of 2022. ### Google Ads API Configuration If your connector is setup using the Google Ads API then you will need to configure your `dbt_project.yml` with the below variable: From dd3b73a546a9a472d9088933c58b9d3f2266015d Mon Sep 17 00:00:00 2001 From: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com> Date: Tue, 28 Jun 2022 11:19:54 -0500 Subject: [PATCH 6/6] Update packages.yml --- packages.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages.yml b/packages.yml index 5ccf9bb..e69baba 100644 --- a/packages.yml +++ b/packages.yml @@ -1,8 +1,3 @@ packages: -# - package: fivetran/google_ads_source -# version: [">=0.7.0", "<0.8.0"] - - ## TO SWITCH BEFORE MERGE - - git: https://github.com/fivetran/dbt_google_ads_source.git - revision: feature/google-ads-api-default - warn-unpinned: false \ No newline at end of file +- package: fivetran/google_ads_source + version: [">=0.7.0", "<0.8.0"]