Skip to content

Commit 33cfe05

Browse files
mkrahu-z2mkrahu-z2
committed
Standardize variable naming across all workflows
1 parent 58e61a3 commit 33cfe05

11 files changed

Lines changed: 65 additions & 58 deletions

‎.github/workflows/dbt_v1.10.15_bigquery_build_full_refresh.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
DBT_PROJECT_DIR: "."
1717
DBT_CORE_VERSION: "1.10.15"
1818
# BigQuery connection variables
19-
TUVA_BIGQUERY_TOKEN: ${{ secrets.TUVA_BIGQUERY_TOKEN }}
20-
TUVA_BIGQUERY_PROJECT: ${{ secrets.TUVA_BIGQUERY_PROJECT }}
19+
DBT_BIGQUERY_CI_TOKEN: ${{ secrets.DBT_BIGQUERY_CI_TOKEN }}
20+
DBT_BIGQUERY_CI_PROJECT: ${{ secrets.DBT_BIGQUERY_CI_PROJECT }}
2121

2222
steps:
2323
- name: Checkout Code
@@ -32,10 +32,10 @@ jobs:
3232
run: |
3333
python -m pip install --upgrade pip
3434
pip install dbt-core==${{ env.DBT_CORE_VERISON }} dbt-bigquery
35-
35+
3636
- name: Create BigQuery credentials file
3737
run: |
38-
echo "${{ env.TUVA_BIGQUERY_TOKEN }}" | base64 --decode > ./creds.json
38+
echo "${{ env.DBT_BIGQUERY_CI_TOKEN }}" | base64 --decode > ./creds.json
3939
working-directory: ${{ env.DBT_PROJECT_DIR }}
4040

4141
- name: Install dbt dependencies

‎.github/workflows/dbt_v1.10.15_databricks_build_full_refresh.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@ jobs:
1515
DBT_PROJECT_DIR: "."
1616
DBT_CORE_VERSION: "1.10.15"
1717
# Databricks connection variables
18-
DATABRICKS_HOST: ${{ secrets.DBT_DATABRICKS_HOST }}
19-
DATABRICKS_HTTP_PATH: ${{ secrets.DBT_DATABRICKS_HTTP_PATH }}
20-
DATABRICKS_TOKEN: ${{ secrets.DBT_DATABRICKS_TOKEN }}
21-
DATABRICKS_CATALOG: ${{ secrets.DBT_DATABRICKS_CATALOG }}
22-
SCHEMA_SUFFIX: ${{ github.run_id }}
18+
DBT_DATABRICKS_CI_HOST: ${{ secrets.DBT_DATABRICKS_CI_HOST }}
19+
DBT_DATABRICKS_CI_HTTP_PATH: ${{ secrets.DBT_DATABRICKS_CI_HTTP_PATH }}
20+
DBT_DATABRICKS_CI_TOKEN: ${{ secrets.DBT_DATABRICKS_CI_TOKEN }}
21+
DBT_DATABRICKS_CI_CATALOG: ${{ secrets.DBT_DATABRICKS_CI_CATALOG }}
2322

2423
steps:
2524
- uses: actions/checkout@v4

‎.github/workflows/dbt_v1.10.15_duckdb_build_full_refresh.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
DBT_CORE_VERSION: "1.10.15"
1818

1919
# Connection variables
20-
MOTHERDUCK_TOKEN: ${{ secrets.DBT_MOTHERDUCK_TOKEN }}
21-
MOTHERDUCK_DB_NAME: "my_db"
22-
MOTHERDUCK_PATH: "md:${{ env.MOTHERDUCK_DB_NAME }}?motherduck_token=${{ env.MOTHERDUCK_TOKEN }}"
20+
DBT_MOTHERDUCK_CI_TOKEN: ${{ secrets.DBT_MOTHERDUCK_CI_TOKEN }}
21+
DBT_MOTHERDUCK_CI_DATABASE: "my_db"
22+
DBT_MOTHERDUCK_CI_PATH: "md:${{ env.DBT_MOTHERDUCK_CI_DATABASE }}?motherduck_token=${{ env.DBT_MOTHERDUCK_CI_TOKEN }}"
2323

