From d91640de8f3a2ac5f08ce1324a41531a2d7dcd06 Mon Sep 17 00:00:00 2001 From: Jamie Rodriguez Date: Fri, 21 Apr 2023 14:14:18 -0700 Subject: [PATCH 1/3] 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 1237b21..a323fee 100644 --- a/.buildkite/scripts/run_models.sh +++ b/.buildkite/scripts/run_models.sh @@ -20,4 +20,5 @@ dbt seed --target "$db" --full-refresh dbt run --target "$db" --full-refresh dbt test --target "$db" dbt run --vars '{shopify_timezone: "America/New_York", shopify_using_fulfillment_event: true}' --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 d748279..2178373 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# dbt_shopify_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_shopify_source v0.8.2 ## Bug Fixes From 20e34dc79e5bf9c7a233e717bcbdc348cb63b73a Mon Sep 17 00:00:00 2001 From: Avinash Kunnath Date: Tue, 16 May 2023 22:47:23 -0700 Subject: [PATCH 2/3] md updates --- CHANGELOG.md | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2178373..18005b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - 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_shopify_source v0.8.2 ## Bug Fixes diff --git a/README.md b/README.md index 06d7e1e..01428f2 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ dispatch: ``` ## Step 2: Install the package (skip if also using the `shopify` transformation package) -If you are **not** using the [Shopify transformation package](https://github.com/fivetran/dbt_shopify), 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. +If you are **not** using the [Shopify transformation package](https://github.com/fivetran/dbt_shopify), include the following package version in your `packages.yml` file. > 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. ```yml packages: From 120d17f91151e2d2c84feae1291376a9ce3a94fd Mon Sep 17 00:00:00 2001 From: Avinash Kunnath Date: Tue, 16 May 2023 22:58:19 -0700 Subject: [PATCH 3/3] bump integration tests schema --- integration_tests/ci/sample.profiles.yml | 10 +++++----- integration_tests/dbt_project.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml index e76518c..40bc686 100644 --- a/integration_tests/ci/sample.profiles.yml +++ b/integration_tests/ci/sample.profiles.yml @@ -16,13 +16,13 @@ integration_tests: pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}" dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}" port: 5439 - schema: shopify_source_integration_tests_6 + schema: shopify_source_integration_tests_7 threads: 8 bigquery: type: bigquery method: service-account-json project: 'dbt-package-testing' - schema: shopify_source_integration_tests_6 + schema: shopify_source_integration_tests_7 threads: 8 keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}" snowflake: @@ -33,7 +33,7 @@ integration_tests: role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}" database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}" warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}" - schema: shopify_source_integration_tests_6 + schema: shopify_source_integration_tests_7 threads: 8 postgres: type: postgres @@ -42,13 +42,13 @@ integration_tests: pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}" dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}" port: 5432 - schema: shopify_source_integration_tests_6 + schema: shopify_source_integration_tests_7 threads: 8 databricks: catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}" host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}" http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}" - schema: shopify_source_integration_tests_6 + schema: shopify_source_integration_tests_7 threads: 2 token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}" type: databricks diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index aceb273..1c70ccb 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -4,7 +4,7 @@ profile: 'integration_tests' config-version: 2 vars: - shopify_schema: shopify_source_integration_tests_6 + shopify_schema: shopify_source_integration_tests_7 shopify_source: shopify_customer_identifier: "shopify_customer_data" shopify_order_line_refund_identifier: "shopify_order_line_refund_data"