diff --git a/.circleci/config.yml b/.circleci/config.yml index 763661d8..2d7e4ee4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: - run: name: "Setup dbt" command: | + sudo apt install libsasl2-dev python3 -m venv venv . venv/bin/activate pip install --upgrade pip setuptools diff --git a/.gitignore b/.gitignore index caaa944b..0099fc65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ target/ dbt_modules/ logs/ .gitignore -.DS_Store \ No newline at end of file +.DS_Store +dbt_packages/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e517382f..4cd35c95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# dbt_fivetran_log v0.5.0-b1 +🎉 dbt v1.0.0 Compatibility Pre Release 🎉 An official dbt v1.0.0 compatible version of the package will be released once existing feature/bug PRs are merged. +## 🚨 Breaking Changes 🚨 +- Adjusts the `require-dbt-version` to now be within the range [">=1.0.0", "<2.0.0"]. Additionally, the package has been updated for dbt v1.0.0 compatibility. If you are using a dbt version <1.0.0, you will need to upgrade in order to leverage the latest version of the package. + - For help upgrading your package, I recommend reviewing this GitHub repo's Release Notes on what changes have been implemented since your last upgrade. + - For help upgrading your dbt project to dbt v1.0.0, I recommend reviewing dbt-labs [upgrading to 1.0.0 docs](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-1-0-0) for more details on what changes must be made. +- Upgrades the package dependency to refer to the latest `dbt_fivetran_utils`. The latest `dbt_fivetran_utils` package also has a dependency on `dbt_utils` [">=0.8.0", "<0.9.0"]. + - Please note, if you are installing a version of `dbt_utils` in your `packages.yml` that is not in the range above then you will encounter a package dependency error. + # dbt_fivetran_log v0.4.1 ## 🚨 Breaking Changes @@ -17,4 +26,4 @@ Once your connector has completed its priority-first sync and begun syncing norm - Added this changelog to capture iterations of the package! ## Under the Hood -- n/a \ No newline at end of file +- n/a diff --git a/README.md b/README.md index e9f69ed5..b29242b4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![dbt Logo and Version](https://img.shields.io/static/v1?logo=dbt&label=dbt-version&message=0.20.x&color=orange) +[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) # Fivetran Log ([docs](https://fivetran.github.io/dbt_fivetran_log/#!/overview)) This package models Fivetran Log data from [our free internal connector](https://fivetran.com/docs/logs/fivetran-log). It uses account-level data in the format described by [this ERD](https://fivetran.com/docs/logs/fivetran-log#schemainformation). @@ -43,7 +43,7 @@ Include in your `packages.yml` ```yaml packages: - package: fivetran/fivetran_log - version: [">=0.4.0", "<0.5.0"] + version: 0.5.0-b1 ``` ## Package Maintenance diff --git a/dbt_project.yml b/dbt_project.yml index dffde951..be460389 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,30 +1,30 @@ config-version: 2 name: 'fivetran_log' -version: '0.4.1' +version: '0.5.0' -require-dbt-version: ">=0.20.0" +require-dbt-version: [">=1.0.0", "<2.0.0"] models: - fivetran_log: - +materialized: table - +schema: fivetran_log - staging: - +schema: stg_fivetran_log - tmp: - +materialized: view + fivetran_log: + +materialized: table + +schema: fivetran_log + staging: + +schema: stg_fivetran_log + tmp: + +materialized: view vars: - fivetran_log: - account: "{{ source('fivetran_log', 'account') }}" - account_membership: "{{ source('fivetran_log', 'account_membership') }}" - active_volume: "{{ source('fivetran_log', 'active_volume') }}" - connector: "{{ source('fivetran_log', 'connector') }}" - credits_used: "{{ source('fivetran_log', 'credits_used') }}" - destination: "{{ source('fivetran_log', 'destination') }}" - destination_membership: "{{ source('fivetran_log', 'destination_membership') }}" - log: "{{ source('fivetran_log', 'log') }}" - transformation: "{{ source('fivetran_log', 'transformation') }}" - trigger_table: "{{ source('fivetran_log', 'trigger_table') }}" - user: "{{ source('fivetran_log', 'user') }}" \ No newline at end of file + fivetran_log: + account: "{{ source('fivetran_log', 'account') }}" + account_membership: "{{ source('fivetran_log', 'account_membership') }}" + active_volume: "{{ source('fivetran_log', 'active_volume') }}" + connector: "{{ source('fivetran_log', 'connector') }}" + credits_used: "{{ source('fivetran_log', 'credits_used') }}" + destination: "{{ source('fivetran_log', 'destination') }}" + destination_membership: "{{ source('fivetran_log', 'destination_membership') }}" + log: "{{ source('fivetran_log', 'log') }}" + transformation: "{{ source('fivetran_log', 'transformation') }}" + trigger_table: "{{ source('fivetran_log', 'trigger_table') }}" + user: "{{ source('fivetran_log', 'user') }}" diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt index 1b85aa4f..9edc95a6 100644 --- a/integration_tests/requirements.txt +++ b/integration_tests/requirements.txt @@ -1 +1,6 @@ -dbt~=0.20.0 \ No newline at end of file +dbt-snowflake==1.0.0 +dbt-bigquery==1.0.0 +dbt-redshift==1.0.0 +dbt-postgres==1.0.0 +dbt-spark==1.0.0 +dbt-spark[PyHive]==1.0.0 diff --git a/integration_tests/data/.DS_Store b/integration_tests/seeds/.DS_Store similarity index 100% rename from integration_tests/data/.DS_Store rename to integration_tests/seeds/.DS_Store diff --git a/integration_tests/data/account.csv b/integration_tests/seeds/account.csv similarity index 100% rename from integration_tests/data/account.csv rename to integration_tests/seeds/account.csv diff --git a/integration_tests/data/account_membership.csv b/integration_tests/seeds/account_membership.csv similarity index 100% rename from integration_tests/data/account_membership.csv rename to integration_tests/seeds/account_membership.csv diff --git a/integration_tests/data/active_volume.csv b/integration_tests/seeds/active_volume.csv similarity index 100% rename from integration_tests/data/active_volume.csv rename to integration_tests/seeds/active_volume.csv diff --git a/integration_tests/data/connector.csv b/integration_tests/seeds/connector.csv similarity index 100% rename from integration_tests/data/connector.csv rename to integration_tests/seeds/connector.csv diff --git a/integration_tests/data/credits_used.csv b/integration_tests/seeds/credits_used.csv similarity index 100% rename from integration_tests/data/credits_used.csv rename to integration_tests/seeds/credits_used.csv diff --git a/integration_tests/data/destination.csv b/integration_tests/seeds/destination.csv similarity index 100% rename from integration_tests/data/destination.csv rename to integration_tests/seeds/destination.csv diff --git a/integration_tests/data/destination_membership.csv b/integration_tests/seeds/destination_membership.csv similarity index 100% rename from integration_tests/data/destination_membership.csv rename to integration_tests/seeds/destination_membership.csv diff --git a/integration_tests/data/log.csv b/integration_tests/seeds/log.csv similarity index 100% rename from integration_tests/data/log.csv rename to integration_tests/seeds/log.csv diff --git a/integration_tests/data/transformation.csv b/integration_tests/seeds/transformation.csv similarity index 100% rename from integration_tests/data/transformation.csv rename to integration_tests/seeds/transformation.csv diff --git a/integration_tests/data/trigger_table.csv b/integration_tests/seeds/trigger_table.csv similarity index 100% rename from integration_tests/data/trigger_table.csv rename to integration_tests/seeds/trigger_table.csv diff --git a/integration_tests/data/trigger_table_snowflake.csv b/integration_tests/seeds/trigger_table_snowflake.csv similarity index 100% rename from integration_tests/data/trigger_table_snowflake.csv rename to integration_tests/seeds/trigger_table_snowflake.csv diff --git a/integration_tests/data/user.csv b/integration_tests/seeds/user.csv similarity index 100% rename from integration_tests/data/user.csv rename to integration_tests/seeds/user.csv diff --git a/packages.yml b/packages.yml index 31ec803e..e8d9d9e4 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - package: fivetran/fivetran_utils - version: [">=0.2.0", "<0.3.0"] \ No newline at end of file + version: [">=0.3.0", "<0.4.0"]