From 92cf965d9bc1c00de89055f1b6d6c7673cb49ab1 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Fri, 21 Apr 2023 13:40:52 -0700 Subject: [PATCH 1/2] testing --- .buildkite/scripts/run_models.sh | 3 +- .../maintainer_pull_request_template.md | 51 +++++++++++++++++++ .github/pull_request_template.md | 51 ++++++------------- CHANGELOG.md | 6 +++ 4 files changed, 75 insertions(+), 36 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh index ea3de4b..ea68415 100644 --- a/.buildkite/scripts/run_models.sh +++ b/.buildkite/scripts/run_models.sh @@ -18,4 +18,5 @@ cd integration_tests dbt deps dbt seed --target "$db" --full-refresh dbt run --target "$db" --full-refresh -dbt test --target "$db" \ No newline at end of file +dbt test --target "$db" +dbt run-operation fivetran_utils.drop_schemas_automation --target "$db" diff --git a/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md new file mode 100644 index 0000000..768ac3f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md @@ -0,0 +1,51 @@ +## PR Overview +**This PR will address the following Issue/Feature:** + +**This PR will result in the following new package version:** + + +**Please detail what change(s) this PR introduces and any additional information that should be known during the review of this PR:** + +## PR Checklist +### Basic Validation +Please acknowledge that you have successfully performed the following commands locally: +- [ ] dbt compile +- [ ] dbt run –full-refresh +- [ ] dbt run +- [ ] dbt test +- [ ] dbt run –vars (if applicable) + +Before marking this PR as "ready for review" the following have been applied: +- [ ] The appropriate issue has been linked and tagged +- [ ] You are assigned to the corresponding issue and this PR +- [ ] BuildKite integration tests are passing + +### Detailed Validation +Please acknowledge that the following validation checks have been performed prior to marking this PR as "ready for review": +- [ ] You have validated these changes and assure this PR will address the respective Issue/Feature. +- [ ] You are reasonably confident these changes will not impact any other components of this package or any dependent packages. +- [ ] You have provided details below around the validation steps performed to gain confidence in these changes. + + +### Standard Updates +Please acknowledge that your PR contains the following standard updates: +- Package versioning has been appropriately indexed in the following locations: + - [ ] indexed within dbt_project.yml + - [ ] indexed within integration_tests/dbt_project.yml +- [ ] CHANGELOG has individual entries for each respective change in this PR + +- [ ] README updates have been applied (if applicable) + +- [ ] DECISIONLOG updates have been updated (if applicable) +- [ ] Appropriate yml documentation has been added (if applicable) + +### dbt Docs +Please acknowledge that after the above were all completed the below were applied to your branch: +- [ ] docs were regenerated (unless this PR does not include any code or yml updates) + +### If you had to summarize this PR in an emoji, which would it be? + +:dancer: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 50ee0df..b4e7e8e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,48 +1,24 @@ -**Are you a current Fivetran customer?** - +**Please provide your name and company** -**What change(s) does this PR introduce?** - +**Link the issue/feature request which this PR is meant to address** + -**Did you update the CHANGELOG?** +**Detail what changes this PR introduces and how this addresses the issue/feature request linked above.** + +**How did you validate the changes introduced within this PR?** + +**Which warehouse did you use to develop these changes?** + +**Did you update the CHANGELOG?** - [ ] Yes -**Does this PR introduce a breaking change?** - - -- [ ] Yes (please provide breaking change details below.) -- [ ] No (please provide an explanation as to how the change is non-breaking below.) - -**Did you update the dbt_project.yml files with the version upgrade (please leverage standard semantic versioning)? (In both your main project and integration_tests)** +**Did you update the dbt_project.yml files with the version upgrade (please leverage standard semantic versioning)? (In both your main project and integration_tests)** - [ ] Yes -**Is this PR in response to a previously created Bug or Feature Request** - - -- [ ] Yes, Issue/Feature [link bug/feature number here] -- [ ] No - -**How did you test the PR changes?** - - - -- [ ] Buildkite -- [ ] Local (please provide additional testing details below) - -**Select which warehouse(s) were used to test the PR** - - -- [ ] BigQuery -- [ ] Redshift -- [ ] Snowflake -- [ ] Postgres -- [ ] Databricks -- [ ] Other (provide details below) - **Provide an emoji that best describes your current mood** :dancer: @@ -50,3 +26,8 @@ **Feedback** We are so excited you decided to contribute to the Fivetran community dbt package! We continue to work to improve the packages and would greatly appreciate your [feedback](https://www.surveymonkey.com/r/DQ7K7WW) on our existing dbt packages or what you'd like to see next. + +**PR Template** +- [Community Pull Request Template](?expand=1&template=pull_request_template.md) (default) + +- [Maintainer Pull Request Template](?expand=1&template=maintainer_pull_request_template.md) (to be used by maintainers) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1e1629..eeb6912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# dbt_google_ads_source v0.UPDATE.UPDATE + + ## Under the Hood: + +- Incorporated the new `fivetran_utils.drop_schemas_automation` macro into the end of each Buildkite integration test job. +- Updated the pull request [templates](/.github). # dbt_google_ads_source v0.9.1 ## Under the Hood Updates - The dbt-expectations [regex_inst macro received an update](https://github.com/calogica/dbt-expectations/pull/247) that included a new `flags` argument. This argument is not included in the replica macro located within this package. As such, the update needs to be reflected in order to allow the downstream references of the macro to succeed. ([#35](https://github.com/fivetran/dbt_google_ads_source/pull/35)) From 2d3750735669b2538f2c72a81b2686fb599b5172 Mon Sep 17 00:00:00 2001 From: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Mon, 8 May 2023 13:24:48 -0500 Subject: [PATCH 2/2] update readme and ymls --- README.md | 7 ++++--- dbt_project.yml | 2 +- integration_tests/dbt_project.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b118b5a..318617b 100644 --- a/README.md +++ b/README.md @@ -37,12 +37,13 @@ dispatch: ``` ## Step 2: Install the package -Include the following google_ads_source package version in your `packages.yml` file. +If you are **not** using the [Google Ads transformation package](https://github.com/fivetran/dbt_google_ads), include the following package version in your `packages.yml` file. If you are installing the transform package, the source package is automatically installed as a dependency. > TIP: Check [dbt Hub](https://hub.getdbt.com/) for the latest installation instructions or [read the dbt docs](https://docs.getdbt.com/docs/package-management) for more information on installing packages. -```yaml + +```yml packages: - package: fivetran/google_ads_source - version: [">=0.9.0", "<0.10.0"] + version: [">=0.9.0", "<0.10.0"] # we recommend using ranges to capture non-breaking changes automatically ``` ## Step 3: Define database and schema variables By default, this package runs using your destination and the `google_ads` schema. If this is not where your Google Ads data is (for example, if your google_ads schema is named `google_ads_fivetran`), add the following configuration to your root `dbt_project.yml` file: diff --git a/dbt_project.yml b/dbt_project.yml index 9143a31..5519287 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'google_ads_source' -version: '0.9.1' +version: '0.9.2' config-version: 2 require-dbt-version: [">=1.3.0", "<2.0.0"] vars: diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 4d8222f..478f101 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'google_ads_source_integration_tests' -version: '0.9.1' +version: '0.9.2' profile: 'integration_tests' config-version: 2