2424
steps:
2525
- name: Checkout Code

‎.github/workflows/dbt_v1.10.15_fabric_build_full_refresh.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ jobs:
1717
DBT_CORE_VERSION: "1.10.15"
1818
# Fabric connection variables
1919
DBT_FABRIC_CI_HOST: ${{ secrets.DBT_FABRIC_CI_HOST }}
20-
DBT_FABRIC_SERVICE_PRINCIPAL_ID: ${{ secrets.DBT_FABRIC_SERVICE_PRINCIPAL_ID }}
21-
DBT_FABRIC_SERVICE_PRINCIPAL_SECRET: ${{ secrets.DBT_FABRIC_SERVICE_PRINCIPAL_SECRET }}
22-
DBT_FABRIC_TENANT_ID: ${{ secrets.DBT_FABRIC_TENANT_ID }}
2320
DBT_FABRIC_CI_DATABASE: ${{ secrets.DBT_FABRIC_CI_DATABASE }}
2421
DBT_FABRIC_CI_SCHEMA: ${{ secrets.DBT_FABRIC_CI_SCHEMA }}
22+
DBT_FABRIC_CI_SERVICE_PRINCIPAL_ID: ${{ secrets.DBT_FABRIC_SERVICE_PRINCIPAL_ID }}
23+
DBT_FABRIC_CI_SERVICE_PRINCIPAL_SECRET: ${{ secrets.DBT_FABRIC_SERVICE_PRINCIPAL_SECRET }}
24+
DBT_FABRIC_CI_TENANT_ID: ${{ secrets.DBT_FABRIC_CI_TENANT_ID }}
25+
2526

2627
steps:
2728
- name: Checkout Code

‎.github/workflows/dbt_v1.10.15_redshift_build_full_fresh.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ jobs:
1717
DBT_CORE_VERSION: "1.10.15"
1818

1919
# Connection variables
20-
REDSHIFT_HOST: ${{ secrets.DBT_REDSHIFT_HOST }}
21-
REDSHIFT_USER: ${{ secrets.DBT_REDSHIFT_CI_USER }}
22-
REDSHIFT_PASSWORD: ${{ secrets.DBT_REDSHIFT_CI_PASSWORD }}
23-
REDSHIFT_DB: ${{ secrets.DBT_REDSHIFT_DEMO_DATABASE }}
20+
DBT_REDSHIFT_CI_HOST: ${{ secrets.DBT_REDSHIFT_CI_HOST }}
21+
DBT_REDSHIFT_CI_USER: ${{ secrets.DBT_REDSHIFT_CI_USER }}
22+
DBT_REDSHIFT_CI_PASSWORD: ${{ secrets.DBT_REDSHIFT_CI_PASSWORD }}
23+
DBT_REDSHIFT_CI_DATABASE: ${{ secrets.DBT_REDSHIFT_CI_DATABASE }}
24+
DBT_REDSHIFT_CI_SCHEMA: ${{ secrets.DBT_REDSHIFT_SCHEMA }}
2425

2526
steps:
2627
- name: Checkout Code

‎integration_tests/profiles/bigquery/profiles.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ default:
44
ci:
55
type: bigquery
66
method: service-account
7-
project: dev-ci-testing
87
keyfile: ./creds.json
8+
project: "{{ env_var('DBT_BIGQUERY_CI_PROJECT') }}"
99
dataset: connector
10-
threads: 8
10+
threads: 4
1111
timeout_seconds: 300
1212
location: US
1313
priority: interactive

‎integration_tests/profiles/databricks/profiles.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ default:
33
outputs:
44
ci:
55
type: databricks
6-
host: "${{ env_var('DATABRICKS_HOST') }"
7-
http_path: "${{ env_var('DATABRICKS_HTTP_PATH') }"
8-
token: "${{ env_var('DATABRICKS_TOKEN') }"
9-
catalog: 'hive_metastore'
6+
host: "${{ env_var('DBT_DATABRICKS_CI_HOST') }}"
7+
http_path: "${{ env_var('DBT_DATABRICKS_CI_HTTP_PATH') }}"
8+
token: "${{ env_var('DBT_DATABRICKS_CI_TOKEN') }}"
9+
catalog: "${{ env_var('DBT_DATABRICKS_CI_CATALOG') }}"
1010
schema: ci_testing
1111
threads: 8
1212
connect_timeout: 60

