From deea131e9de38e057f2f9c3a560d294dbba262b4 Mon Sep 17 00:00:00 2001 From: Catherine Fritz <111930712+fivetran-catfritz@users.noreply.github.com> Date: Tue, 12 May 2026 20:12:12 -0500 Subject: [PATCH] Buildkite improvements --- .buildkite/hooks/pre-command | 25 -------- .buildkite/pipeline.yml | 74 ------------------------ .buildkite/scripts/run_models.sh | 30 ---------- integration_tests/ci/sample.profiles.yml | 50 ---------------- integration_tests/ci/test_scenarios.yml | 38 ++++++++++++ integration_tests/dbt_project.yml | 19 +++++- 6 files changed, 55 insertions(+), 181 deletions(-) delete mode 100644 .buildkite/hooks/pre-command delete mode 100644 .buildkite/pipeline.yml delete mode 100644 .buildkite/scripts/run_models.sh delete mode 100644 integration_tests/ci/sample.profiles.yml create mode 100644 integration_tests/ci/test_scenarios.yml diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command deleted file mode 100644 index 81b7b00..0000000 --- a/.buildkite/hooks/pre-command +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -e - -# Export secrets for Docker containers. -# Restrict exposing secrets only to the steps that need them -export GCLOUD_SERVICE_KEY=$(gcloud secrets versions access latest --secret="GCLOUD_SERVICE_KEY" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_HOST" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_USER=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_USER" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_PASS" --project="dbt-package-testing-363917") -export CI_POSTGRES_DBT_DBNAME=$(gcloud secrets versions access latest --secret="CI_POSTGRES_DBT_DBNAME" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_DBNAME=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_DBNAME" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_HOST" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_PASS" --project="dbt-package-testing-363917") -export CI_REDSHIFT_DBT_USER=$(gcloud secrets versions access latest --secret="CI_REDSHIFT_DBT_USER" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_ACCOUNT=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_ACCOUNT" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_DATABASE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_DATABASE" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_PASS=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_PASS" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_ROLE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_ROLE" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_USER=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_USER" --project="dbt-package-testing-363917") -export CI_SNOWFLAKE_DBT_WAREHOUSE=$(gcloud secrets versions access latest --secret="CI_SNOWFLAKE_DBT_WAREHOUSE" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_HOST=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_HOST" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_HTTP_PATH=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_HTTP_PATH" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_TOKEN=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_TOKEN" --project="dbt-package-testing-363917") -export CI_DATABRICKS_DBT_CATALOG=$(gcloud secrets versions access latest --secret="CI_DATABRICKS_DBT_CATALOG" --project="dbt-package-testing-363917") \ No newline at end of file diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml deleted file mode 100644 index 9387b23..0000000 --- a/.buildkite/pipeline.yml +++ /dev/null @@ -1,74 +0,0 @@ -steps: - - label: ":postgres: Run Tests - Postgres" - key: "run-dbt-postgres" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_POSTGRES_DBT_DBNAME" - - "CI_POSTGRES_DBT_HOST" - - "CI_POSTGRES_DBT_PASS" - - "CI_POSTGRES_DBT_USER" - commands: | - bash .buildkite/scripts/run_models.sh postgres - - - label: ":snowflake-db: Run Tests - Snowflake" - key: "run_dbt_snowflake" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_SNOWFLAKE_DBT_ACCOUNT" - - "CI_SNOWFLAKE_DBT_DATABASE" - - "CI_SNOWFLAKE_DBT_PASS" - - "CI_SNOWFLAKE_DBT_ROLE" - - "CI_SNOWFLAKE_DBT_USER" - - "CI_SNOWFLAKE_DBT_WAREHOUSE" - commands: | - bash .buildkite/scripts/run_models.sh snowflake - - - label: ":gcloud: Run Tests - BigQuery" - key: "run_dbt_bigquery" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "GCLOUD_SERVICE_KEY" - commands: | - bash .buildkite/scripts/run_models.sh bigquery - - - label: ":amazon-redshift: Run Tests - Redshift" - key: "run_dbt_redshift" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_REDSHIFT_DBT_DBNAME" - - "CI_REDSHIFT_DBT_HOST" - - "CI_REDSHIFT_DBT_PASS" - - "CI_REDSHIFT_DBT_USER" - commands: | - bash .buildkite/scripts/run_models.sh redshift - - - label: ":databricks: Run Tests - Databricks" - key: "run_dbt_databricks" - plugins: - - docker#v3.13.0: - image: "python:3.10.13" - shell: [ "/bin/bash", "-e", "-c" ] - environment: - - "BASH_ENV=/tmp/.bashrc" - - "CI_DATABRICKS_DBT_HOST" - - "CI_DATABRICKS_DBT_HTTP_PATH" - - "CI_DATABRICKS_DBT_TOKEN" - - "CI_DATABRICKS_DBT_CATALOG" - commands: | - bash .buildkite/scripts/run_models.sh databricks diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh deleted file mode 100644 index 0e92c9f..0000000 --- a/.buildkite/scripts/run_models.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -apt-get update -apt-get install libsasl2-dev - -python3 -m venv venv -. venv/bin/activate -pip install --upgrade pip setuptools -pip install -r integration_tests/requirements.txt -mkdir -p ~/.dbt -cp integration_tests/ci/sample.profiles.yml ~/.dbt/profiles.yml - -db=$1 -echo `pwd` -cd integration_tests -dbt deps -dbt seed --target "$db" --full-refresh -dbt source freshness --target "$db" || echo "...Only verifying freshness runs…" -dbt run --target "$db" --full-refresh -dbt test --target "$db" -dbt run --vars '{intercom__using_articles: false, intercom__using_contact_company: false, intercom__using_company_tags: false, intercom__using_contact_tags: false, intercom__using_conversation_tags: false, intercom__using_team: false}' --target "$db" -dbt test --target "$db" --vars '{intercom__using_articles: false, intercom__using_contact_company: false, intercom__using_company_tags: false, intercom__using_contact_tags: false, intercom__using_conversation_tags: false, intercom__using_team: false}' -# only need to test intercom__article_enhanced and its upstreams for these vars: -dbt run --vars '{intercom__using_collection_history: false}' --target "$db" --select +intercom__article_enhanced -dbt test --target "$db" --vars '{intercom__using_collection_history: false}' -dbt run --vars '{intercom__using_help_center_history: false}' --target "$db" --select +intercom__article_enhanced -dbt test --target "$db" --vars '{intercom__using_help_center_history: false}' -dbt run-operation fivetran_utils.drop_schemas_automation --target "$db" diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml deleted file mode 100644 index 3eb6b6d..0000000 --- a/integration_tests/ci/sample.profiles.yml +++ /dev/null @@ -1,50 +0,0 @@ - -# HEY! This file is used in the dbt package integrations tests with Buildkite. -# You should __NEVER__ check credentials into version control. Thanks for reading :) - -integration_tests: - target: redshift - outputs: - redshift: - type: redshift - host: "{{ env_var('CI_REDSHIFT_DBT_HOST') }}" - user: "{{ env_var('CI_REDSHIFT_DBT_USER') }}" - pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}" - dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}" - port: 5439 - schema: intercom_integration_tests - threads: 8 - bigquery: - type: bigquery - method: service-account-json - project: 'dbt-package-testing' - schema: intercom_integration_tests - threads: 8 - keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}" - snowflake: - type: snowflake - account: "{{ env_var('CI_SNOWFLAKE_DBT_ACCOUNT') }}" - user: "{{ env_var('CI_SNOWFLAKE_DBT_USER') }}" - password: "{{ env_var('CI_SNOWFLAKE_DBT_PASS') }}" - role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}" - database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}" - warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}" - schema: intercom_integration_tests - threads: 8 - postgres: - type: postgres - host: "{{ env_var('CI_POSTGRES_DBT_HOST') }}" - user: "{{ env_var('CI_POSTGRES_DBT_USER') }}" - pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}" - dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}" - port: 5432 - schema: intercom_integration_tests - 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: intercom_integration_tests - threads: 8 - token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}" - type: databricks \ No newline at end of file diff --git a/integration_tests/ci/test_scenarios.yml b/integration_tests/ci/test_scenarios.yml new file mode 100644 index 0000000..14db9a3 --- /dev/null +++ b/integration_tests/ci/test_scenarios.yml @@ -0,0 +1,38 @@ +# Only set if not using default adapter ranges +# dbt_adapter_versions: +# snowflake: ">=1.3.0,<2.0.0" +# bigquery: ">=1.3.0,<2.0.0" +# postgres: ">=1.3.0,<2.0.0" +# redshift: ">=1.3.0,<2.0.0" +# databricks: ">=1.6.0,<2.0.0" + +schema_variable_name: "intercom_schema" + +include_databricks_sql: false +include_sqlserver: false +include_dbt_compile: true + +test_scenarios: + - name: "Default" + vars: {} + include_incremental: false + + - name: "optional features disabled" + vars: + intercom__using_articles: false + intercom__using_contact_company: false + intercom__using_company_tags: false + intercom__using_contact_tags: false + intercom__using_conversation_tags: false + intercom__using_team: false + include_incremental: false + + - name: "collection history disabled" + vars: + intercom__using_collection_history: false + include_incremental: false + + - name: "help center history disabled" + vars: + intercom__using_help_center_history: false + include_incremental: false \ No newline at end of file diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 1aafc58..87c4ddf 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -34,11 +34,10 @@ seeds: show: False intercom_integration_tests: +quote_columns: "{{ true if target.type == 'redshift' else false }}" - +column_types: - _fivetran_synced: timestamp admin_data: +column_types: id: "{{ 'varchar(100)' if target.type in ('redshift', 'postgres') else 'string'}}" + _fivetran_synced: timestamp article_history_data: +column_types: id: "{{ 'varchar(100)' if target.type in ('redshift', 'postgres') else 'string' }}" @@ -54,6 +53,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp collection_history_data: +quote_columns: true +enabled: "{{ true if target.type != 'snowflake' else false }}" @@ -67,6 +67,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp collection_history_data_snowflake: +quote_columns: true +enabled: "{{ true if target.type == 'snowflake' else false }}" @@ -81,6 +82,7 @@ seeds: _FIVETRAN_START: timestamp _FIVETRAN_END: timestamp _FIVETRAN_ACTIVE: boolean + _FIVETRAN_SYNCED: timestamp company_history_data: +column_types: created_at: timestamp @@ -88,6 +90,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp company_tag_history_data: +column_types: company_updated_at: timestamp @@ -95,12 +98,14 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp contact_company_history_data: +column_types: contact_updated_at: timestamp _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp contact_history_data: +column_types: created_at: timestamp @@ -112,6 +117,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp contact_tag_history_data: +column_types: contact_updated_at: timestamp @@ -119,6 +125,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp conversation_contact_history_data: +column_types: conversation_id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" @@ -126,6 +133,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp conversation_history_data: +column_types: id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" @@ -137,6 +145,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp conversation_part_history_data: +column_types: id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" @@ -149,6 +158,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp conversation_tag_history_data: +column_types: conversation_id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" @@ -157,6 +167,7 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp help_center_history_data: +column_types: id: "{{ 'varchar(100)' if target.type in ('redshift', 'postgres') else 'string' }}" @@ -166,16 +177,20 @@ seeds: _fivetran_start: timestamp _fivetran_end: timestamp _fivetran_active: boolean + _fivetran_synced: timestamp tag_data: +column_types: id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" + _fivetran_synced: timestamp team_admin_data: +column_types: admin_id: "{{ 'varchar(100)' if target.type in ('redshift', 'postgres') else 'string'}}" team_id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" + _fivetran_synced: timestamp team_data: +column_types: id: "{{ 'int64' if target.type == 'bigquery' else 'bigint' }}" + _fivetran_synced: timestamp dispatch: - macro_namespace: dbt_utils