‎integration_tests/profiles/duckdb/profiles.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ default:
22
target: ci
33
outputs:
44
ci:
5-
type: duckdb
6-
path: "${{ env_var('MOTHERDUCK_PATH') }}"
7-
threads: 4
8-
settings:
9-
custom_user_agent: 'dbt-ci'
5+
type: fabric
6+
host: "{{ env_var('DBT_FABRIC_CI_HOST') }}"
7+
database: "{{ env_var('DBT_FABRIC_CI_DATABASE') }}"
8+
schema: "{{ env_var('DBT_FABRIC_CI_SCHEMA') }}"
9+
authentication: ServicePrincipal
10+
driver: ODBC Driver 18 for SQL Server
11+
client_id: "{{ env_var('DBT_FABRIC_CI_SERVICE_PRINCIPAL_ID') }}"
12+
client_secret: "{{ env_var('DBT_FABRIC_CI_SERVICE_PRINCIPAL_SECRET') }}"
13+
tenant_id: "{{ env_var('DBT_FABRIC_CI_TENANT_ID') }}"
14+
threads: 8

‎integration_tests/profiles/fabric/profiles.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
default:
2-
target: dev
2+
target: ci
33
outputs:
4-
dev:
4+
ci:
55
type: fabric
66
host: "{{ env_var('DBT_FABRIC_CI_HOST') }}"
77
database: "{{ env_var('DBT_FABRIC_CI_DATABASE') }}"
88
schema: "{{ env_var('DBT_FABRIC_CI_SCHEMA') }}"
99
authentication: ServicePrincipal
1010
driver: ODBC Driver 18 for SQL Server
11-
client_id: "{{ env_var('DBT_FABRIC_SERVICE_PRINCIPAL_ID') }}"
12-
client_secret: "{{ env_var('DBT_FABRIC_SERVICE_PRINCIPAL_SECRET') }}"
13-
tenant_id: "{{ env_var('DBT_FABRIC_TENANT_ID') }}"
14-
threads: 8
11+
client_id: "{{ env_var('DBT_FABRIC_CI_SERVICE_PRINCIPAL_ID') }}"
12+
client_secret: "{{ env_var('DBT_FABRIC_CI_SERVICE_PRINCIPAL_SECRET') }}"
13+
tenant_id: "{{ env_var('DBT_FABRIC_CI_TENANT_ID') }}"
14+
threads: 8

‎integration_tests/profiles/redshift/profiles.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
default: # Replace with your project name
1+
default:
22
target: ci
33
outputs:
44
ci:
55
type: redshift
6-
host: "{{ env_var('REDSHIFT_HOST') }}"
7-
user: "{{ env_var('REDSHIFT_USER') }}"
8-
password: "{{ env_var('REDSHIFT_PASSWORD') }}"
9-
port: 5439
10-
dbname: "{{ env_var('REDSHIFT_DB') }}"
11-
schema: public
12-
threads: 4
6+
host: "{{ env_var('DBT_REDSHIFT_CI_HOST') }}"
7+
user: "{{ env_var('DBT_REDSHIFT_CI_USER') }}"
8+
password: "{{ env_var('DBT_REDSHIFT_CI_PASSWORD') }}"
9+
dbname: "{{ env_var('DBT_REDSHIFT_CI_DATABASE') }}"
10+
schema: "{{ env_var('DBT_REDSHIFT_CI_SCHEMA') }}"
1311
keepalives_idle: 240
14-
connect_timeout: 10
12+
connect_timeout: 120
13+
port: 5439
14+
ra3_node: true
15+
threads: 2

0 commit comments

Comments
 (0)