diff --git a/.github/workflows/publish-base-image.yml b/.github/workflows/publish-base-image.yml new file mode 100644 index 00000000..9474707a --- /dev/null +++ b/.github/workflows/publish-base-image.yml @@ -0,0 +1,133 @@ +name: Publish base image + +# Manually-triggered, approval-gated publish of the data-eng-bench base image +# to GHCR (ghcr.io/snowflake-labs/data-eng-bench-base). +# +# Auth: the workflow's built-in GITHUB_TOKEN (packages: write) — a short-lived +# token scoped to this run. No personal access token is created or stored. +# +# Approval: the `build` and `merge` jobs are gated behind a single `approve` +# job bound to the `publish-base-image` GitHub Environment. Configure required +# reviewers on that environment (Settings -> Environments) so a publish waits +# for a human approval before anything is pushed. +# +# Multi-arch: linux/amd64 and linux/arm64 are each built natively (no QEMU +# emulation) because the image runs `dbt run` at build time, which is slow and +# can crash under emulation. Per-arch images are pushed by digest, then a +# manifest list is assembled in the merge job. +# +# Prerequisite (one-time): the GHCR package must grant this repository Write +# access (package -> Settings -> Manage Actions access -> add data-eng-bench +# with Write), otherwise the push 403s. + +on: + workflow_dispatch: + inputs: + version: + description: "Image version tag (e.g. 1.0.0)" + required: true + default: "1.0.0" + push_latest: + description: "Also tag and push :latest" + type: boolean + default: true + +permissions: + contents: read + packages: write + +env: + IMAGE: ghcr.io/snowflake-labs/data-eng-bench-base + +jobs: + # Single human-approval gate for the whole run. Required reviewers live on the + # `publish-base-image` environment; approving this unblocks build + merge. + approve: + runs-on: ubuntu-latest + environment: publish-base-image + steps: + - run: echo "Publish approved for ${IMAGE}:${{ inputs.version }} (latest=${{ inputs.push_latest }})" + + build: + needs: approve + strategy: + fail-fast: false + matrix: + include: + - platform: linux/amd64 + runner: ubuntu-latest + - platform: linux/arm64 + runner: ubuntu-24.04-arm + runs-on: ${{ matrix.runner }} + steps: + - name: Checkout (with LFS for retail.duckdb) + uses: actions/checkout@v4 + with: + lfs: true + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v6 + with: + context: base-image + platforms: ${{ matrix.platform }} + provenance: false + outputs: type=image,name=${{ env.IMAGE }},push-by-digest=true,name-canonical=true,push=true + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digest-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + needs: build + runs-on: ubuntu-latest + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digest-* + merge-multiple: true + + - name: Set up Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Create and push manifest list + working-directory: /tmp/digests + run: | + tags="-t ${IMAGE}:${{ inputs.version }}" + if [ "${{ inputs.push_latest }}" = "true" ]; then + tags="${tags} -t ${IMAGE}:latest" + fi + docker buildx imagetools create ${tags} \ + $(printf "${IMAGE}@sha256:%s " *) + + - name: Inspect published manifest + run: docker buildx imagetools inspect "${IMAGE}:${{ inputs.version }}" diff --git a/.gitignore b/.gitignore index c1d651d6..0439da8e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ logs/ # local skill installs (npx skills add) .agents/ +.claude/ +skills-lock.json diff --git a/README.md b/README.md index 599c6c9c..7e348364 100644 --- a/README.md +++ b/README.md @@ -143,10 +143,18 @@ harbor run --config configs/data-eng-bench-snowflake.claude-code.yaml --path tas ``` Each task's Harbor healthcheck clones `SNOWFLAKE_SOURCE_DATABASE` into an -isolated `retail_clone_*` database and points the agent + verifier at it, then -drops it on completion. Password auth (above) or key-pair -(`SNOWFLAKE_PRIVATE_KEY`, base64 PEM) both work; the role only needs -`CREATE DATABASE` plus access to the source. +isolated `retail_clone_*` database and points the agent + verifier at it; the +role only needs `CREATE DATABASE` plus access to the source. The clone and +verifier accept password auth (above) or key-pair (`SNOWFLAKE_PRIVATE_KEY`, +base64 PEM). Note the bundled reference solutions (`solution/solve.sh`) +authenticate dbt with key-pair, so reproducing the oracle / leaderboard on +Snowflake requires `SNOWFLAKE_PRIVATE_KEY`. + +Each task drops its clone at the end of the verifier phase. A run that fails +*before* verification (e.g. a clone timeout) can leave a `retail_clone_*` +behind, since Harbor tasks have no always-run teardown hook. Reclaim strays +with `base-image/sweep_snowflake_clones.py` (drops `retail_clone_*` older than +a `--older-than-hours` cutoff; supports `--dry-run`). A `k=3` sweep over all 103 Snowflake tasks runs roughly 6 to 9 warehouse-hours on a free-tier account; use the fast subset for cost-bounded runs. diff --git a/base-image/Dockerfile b/base-image/Dockerfile index be540803..ebeff4d8 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -29,6 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ tmux \ curl \ git \ + procps \ && rm -rf /var/lib/apt/lists/* # Node.js 22 — required by CLI coding agents that run inside the container diff --git a/base-image/cleanup_snowflake.py b/base-image/cleanup_snowflake.py index f798a797..e5f5f964 100644 --- a/base-image/cleanup_snowflake.py +++ b/base-image/cleanup_snowflake.py @@ -98,11 +98,16 @@ def get_private_key(): conn_kwargs = dict( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, user=os.environ['SNOWFLAKE_USER'], warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=admin_role, ) + # Include host only when explicitly set. Passing host=None makes the + # connector fail to derive it from an org-dash account + # ('NoneType' has no attribute 'lower'), which silently aborted cleanup + # and leaked clone databases. Matches snowflake_clone.py. + if os.environ.get('SNOWFLAKE_HOST'): + conn_kwargs['host'] = os.environ['SNOWFLAKE_HOST'] # Password when available, else key-pair (matches snowflake_clone.py). if os.environ.get('SNOWFLAKE_PASSWORD'): conn_kwargs['password'] = os.environ['SNOWFLAKE_PASSWORD'] diff --git a/base-image/sweep_snowflake_clones.py b/base-image/sweep_snowflake_clones.py new file mode 100644 index 00000000..997ed855 --- /dev/null +++ b/base-image/sweep_snowflake_clones.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python3 +"""Drop orphaned per-task Snowflake clone databases left by DB_TYPE=snowflake runs. + +Each Snowflake task clones SNOWFLAKE_SOURCE_DATABASE into ``retail_clone_`` +via the Harbor healthcheck, and cleanup_snowflake.py drops it at the end of the +task's test.sh. A run that fails *before* the verifier phase (e.g. a +healthcheck/clone timeout or an agent crash) never reaches that cleanup, so the +clone is orphaned. Harbor tasks have no always-run teardown hook, so run this +sweep periodically (cron) or after a batch to reclaim leftovers. + +Auth mirrors snowflake_clone.py / cleanup_snowflake.py: SNOWFLAKE_PASSWORD when +set, otherwise a base64 PKCS8 key in SNOWFLAKE_PRIVATE_KEY (+ optional +SNOWFLAKE_PRIVATE_KEY_PASSPHRASE). SNOWFLAKE_HOST is optional and passed only +when set (passing host=None breaks host derivation for org-dash accounts). + +Usage: + export SNOWFLAKE_ACCOUNT=... SNOWFLAKE_USER=... SNOWFLAKE_PASSWORD=... + export SNOWFLAKE_WAREHOUSE=COMPUTE_WH SNOWFLAKE_ROLE=SYSADMIN + python3 sweep_snowflake_clones.py --older-than-hours 24 # drop stale + python3 sweep_snowflake_clones.py --older-than-hours 0 --dry-run # preview all +""" + +import argparse +import base64 +import datetime +import os +import sys + + +def _connect_kwargs() -> dict: + kwargs = { + "account": os.environ["SNOWFLAKE_ACCOUNT"], + "user": os.environ["SNOWFLAKE_USER"], + "warehouse": os.environ["SNOWFLAKE_WAREHOUSE"], + "role": os.environ.get("SNOWFLAKE_ROLE") or None, + } + # Only pass host when explicitly set; host=None breaks org-dash derivation. + if os.environ.get("SNOWFLAKE_HOST"): + kwargs["host"] = os.environ["SNOWFLAKE_HOST"] + + password = os.environ.get("SNOWFLAKE_PASSWORD") + if password: + kwargs["password"] = password + return kwargs + + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives import serialization + + key_b64 = os.environ.get("SNOWFLAKE_PRIVATE_KEY", "") + if not key_b64: + raise SystemExit("Need SNOWFLAKE_PASSWORD or SNOWFLAKE_PRIVATE_KEY.") + passphrase = os.environ.get("SNOWFLAKE_PRIVATE_KEY_PASSPHRASE") or None + p_key = serialization.load_pem_private_key( + base64.b64decode(key_b64), + password=passphrase.encode() if passphrase else None, + backend=default_backend(), + ) + kwargs["private_key"] = p_key.private_bytes( + encoding=serialization.Encoding.DER, + format=serialization.PrivateFormat.PKCS8, + encryption_algorithm=serialization.NoEncryption(), + ) + return kwargs + + +def main() -> int: + ap = argparse.ArgumentParser(description=__doc__) + ap.add_argument("--prefix", default="retail_clone_", + help="Clone name prefix to match (default: retail_clone_)") + ap.add_argument("--older-than-hours", type=float, default=24.0, + help="Only drop clones older than this many hours (default: 24)") + ap.add_argument("--dry-run", action="store_true", + help="List what would be dropped without dropping") + args = ap.parse_args() + + import snowflake.connector + + conn = snowflake.connector.connect(**_connect_kwargs()) + now = datetime.datetime.now(datetime.timezone.utc) + cutoff = now - datetime.timedelta(hours=args.older_than_hours) + prefix = args.prefix.lower() + + dropped = kept = 0 + try: + cur = conn.cursor() + # SHOW DATABASES columns: created_on(0), name(1), ... + cur.execute(f"SHOW DATABASES LIKE '{args.prefix}%'") + rows = cur.fetchall() + for row in rows: + created_on, name = row[0], row[1] + if not name.lower().startswith(prefix): + continue + age_h = (now - created_on).total_seconds() / 3600.0 + if created_on > cutoff: + kept += 1 + continue + if args.dry_run: + print(f"[dry-run] would drop {name} (age {age_h:.1f}h)") + dropped += 1 + continue + try: + cur.execute(f'DROP DATABASE IF EXISTS "{name}"') + print(f"dropped {name} (age {age_h:.1f}h)") + dropped += 1 + except Exception as e: + print(f"WARN could not drop {name}: {e}", file=sys.stderr) + finally: + conn.close() + + verb = "would drop" if args.dry_run else "dropped" + print(f"\n{verb} {dropped} clone(s); kept {kept} younger than " + f"{args.older_than_hours}h.") + return 0 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/configs/data-eng-bench-snowflake.claude-code.yaml b/configs/data-eng-bench-snowflake.claude-code.yaml index e391cba4..2d279a33 100644 --- a/configs/data-eng-bench-snowflake.claude-code.yaml +++ b/configs/data-eng-bench-snowflake.claude-code.yaml @@ -25,15 +25,18 @@ quiet: true environment: type: docker + # Only DB_TYPE is set here. The SNOWFLAKE_* credentials are intentionally NOT + # listed: each task's environment/docker-compose.yaml already forwards + # ${SNOWFLAKE_*} from the host environment, so exporting them in your shell + # (see header) is enough — they flow straight through to the container. + # + # Do NOT re-add them here. Stock Harbor stores run-config env verbatim (it does + # not resolve ${VAR} templates in environment.env), so a line like + # `SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD}` injects the literal string + # "${SNOWFLAKE_PASSWORD}" into the compose env and clobbers the real exported + # value, breaking Snowflake auth. env: - DB_TYPE=snowflake - - SNOWFLAKE_ACCOUNT=${SNOWFLAKE_ACCOUNT} - - SNOWFLAKE_USER=${SNOWFLAKE_USER} - - SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD} - - SNOWFLAKE_WAREHOUSE=${SNOWFLAKE_WAREHOUSE:-COMPUTE_WH} - - SNOWFLAKE_SOURCE_DATABASE=${SNOWFLAKE_SOURCE_DATABASE:-DBT_BENCH_RETAIL} - - SNOWFLAKE_SCHEMA=${SNOWFLAKE_SCHEMA:-main} - - SNOWFLAKE_ROLE=${SNOWFLAKE_ROLE:-SYSADMIN} agents: - name: claude-code diff --git a/configs/data-eng-bench-snowflake.codex.yaml b/configs/data-eng-bench-snowflake.codex.yaml index 7f0eb663..bef11912 100644 --- a/configs/data-eng-bench-snowflake.codex.yaml +++ b/configs/data-eng-bench-snowflake.codex.yaml @@ -25,15 +25,18 @@ quiet: true environment: type: docker + # Only DB_TYPE is set here. The SNOWFLAKE_* credentials are intentionally NOT + # listed: each task's environment/docker-compose.yaml already forwards + # ${SNOWFLAKE_*} from the host environment, so exporting them in your shell + # (see header) is enough — they flow straight through to the container. + # + # Do NOT re-add them here. Stock Harbor stores run-config env verbatim (it does + # not resolve ${VAR} templates in environment.env), so a line like + # `SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD}` injects the literal string + # "${SNOWFLAKE_PASSWORD}" into the compose env and clobbers the real exported + # value, breaking Snowflake auth. env: - DB_TYPE=snowflake - - SNOWFLAKE_ACCOUNT=${SNOWFLAKE_ACCOUNT} - - SNOWFLAKE_USER=${SNOWFLAKE_USER} - - SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD} - - SNOWFLAKE_WAREHOUSE=${SNOWFLAKE_WAREHOUSE:-COMPUTE_WH} - - SNOWFLAKE_SOURCE_DATABASE=${SNOWFLAKE_SOURCE_DATABASE:-DBT_BENCH_RETAIL} - - SNOWFLAKE_SCHEMA=${SNOWFLAKE_SCHEMA:-main} - - SNOWFLAKE_ROLE=${SNOWFLAKE_ROLE:-SYSADMIN} agents: - name: codex diff --git a/configs/data-eng-bench-snowflake.cortex-code.yaml b/configs/data-eng-bench-snowflake.cortex-code.yaml index 02f81fba..c4c3b33d 100644 --- a/configs/data-eng-bench-snowflake.cortex-code.yaml +++ b/configs/data-eng-bench-snowflake.cortex-code.yaml @@ -25,15 +25,18 @@ quiet: true environment: type: docker + # Only DB_TYPE is set here. The SNOWFLAKE_* credentials are intentionally NOT + # listed: each task's environment/docker-compose.yaml already forwards + # ${SNOWFLAKE_*} from the host environment, so exporting them in your shell + # (see header) is enough — they flow straight through to the container. + # + # Do NOT re-add them here. Stock Harbor stores run-config env verbatim (it does + # not resolve ${VAR} templates in environment.env), so a line like + # `SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD}` injects the literal string + # "${SNOWFLAKE_PASSWORD}" into the compose env and clobbers the real exported + # value, breaking Snowflake auth. env: - DB_TYPE=snowflake - - SNOWFLAKE_ACCOUNT=${SNOWFLAKE_ACCOUNT} - - SNOWFLAKE_USER=${SNOWFLAKE_USER} - - SNOWFLAKE_PASSWORD=${SNOWFLAKE_PASSWORD} - - SNOWFLAKE_WAREHOUSE=${SNOWFLAKE_WAREHOUSE:-COMPUTE_WH} - - SNOWFLAKE_SOURCE_DATABASE=${SNOWFLAKE_SOURCE_DATABASE:-DBT_BENCH_RETAIL} - - SNOWFLAKE_SCHEMA=${SNOWFLAKE_SCHEMA:-main} - - SNOWFLAKE_ROLE=${SNOWFLAKE_ROLE:-SYSADMIN} agents: - name: cortex-code diff --git a/tasks/cohort-retention-matrix/solution/solve.sh b/tasks/cohort-retention-matrix/solution/solve.sh index facb4c47..40d78f7d 100644 --- a/tasks/cohort-retention-matrix/solution/solve.sh +++ b/tasks/cohort-retention-matrix/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/cohort-retention-matrix/tests/test_outputs.py b/tasks/cohort-retention-matrix/tests/test_outputs.py index 49e0321d..420306f6 100644 --- a/tasks/cohort-retention-matrix/tests/test_outputs.py +++ b/tasks/cohort-retention-matrix/tests/test_outputs.py @@ -68,7 +68,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -79,11 +79,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='marketing_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-abc-classification/tests/test_outputs.py b/tasks/dbt-abc-classification/tests/test_outputs.py index 72ac143c..76122de8 100644 --- a/tasks/dbt-abc-classification/tests/test_outputs.py +++ b/tasks/dbt-abc-classification/tests/test_outputs.py @@ -102,7 +102,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -113,11 +113,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-basket-composition-analysis/solution/solve.sh b/tasks/dbt-basket-composition-analysis/solution/solve.sh index bd01c687..5d380a90 100755 --- a/tasks/dbt-basket-composition-analysis/solution/solve.sh +++ b/tasks/dbt-basket-composition-analysis/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-basket-composition-analysis/tests/test_outputs.py b/tasks/dbt-basket-composition-analysis/tests/test_outputs.py index cb4eb9f5..0722ae28 100644 --- a/tasks/dbt-basket-composition-analysis/tests/test_outputs.py +++ b/tasks/dbt-basket-composition-analysis/tests/test_outputs.py @@ -155,7 +155,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -166,11 +166,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='basket_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-calculate-running-balance/solution/solve.sh b/tasks/dbt-calculate-running-balance/solution/solve.sh index 1d8404b9..2c72b4a1 100644 --- a/tasks/dbt-calculate-running-balance/solution/solve.sh +++ b/tasks/dbt-calculate-running-balance/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-calculate-running-balance/tests/test_outputs.py b/tasks/dbt-calculate-running-balance/tests/test_outputs.py index f4390cba..46d2a797 100644 --- a/tasks/dbt-calculate-running-balance/tests/test_outputs.py +++ b/tasks/dbt-calculate-running-balance/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,11 +75,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='finance_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-campaign-performance/tests/test_outputs.py b/tasks/dbt-campaign-performance/tests/test_outputs.py index a5f55fa8..9052a663 100644 --- a/tasks/dbt-campaign-performance/tests/test_outputs.py +++ b/tasks/dbt-campaign-performance/tests/test_outputs.py @@ -78,7 +78,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -89,7 +89,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-campaign-roi-analysis/tests/test_outputs.py b/tasks/dbt-campaign-roi-analysis/tests/test_outputs.py index 0fde0033..ca9df4f5 100644 --- a/tasks/dbt-campaign-roi-analysis/tests/test_outputs.py +++ b/tasks/dbt-campaign-roi-analysis/tests/test_outputs.py @@ -65,7 +65,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -76,7 +76,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-carrier-delivery-performance/solution/solve.sh b/tasks/dbt-carrier-delivery-performance/solution/solve.sh index e28e5a55..056f3e86 100644 --- a/tasks/dbt-carrier-delivery-performance/solution/solve.sh +++ b/tasks/dbt-carrier-delivery-performance/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-carrier-delivery-performance/tests/test_outputs.py b/tasks/dbt-carrier-delivery-performance/tests/test_outputs.py index 3493d16f..60930fda 100644 --- a/tasks/dbt-carrier-delivery-performance/tests/test_outputs.py +++ b/tasks/dbt-carrier-delivery-performance/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-cart-abandonment-recovery/solution/solve.sh b/tasks/dbt-cart-abandonment-recovery/solution/solve.sh index 00bddc11..0fce9628 100644 --- a/tasks/dbt-cart-abandonment-recovery/solution/solve.sh +++ b/tasks/dbt-cart-abandonment-recovery/solution/solve.sh @@ -37,7 +37,7 @@ pk_bytes_der = p_key.private_bytes( ) conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pk_bytes_der, role=os.environ['SNOWFLAKE_ADMIN_ROLE'], diff --git a/tasks/dbt-cart-abandonment-recovery/tests/test_outputs.py b/tasks/dbt-cart-abandonment-recovery/tests/test_outputs.py index e9bf93ef..4e8c2390 100644 --- a/tasks/dbt-cart-abandonment-recovery/tests/test_outputs.py +++ b/tasks/dbt-cart-abandonment-recovery/tests/test_outputs.py @@ -58,7 +58,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -69,7 +69,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-channel-attribution-analysis/tests/test_outputs.py b/tasks/dbt-channel-attribution-analysis/tests/test_outputs.py index 3043992d..b82638ee 100644 --- a/tasks/dbt-channel-attribution-analysis/tests/test_outputs.py +++ b/tasks/dbt-channel-attribution-analysis/tests/test_outputs.py @@ -70,7 +70,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -81,7 +81,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-consolidate/tests/test_outputs.py b/tasks/dbt-consolidate/tests/test_outputs.py index 7279ba0d..15be7f4a 100644 --- a/tasks/dbt-consolidate/tests/test_outputs.py +++ b/tasks/dbt-consolidate/tests/test_outputs.py @@ -72,7 +72,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -83,11 +83,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='ANALYTICS', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-coupon-effectiveness/tests/test_outputs.py b/tasks/dbt-coupon-effectiveness/tests/test_outputs.py index ba3ce543..d1f68c0e 100644 --- a/tasks/dbt-coupon-effectiveness/tests/test_outputs.py +++ b/tasks/dbt-coupon-effectiveness/tests/test_outputs.py @@ -114,7 +114,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -125,11 +125,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-customer-acquisition-channel-performance/tests/test_outputs.py b/tasks/dbt-customer-acquisition-channel-performance/tests/test_outputs.py index 041652be..aff931be 100644 --- a/tasks/dbt-customer-acquisition-channel-performance/tests/test_outputs.py +++ b/tasks/dbt-customer-acquisition-channel-performance/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-churn-cohorts/tests/test_outputs.py b/tasks/dbt-customer-churn-cohorts/tests/test_outputs.py index 02210f36..d0878a24 100644 --- a/tasks/dbt-customer-churn-cohorts/tests/test_outputs.py +++ b/tasks/dbt-customer-churn-cohorts/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,7 +80,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], @@ -166,7 +166,7 @@ def get_ground_truth_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -177,7 +177,7 @@ def get_ground_truth_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-churn-early-warning/solution/solve.sh b/tasks/dbt-customer-churn-early-warning/solution/solve.sh index a8a61026..a5b8c26c 100644 --- a/tasks/dbt-customer-churn-early-warning/solution/solve.sh +++ b/tasks/dbt-customer-churn-early-warning/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-customer-churn-early-warning/tests/test_outputs.py b/tasks/dbt-customer-churn-early-warning/tests/test_outputs.py index ebd24e99..63a6cfbe 100644 --- a/tasks/dbt-customer-churn-early-warning/tests/test_outputs.py +++ b/tasks/dbt-customer-churn-early-warning/tests/test_outputs.py @@ -68,7 +68,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -79,7 +79,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-cltv-forecasting/solution/solve.sh b/tasks/dbt-customer-cltv-forecasting/solution/solve.sh index 70bd6512..96fcf281 100644 --- a/tasks/dbt-customer-cltv-forecasting/solution/solve.sh +++ b/tasks/dbt-customer-cltv-forecasting/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-customer-cltv-forecasting/tests/test_outputs.py b/tasks/dbt-customer-cltv-forecasting/tests/test_outputs.py index 2770333f..6fde8baa 100644 --- a/tasks/dbt-customer-cltv-forecasting/tests/test_outputs.py +++ b/tasks/dbt-customer-cltv-forecasting/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,11 +74,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) @@ -183,11 +183,11 @@ def run_dbt_pipeline(): import snowflake.connector _conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-customer-cohort-retention/tests/test_outputs.py b/tasks/dbt-customer-cohort-retention/tests/test_outputs.py index 9b976562..f2c674cd 100644 --- a/tasks/dbt-customer-cohort-retention/tests/test_outputs.py +++ b/tasks/dbt-customer-cohort-retention/tests/test_outputs.py @@ -71,7 +71,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -82,7 +82,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-cross-sell-insights/solution/solve.sh b/tasks/dbt-customer-cross-sell-insights/solution/solve.sh index 0c54d813..4e962c66 100644 --- a/tasks/dbt-customer-cross-sell-insights/solution/solve.sh +++ b/tasks/dbt-customer-cross-sell-insights/solution/solve.sh @@ -81,7 +81,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-customer-cross-sell-insights/tests/test_outputs.py b/tasks/dbt-customer-cross-sell-insights/tests/test_outputs.py index ff5fc7f9..93c63dfd 100644 --- a/tasks/dbt-customer-cross-sell-insights/tests/test_outputs.py +++ b/tasks/dbt-customer-cross-sell-insights/tests/test_outputs.py @@ -60,7 +60,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -71,7 +71,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-geographic/solution/solve.sh b/tasks/dbt-customer-geographic/solution/solve.sh index ad3ec8f1..ecbd325c 100644 --- a/tasks/dbt-customer-geographic/solution/solve.sh +++ b/tasks/dbt-customer-geographic/solution/solve.sh @@ -63,7 +63,7 @@ admin_role = os.environ.get('SNOWFLAKE_ADMIN_ROLE', '') conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-customer-geographic/tests/test_outputs.py b/tasks/dbt-customer-geographic/tests/test_outputs.py index ee4a04e9..e96b9d8b 100644 --- a/tasks/dbt-customer-geographic/tests/test_outputs.py +++ b/tasks/dbt-customer-geographic/tests/test_outputs.py @@ -87,7 +87,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -98,7 +98,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-lifecycle-journey/tests/test_outputs.py b/tasks/dbt-customer-lifecycle-journey/tests/test_outputs.py index c94c6a72..cc8838b3 100644 --- a/tasks/dbt-customer-lifecycle-journey/tests/test_outputs.py +++ b/tasks/dbt-customer-lifecycle-journey/tests/test_outputs.py @@ -62,7 +62,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -73,7 +73,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-lifetime-value/tests/test_outputs.py b/tasks/dbt-customer-lifetime-value/tests/test_outputs.py index 01dd9c33..f466f4b2 100644 --- a/tasks/dbt-customer-lifetime-value/tests/test_outputs.py +++ b/tasks/dbt-customer-lifetime-value/tests/test_outputs.py @@ -126,7 +126,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -137,7 +137,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-ltv-fix/tests/test_outputs.py b/tasks/dbt-customer-ltv-fix/tests/test_outputs.py index e3627ef4..2591d932 100644 --- a/tasks/dbt-customer-ltv-fix/tests/test_outputs.py +++ b/tasks/dbt-customer-ltv-fix/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,7 +74,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-order-analytics/solution/solve.sh b/tasks/dbt-customer-order-analytics/solution/solve.sh index 6454fae2..8ade123d 100644 --- a/tasks/dbt-customer-order-analytics/solution/solve.sh +++ b/tasks/dbt-customer-order-analytics/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-customer-order-analytics/tests/test_outputs.py b/tasks/dbt-customer-order-analytics/tests/test_outputs.py index 4ff00e5d..6118cf69 100644 --- a/tasks/dbt-customer-order-analytics/tests/test_outputs.py +++ b/tasks/dbt-customer-order-analytics/tests/test_outputs.py @@ -101,7 +101,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -112,7 +112,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-retention-risk/tests/test_outputs.py b/tasks/dbt-customer-retention-risk/tests/test_outputs.py index 5c452e0a..00ab5906 100644 --- a/tasks/dbt-customer-retention-risk/tests/test_outputs.py +++ b/tasks/dbt-customer-retention-risk/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-customer-risk-scoring/tests/test_outputs.py b/tasks/dbt-customer-risk-scoring/tests/test_outputs.py index 9eb8bcad..1b06fc0e 100644 --- a/tasks/dbt-customer-risk-scoring/tests/test_outputs.py +++ b/tasks/dbt-customer-risk-scoring/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,7 +80,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-daily-order-summary/solution/solve.sh b/tasks/dbt-daily-order-summary/solution/solve.sh index 219d17c7..580b8120 100644 --- a/tasks/dbt-daily-order-summary/solution/solve.sh +++ b/tasks/dbt-daily-order-summary/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], @@ -67,7 +67,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-daily-order-summary/tests/test_outputs.py b/tasks/dbt-daily-order-summary/tests/test_outputs.py index 1c3dc4c4..7d74f269 100644 --- a/tasks/dbt-daily-order-summary/tests/test_outputs.py +++ b/tasks/dbt-daily-order-summary/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,11 +74,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='daily_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-dq-macro-enforcement/solution/solve.sh b/tasks/dbt-dq-macro-enforcement/solution/solve.sh index 93976beb..12752f82 100644 --- a/tasks/dbt-dq-macro-enforcement/solution/solve.sh +++ b/tasks/dbt-dq-macro-enforcement/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-dq-macro-enforcement/tests/test_outputs.py b/tasks/dbt-dq-macro-enforcement/tests/test_outputs.py index 9759e483..abaa2e64 100644 --- a/tasks/dbt-dq-macro-enforcement/tests/test_outputs.py +++ b/tasks/dbt-dq-macro-enforcement/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-email-campaign-tracker/tests/test_outputs.py b/tasks/dbt-email-campaign-tracker/tests/test_outputs.py index 71c6538f..7bfc6a08 100644 --- a/tasks/dbt-email-campaign-tracker/tests/test_outputs.py +++ b/tasks/dbt-email-campaign-tracker/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,11 +78,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-exchange-rate-settlement-date/solution/solve.sh b/tasks/dbt-exchange-rate-settlement-date/solution/solve.sh index 3e51925f..f6732a75 100644 --- a/tasks/dbt-exchange-rate-settlement-date/solution/solve.sh +++ b/tasks/dbt-exchange-rate-settlement-date/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-exchange-rate-settlement-date/tests/test_outputs.py b/tasks/dbt-exchange-rate-settlement-date/tests/test_outputs.py index 1cf2789a..c2c472c1 100644 --- a/tasks/dbt-exchange-rate-settlement-date/tests/test_outputs.py +++ b/tasks/dbt-exchange-rate-settlement-date/tests/test_outputs.py @@ -62,7 +62,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -73,7 +73,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-cac-payback-waterfall/solution/solve.sh b/tasks/dbt-fix-cac-payback-waterfall/solution/solve.sh index e723267f..44480b4d 100755 --- a/tasks/dbt-fix-cac-payback-waterfall/solution/solve.sh +++ b/tasks/dbt-fix-cac-payback-waterfall/solution/solve.sh @@ -111,7 +111,7 @@ pkb = p_key.private_bytes( conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-cac-payback-waterfall/tests/test_outputs.py b/tasks/dbt-fix-cac-payback-waterfall/tests/test_outputs.py index c798a2f6..b48941c7 100644 --- a/tasks/dbt-fix-cac-payback-waterfall/tests/test_outputs.py +++ b/tasks/dbt-fix-cac-payback-waterfall/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-category-revenue/tests/test_outputs.py b/tasks/dbt-fix-category-revenue/tests/test_outputs.py index 11402195..a7cedc88 100644 --- a/tasks/dbt-fix-category-revenue/tests/test_outputs.py +++ b/tasks/dbt-fix-category-revenue/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-customer-churn/tests/test_outputs.py b/tasks/dbt-fix-customer-churn/tests/test_outputs.py index 312ceb83..3979ab94 100644 --- a/tasks/dbt-fix-customer-churn/tests/test_outputs.py +++ b/tasks/dbt-fix-customer-churn/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-customer-ltv/tests/test_outputs.py b/tasks/dbt-fix-customer-ltv/tests/test_outputs.py index 216c798a..67f0f3b2 100644 --- a/tasks/dbt-fix-customer-ltv/tests/test_outputs.py +++ b/tasks/dbt-fix-customer-ltv/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,7 +74,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-customer-snapshot-and-build-dimension/solution/solve.sh b/tasks/dbt-fix-customer-snapshot-and-build-dimension/solution/solve.sh index 86d309db..38d14145 100644 --- a/tasks/dbt-fix-customer-snapshot-and-build-dimension/solution/solve.sh +++ b/tasks/dbt-fix-customer-snapshot-and-build-dimension/solution/solve.sh @@ -107,7 +107,7 @@ clone_db = os.environ['SNOWFLAKE_DATABASE'] conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-fix-customer-snapshot-and-build-dimension/tests/test_outputs.py b/tasks/dbt-fix-customer-snapshot-and-build-dimension/tests/test_outputs.py index 4c8ef1db..55e3a2a7 100644 --- a/tasks/dbt-fix-customer-snapshot-and-build-dimension/tests/test_outputs.py +++ b/tasks/dbt-fix-customer-snapshot-and-build-dimension/tests/test_outputs.py @@ -65,7 +65,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -76,7 +76,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-daily-cohorts/tests/test_outputs.py b/tasks/dbt-fix-daily-cohorts/tests/test_outputs.py index 25c89365..349eff6d 100644 --- a/tasks/dbt-fix-daily-cohorts/tests/test_outputs.py +++ b/tasks/dbt-fix-daily-cohorts/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-daily-revenue/tests/test_outputs.py b/tasks/dbt-fix-daily-revenue/tests/test_outputs.py index 1e90ce9e..ac1858b9 100644 --- a/tasks/dbt-fix-daily-revenue/tests/test_outputs.py +++ b/tasks/dbt-fix-daily-revenue/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-division-by-zero/tests/test_outputs.py b/tasks/dbt-fix-division-by-zero/tests/test_outputs.py index b7336c11..32f1fc49 100644 --- a/tasks/dbt-fix-division-by-zero/tests/test_outputs.py +++ b/tasks/dbt-fix-division-by-zero/tests/test_outputs.py @@ -83,7 +83,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -94,7 +94,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-email-attribution/tests/test_outputs.py b/tasks/dbt-fix-email-attribution/tests/test_outputs.py index 56d5a875..5c9a6cd1 100644 --- a/tasks/dbt-fix-email-attribution/tests/test_outputs.py +++ b/tasks/dbt-fix-email-attribution/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,11 +74,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-fix-inventory-balance/tests/test_outputs.py b/tasks/dbt-fix-inventory-balance/tests/test_outputs.py index 31508190..6e00ab57 100644 --- a/tasks/dbt-fix-inventory-balance/tests/test_outputs.py +++ b/tasks/dbt-fix-inventory-balance/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-inventory-model/tests/test_outputs.py b/tasks/dbt-fix-inventory-model/tests/test_outputs.py index 912486ca..a9889094 100644 --- a/tasks/dbt-fix-inventory-model/tests/test_outputs.py +++ b/tasks/dbt-fix-inventory-model/tests/test_outputs.py @@ -78,7 +78,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -89,7 +89,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-marketing-attribution/tests/test_outputs.py b/tasks/dbt-fix-marketing-attribution/tests/test_outputs.py index 2b3aeebc..98eb4bfc 100644 --- a/tasks/dbt-fix-marketing-attribution/tests/test_outputs.py +++ b/tasks/dbt-fix-marketing-attribution/tests/test_outputs.py @@ -57,7 +57,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -68,7 +68,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-multi-touch-attribution/tests/test_outputs.py b/tasks/dbt-fix-multi-touch-attribution/tests/test_outputs.py index 03fad3c0..6fb7973a 100644 --- a/tasks/dbt-fix-multi-touch-attribution/tests/test_outputs.py +++ b/tasks/dbt-fix-multi-touch-attribution/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,7 +80,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-paid-search-attribution/solution/solve.sh b/tasks/dbt-fix-paid-search-attribution/solution/solve.sh index c3cd123a..e1620269 100755 --- a/tasks/dbt-fix-paid-search-attribution/solution/solve.sh +++ b/tasks/dbt-fix-paid-search-attribution/solution/solve.sh @@ -122,7 +122,7 @@ def get_private_key(): try: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-paid-search-attribution/tests/test_outputs.py b/tasks/dbt-fix-paid-search-attribution/tests/test_outputs.py index aa96e69a..22a57600 100644 --- a/tasks/dbt-fix-paid-search-attribution/tests/test_outputs.py +++ b/tasks/dbt-fix-paid-search-attribution/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-product-metrics/tests/test_outputs.py b/tasks/dbt-fix-product-metrics/tests/test_outputs.py index 6d77d009..546dbf28 100644 --- a/tasks/dbt-fix-product-metrics/tests/test_outputs.py +++ b/tasks/dbt-fix-product-metrics/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-refund-reconciliation/tests/test_outputs.py b/tasks/dbt-fix-refund-reconciliation/tests/test_outputs.py index 229a0d96..c5bfc7ec 100644 --- a/tasks/dbt-fix-refund-reconciliation/tests/test_outputs.py +++ b/tasks/dbt-fix-refund-reconciliation/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-repeat-purchase-cohort-revenue/tests/test_outputs.py b/tasks/dbt-fix-repeat-purchase-cohort-revenue/tests/test_outputs.py index 9d1cdae9..8045998b 100644 --- a/tasks/dbt-fix-repeat-purchase-cohort-revenue/tests/test_outputs.py +++ b/tasks/dbt-fix-repeat-purchase-cohort-revenue/tests/test_outputs.py @@ -68,7 +68,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -79,7 +79,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fix-timezone-sales/tests/test_outputs.py b/tasks/dbt-fix-timezone-sales/tests/test_outputs.py index 45b8b7df..bb2152ca 100644 --- a/tasks/dbt-fix-timezone-sales/tests/test_outputs.py +++ b/tasks/dbt-fix-timezone-sales/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,7 +74,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fraud-detection-model/solution/solve.sh b/tasks/dbt-fraud-detection-model/solution/solve.sh index f8d4c5d6..8ca44ffa 100755 --- a/tasks/dbt-fraud-detection-model/solution/solve.sh +++ b/tasks/dbt-fraud-detection-model/solution/solve.sh @@ -28,7 +28,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-fraud-detection-model/tests/test_outputs.py b/tasks/dbt-fraud-detection-model/tests/test_outputs.py index 9e21107a..e9262243 100644 --- a/tasks/dbt-fraud-detection-model/tests/test_outputs.py +++ b/tasks/dbt-fraud-detection-model/tests/test_outputs.py @@ -70,7 +70,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -81,7 +81,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-fulfillment-sla/tests/test_outputs.py b/tasks/dbt-fulfillment-sla/tests/test_outputs.py index 7e94ef65..91a3965b 100644 --- a/tasks/dbt-fulfillment-sla/tests/test_outputs.py +++ b/tasks/dbt-fulfillment-sla/tests/test_outputs.py @@ -77,7 +77,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -88,7 +88,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-gl-reconciliation/solution/solve.sh b/tasks/dbt-gl-reconciliation/solution/solve.sh index 3080d26a..31b7536d 100644 --- a/tasks/dbt-gl-reconciliation/solution/solve.sh +++ b/tasks/dbt-gl-reconciliation/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-gl-reconciliation/tests/test_outputs.py b/tasks/dbt-gl-reconciliation/tests/test_outputs.py index 1798a169..8c916b24 100644 --- a/tasks/dbt-gl-reconciliation/tests/test_outputs.py +++ b/tasks/dbt-gl-reconciliation/tests/test_outputs.py @@ -101,7 +101,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -112,11 +112,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='gl_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-harbor-marketing-mix-model/tests/test_outputs.py b/tasks/dbt-harbor-marketing-mix-model/tests/test_outputs.py index e94d835b..3a5b8f02 100644 --- a/tasks/dbt-harbor-marketing-mix-model/tests/test_outputs.py +++ b/tasks/dbt-harbor-marketing-mix-model/tests/test_outputs.py @@ -57,7 +57,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -68,7 +68,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-harbor-product-affinity/solution/solve.sh b/tasks/dbt-harbor-product-affinity/solution/solve.sh index b19a1a97..793ad01d 100644 --- a/tasks/dbt-harbor-product-affinity/solution/solve.sh +++ b/tasks/dbt-harbor-product-affinity/solution/solve.sh @@ -66,7 +66,7 @@ try: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-harbor-product-affinity/tests/test_outputs.py b/tasks/dbt-harbor-product-affinity/tests/test_outputs.py index 24a8b8b3..d7dcefbe 100644 --- a/tasks/dbt-harbor-product-affinity/tests/test_outputs.py +++ b/tasks/dbt-harbor-product-affinity/tests/test_outputs.py @@ -59,7 +59,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -70,7 +70,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-harbor-warehouse-capacity/solution/solve.sh b/tasks/dbt-harbor-warehouse-capacity/solution/solve.sh index c0c984bb..2808ee79 100644 --- a/tasks/dbt-harbor-warehouse-capacity/solution/solve.sh +++ b/tasks/dbt-harbor-warehouse-capacity/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-harbor-warehouse-capacity/tests/test_outputs.py b/tasks/dbt-harbor-warehouse-capacity/tests/test_outputs.py index 00922ffb..b94664c0 100644 --- a/tasks/dbt-harbor-warehouse-capacity/tests/test_outputs.py +++ b/tasks/dbt-harbor-warehouse-capacity/tests/test_outputs.py @@ -66,7 +66,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -77,7 +77,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-hr-analytics/tests/test_outputs.py b/tasks/dbt-hr-analytics/tests/test_outputs.py index 1b734f7e..cf41a11b 100644 --- a/tasks/dbt-hr-analytics/tests/test_outputs.py +++ b/tasks/dbt-hr-analytics/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,11 +75,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='retail', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-incremental-late-arriving-sales/solution/solve.sh b/tasks/dbt-incremental-late-arriving-sales/solution/solve.sh index ce9063e5..cfb90912 100644 --- a/tasks/dbt-incremental-late-arriving-sales/solution/solve.sh +++ b/tasks/dbt-incremental-late-arriving-sales/solution/solve.sh @@ -536,7 +536,7 @@ tables = [ admin_role = os.environ.get('SNOWFLAKE_ADMIN_ROLE', os.environ.get('SNOWFLAKE_ROLE', '')) conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-incremental-late-arriving-sales/tests/test_outputs.py b/tasks/dbt-incremental-late-arriving-sales/tests/test_outputs.py index 661747a5..04d9f7a2 100644 --- a/tasks/dbt-incremental-late-arriving-sales/tests/test_outputs.py +++ b/tasks/dbt-incremental-late-arriving-sales/tests/test_outputs.py @@ -88,7 +88,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -99,7 +99,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-inventory-analysis/solution/solve.sh b/tasks/dbt-inventory-analysis/solution/solve.sh index 6736da26..8afc9cc0 100644 --- a/tasks/dbt-inventory-analysis/solution/solve.sh +++ b/tasks/dbt-inventory-analysis/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-inventory-analysis/tests/test_outputs.py b/tasks/dbt-inventory-analysis/tests/test_outputs.py index e78fe830..76e99741 100644 --- a/tasks/dbt-inventory-analysis/tests/test_outputs.py +++ b/tasks/dbt-inventory-analysis/tests/test_outputs.py @@ -97,7 +97,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -108,11 +108,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='inventory_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-inventory-stockout-risk/solution/solve.sh b/tasks/dbt-inventory-stockout-risk/solution/solve.sh index 383baa36..67b3c904 100644 --- a/tasks/dbt-inventory-stockout-risk/solution/solve.sh +++ b/tasks/dbt-inventory-stockout-risk/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-inventory-stockout-risk/tests/test_outputs.py b/tasks/dbt-inventory-stockout-risk/tests/test_outputs.py index 3c2c5f47..80956757 100644 --- a/tasks/dbt-inventory-stockout-risk/tests/test_outputs.py +++ b/tasks/dbt-inventory-stockout-risk/tests/test_outputs.py @@ -82,7 +82,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -93,7 +93,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-inventory-turnover-analysis/tests/test_outputs.py b/tasks/dbt-inventory-turnover-analysis/tests/test_outputs.py index a3ae82ad..8eeaf716 100644 --- a/tasks/dbt-inventory-turnover-analysis/tests/test_outputs.py +++ b/tasks/dbt-inventory-turnover-analysis/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,7 +74,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-loyalty-points-analysis/solution/solve.sh b/tasks/dbt-loyalty-points-analysis/solution/solve.sh index 710cc6fa..5c8d5f6c 100755 --- a/tasks/dbt-loyalty-points-analysis/solution/solve.sh +++ b/tasks/dbt-loyalty-points-analysis/solution/solve.sh @@ -25,7 +25,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-loyalty-points-analysis/tests/test_outputs.py b/tasks/dbt-loyalty-points-analysis/tests/test_outputs.py index 1b7f6b39..e63954a6 100644 --- a/tasks/dbt-loyalty-points-analysis/tests/test_outputs.py +++ b/tasks/dbt-loyalty-points-analysis/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-monthly-channel-revenue/solution/solve.sh b/tasks/dbt-monthly-channel-revenue/solution/solve.sh index aacb276f..0d0edcce 100644 --- a/tasks/dbt-monthly-channel-revenue/solution/solve.sh +++ b/tasks/dbt-monthly-channel-revenue/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-monthly-channel-revenue/tests/test_outputs.py b/tasks/dbt-monthly-channel-revenue/tests/test_outputs.py index 361ba9f8..6f8ee323 100644 --- a/tasks/dbt-monthly-channel-revenue/tests/test_outputs.py +++ b/tasks/dbt-monthly-channel-revenue/tests/test_outputs.py @@ -84,7 +84,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -95,11 +95,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='channel_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-multi-warehouse-stock-rebalance/tests/test_outputs.py b/tasks/dbt-multi-warehouse-stock-rebalance/tests/test_outputs.py index b566aa5d..05729359 100644 --- a/tasks/dbt-multi-warehouse-stock-rebalance/tests/test_outputs.py +++ b/tasks/dbt-multi-warehouse-stock-rebalance/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-multicurrency-lifo/tests/test_outputs.py b/tasks/dbt-multicurrency-lifo/tests/test_outputs.py index d3280380..b84f1ce3 100644 --- a/tasks/dbt-multicurrency-lifo/tests/test_outputs.py +++ b/tasks/dbt-multicurrency-lifo/tests/test_outputs.py @@ -62,7 +62,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -73,7 +73,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-order-fulfillment-analytics/solution/solve.sh b/tasks/dbt-order-fulfillment-analytics/solution/solve.sh index 7e18bd06..84d6c0f6 100644 --- a/tasks/dbt-order-fulfillment-analytics/solution/solve.sh +++ b/tasks/dbt-order-fulfillment-analytics/solution/solve.sh @@ -26,7 +26,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-order-fulfillment-analytics/tests/test_outputs.py b/tasks/dbt-order-fulfillment-analytics/tests/test_outputs.py index e578e7be..a5cecfdd 100644 --- a/tasks/dbt-order-fulfillment-analytics/tests/test_outputs.py +++ b/tasks/dbt-order-fulfillment-analytics/tests/test_outputs.py @@ -64,7 +64,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -75,7 +75,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], @@ -153,7 +153,7 @@ def ensure_snowflake_schemas(): conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-order-fulfillment-metrics/solution/solve.sh b/tasks/dbt-order-fulfillment-metrics/solution/solve.sh index 80039525..6f900b1e 100644 --- a/tasks/dbt-order-fulfillment-metrics/solution/solve.sh +++ b/tasks/dbt-order-fulfillment-metrics/solution/solve.sh @@ -67,7 +67,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-order-fulfillment-metrics/tests/test_outputs.py b/tasks/dbt-order-fulfillment-metrics/tests/test_outputs.py index ccd958f6..050ccb9b 100644 --- a/tasks/dbt-order-fulfillment-metrics/tests/test_outputs.py +++ b/tasks/dbt-order-fulfillment-metrics/tests/test_outputs.py @@ -109,7 +109,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -120,7 +120,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-order-interval-metrics/tests/test_outputs.py b/tasks/dbt-order-interval-metrics/tests/test_outputs.py index ccf43cb0..9478618e 100644 --- a/tasks/dbt-order-interval-metrics/tests/test_outputs.py +++ b/tasks/dbt-order-interval-metrics/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,7 +78,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-order-reconciliation/solution/solve.sh b/tasks/dbt-order-reconciliation/solution/solve.sh index 6a972c9a..49b5e455 100644 --- a/tasks/dbt-order-reconciliation/solution/solve.sh +++ b/tasks/dbt-order-reconciliation/solution/solve.sh @@ -109,7 +109,7 @@ pk_bytes_der = p_key.private_bytes( ) conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pk_bytes_der, role=os.environ['SNOWFLAKE_ADMIN_ROLE'], diff --git a/tasks/dbt-order-reconciliation/tests/test_outputs.py b/tasks/dbt-order-reconciliation/tests/test_outputs.py index b15277c4..7aa76e2e 100644 --- a/tasks/dbt-order-reconciliation/tests/test_outputs.py +++ b/tasks/dbt-order-reconciliation/tests/test_outputs.py @@ -65,7 +65,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -76,7 +76,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-payment-analytics/tests/test_outputs.py b/tasks/dbt-payment-analytics/tests/test_outputs.py index 5402de90..5f407a82 100644 --- a/tasks/dbt-payment-analytics/tests/test_outputs.py +++ b/tasks/dbt-payment-analytics/tests/test_outputs.py @@ -79,7 +79,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -90,7 +90,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-payment-fraud-analysis/solution/solve.sh b/tasks/dbt-payment-fraud-analysis/solution/solve.sh index 217463fe..1c7b5592 100644 --- a/tasks/dbt-payment-fraud-analysis/solution/solve.sh +++ b/tasks/dbt-payment-fraud-analysis/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], @@ -67,7 +67,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-payment-fraud-analysis/tests/test_outputs.py b/tasks/dbt-payment-fraud-analysis/tests/test_outputs.py index 871722ea..f93ddee2 100644 --- a/tasks/dbt-payment-fraud-analysis/tests/test_outputs.py +++ b/tasks/dbt-payment-fraud-analysis/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,11 +80,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='fraud_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-price-elasticity/tests/test_outputs.py b/tasks/dbt-price-elasticity/tests/test_outputs.py index 54148958..9676d1c6 100644 --- a/tasks/dbt-price-elasticity/tests/test_outputs.py +++ b/tasks/dbt-price-elasticity/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,7 +78,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-product-affinity/tests/test_outputs.py b/tasks/dbt-product-affinity/tests/test_outputs.py index e20574fb..99218b56 100644 --- a/tasks/dbt-product-affinity/tests/test_outputs.py +++ b/tasks/dbt-product-affinity/tests/test_outputs.py @@ -109,7 +109,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -120,11 +120,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-product-category-analytics/tests/test_outputs.py b/tasks/dbt-product-category-analytics/tests/test_outputs.py index 6fa96f32..e926122e 100644 --- a/tasks/dbt-product-category-analytics/tests/test_outputs.py +++ b/tasks/dbt-product-category-analytics/tests/test_outputs.py @@ -70,7 +70,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -81,7 +81,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-product-performance-metrics/solution/solve.sh b/tasks/dbt-product-performance-metrics/solution/solve.sh index f036cfa6..2707bef7 100644 --- a/tasks/dbt-product-performance-metrics/solution/solve.sh +++ b/tasks/dbt-product-performance-metrics/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-product-performance-metrics/tests/test_outputs.py b/tasks/dbt-product-performance-metrics/tests/test_outputs.py index 173644b3..24bcef43 100644 --- a/tasks/dbt-product-performance-metrics/tests/test_outputs.py +++ b/tasks/dbt-product-performance-metrics/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,11 +80,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='product_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-product-return-analysis/tests/test_outputs.py b/tasks/dbt-product-return-analysis/tests/test_outputs.py index 94f7a7e6..d99308e8 100644 --- a/tasks/dbt-product-return-analysis/tests/test_outputs.py +++ b/tasks/dbt-product-return-analysis/tests/test_outputs.py @@ -80,7 +80,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -91,7 +91,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-product-return-rate-analysis/tests/test_outputs.py b/tasks/dbt-product-return-rate-analysis/tests/test_outputs.py index 806241cb..5a48446f 100644 --- a/tasks/dbt-product-return-rate-analysis/tests/test_outputs.py +++ b/tasks/dbt-product-return-rate-analysis/tests/test_outputs.py @@ -73,7 +73,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -84,11 +84,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='ANALYTICS', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-product-sales-velocity/solution/solve.sh b/tasks/dbt-product-sales-velocity/solution/solve.sh index bebe3dea..7369ad29 100644 --- a/tasks/dbt-product-sales-velocity/solution/solve.sh +++ b/tasks/dbt-product-sales-velocity/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-product-sales-velocity/tests/test_outputs.py b/tasks/dbt-product-sales-velocity/tests/test_outputs.py index 288d9a1b..cbfcd651 100644 --- a/tasks/dbt-product-sales-velocity/tests/test_outputs.py +++ b/tasks/dbt-product-sales-velocity/tests/test_outputs.py @@ -70,7 +70,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -81,7 +81,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-receivables-aging-buckets/solution/solve.sh b/tasks/dbt-receivables-aging-buckets/solution/solve.sh index 0abce9d8..32f22024 100644 --- a/tasks/dbt-receivables-aging-buckets/solution/solve.sh +++ b/tasks/dbt-receivables-aging-buckets/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-receivables-aging-buckets/tests/test_outputs.py b/tasks/dbt-receivables-aging-buckets/tests/test_outputs.py index d0f5cb89..aa24e11c 100644 --- a/tasks/dbt-receivables-aging-buckets/tests/test_outputs.py +++ b/tasks/dbt-receivables-aging-buckets/tests/test_outputs.py @@ -87,7 +87,7 @@ def get_db_connection(read_only=True): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -98,7 +98,7 @@ def get_db_connection(read_only=True): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-retail-task-01-channel-revenue/tests/test_outputs.py b/tasks/dbt-retail-task-01-channel-revenue/tests/test_outputs.py index e73b0de6..958cbbca 100644 --- a/tasks/dbt-retail-task-01-channel-revenue/tests/test_outputs.py +++ b/tasks/dbt-retail-task-01-channel-revenue/tests/test_outputs.py @@ -73,7 +73,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -84,7 +84,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-retail-task-04-market-roi/tests/test_outputs.py b/tasks/dbt-retail-task-04-market-roi/tests/test_outputs.py index 564db8b4..74482bd9 100644 --- a/tasks/dbt-retail-task-04-market-roi/tests/test_outputs.py +++ b/tasks/dbt-retail-task-04-market-roi/tests/test_outputs.py @@ -74,7 +74,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -85,7 +85,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-retail-task-07-cart-recovery/solution/solve.sh b/tasks/dbt-retail-task-07-cart-recovery/solution/solve.sh index f34cd88e..1bf924cc 100644 --- a/tasks/dbt-retail-task-07-cart-recovery/solution/solve.sh +++ b/tasks/dbt-retail-task-07-cart-recovery/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], @@ -138,7 +138,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-retail-task-07-cart-recovery/tests/test_outputs.py b/tasks/dbt-retail-task-07-cart-recovery/tests/test_outputs.py index 9459d9a3..1f2e1bcb 100644 --- a/tasks/dbt-retail-task-07-cart-recovery/tests/test_outputs.py +++ b/tasks/dbt-retail-task-07-cart-recovery/tests/test_outputs.py @@ -137,7 +137,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -148,7 +148,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-retail-task-10-trust-risk/tests/test_outputs.py b/tasks/dbt-retail-task-10-trust-risk/tests/test_outputs.py index e44d4dac..26a6ce2c 100644 --- a/tasks/dbt-retail-task-10-trust-risk/tests/test_outputs.py +++ b/tasks/dbt-retail-task-10-trust-risk/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,7 +78,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-rfm-customer-segmentation-2/tests/test_outputs.py b/tasks/dbt-rfm-customer-segmentation-2/tests/test_outputs.py index e9b33761..d96e5947 100644 --- a/tasks/dbt-rfm-customer-segmentation-2/tests/test_outputs.py +++ b/tasks/dbt-rfm-customer-segmentation-2/tests/test_outputs.py @@ -71,7 +71,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -82,7 +82,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-rfm-customer-segmentation/solution/solve.sh b/tasks/dbt-rfm-customer-segmentation/solution/solve.sh index f1bbac43..53cc2a1f 100644 --- a/tasks/dbt-rfm-customer-segmentation/solution/solve.sh +++ b/tasks/dbt-rfm-customer-segmentation/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-rfm-customer-segmentation/tests/test_outputs.py b/tasks/dbt-rfm-customer-segmentation/tests/test_outputs.py index 5e387fe6..2d073fdb 100644 --- a/tasks/dbt-rfm-customer-segmentation/tests/test_outputs.py +++ b/tasks/dbt-rfm-customer-segmentation/tests/test_outputs.py @@ -100,7 +100,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -111,11 +111,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='rfm_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-rfm-customer-tiering/tests/test_outputs.py b/tasks/dbt-rfm-customer-tiering/tests/test_outputs.py index e762b062..5095d546 100644 --- a/tasks/dbt-rfm-customer-tiering/tests/test_outputs.py +++ b/tasks/dbt-rfm-customer-tiering/tests/test_outputs.py @@ -79,7 +79,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -90,7 +90,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-sales-funnel-analysis/solution/solve.sh b/tasks/dbt-sales-funnel-analysis/solution/solve.sh index fccaa443..80360c73 100644 --- a/tasks/dbt-sales-funnel-analysis/solution/solve.sh +++ b/tasks/dbt-sales-funnel-analysis/solution/solve.sh @@ -114,7 +114,7 @@ pkb = p_key.private_bytes( conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, role=os.environ['SNOWFLAKE_ADMIN_ROLE'], diff --git a/tasks/dbt-sales-funnel-analysis/tests/test_outputs.py b/tasks/dbt-sales-funnel-analysis/tests/test_outputs.py index f53c9029..a48da55c 100644 --- a/tasks/dbt-sales-funnel-analysis/tests/test_outputs.py +++ b/tasks/dbt-sales-funnel-analysis/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,7 +78,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-session-attribution/tests/test_outputs.py b/tasks/dbt-session-attribution/tests/test_outputs.py index 8197a5b8..bdaf1128 100644 --- a/tasks/dbt-session-attribution/tests/test_outputs.py +++ b/tasks/dbt-session-attribution/tests/test_outputs.py @@ -70,7 +70,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -81,7 +81,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-supplier-payment-optimization/solution/solve.sh b/tasks/dbt-supplier-payment-optimization/solution/solve.sh index 2ece4ca5..306df231 100644 --- a/tasks/dbt-supplier-payment-optimization/solution/solve.sh +++ b/tasks/dbt-supplier-payment-optimization/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-supplier-payment-optimization/tests/test_outputs.py b/tasks/dbt-supplier-payment-optimization/tests/test_outputs.py index 1f5cb622..7c4325ee 100644 --- a/tasks/dbt-supplier-payment-optimization/tests/test_outputs.py +++ b/tasks/dbt-supplier-payment-optimization/tests/test_outputs.py @@ -74,7 +74,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -85,7 +85,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-supplier-scorecard/tests/test_outputs.py b/tasks/dbt-supplier-scorecard/tests/test_outputs.py index 68d2becc..39f3deef 100644 --- a/tasks/dbt-supplier-scorecard/tests/test_outputs.py +++ b/tasks/dbt-supplier-scorecard/tests/test_outputs.py @@ -77,7 +77,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -88,7 +88,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-test-orders-filter/solution/solve.sh b/tasks/dbt-test-orders-filter/solution/solve.sh index cb5af7da..b63ba08d 100644 --- a/tasks/dbt-test-orders-filter/solution/solve.sh +++ b/tasks/dbt-test-orders-filter/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-test-orders-filter/tests/test_outputs.py b/tasks/dbt-test-orders-filter/tests/test_outputs.py index ff42baef..e94b2e6c 100644 --- a/tasks/dbt-test-orders-filter/tests/test_outputs.py +++ b/tasks/dbt-test-orders-filter/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,7 +74,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-three-way-matching/solution/solve.sh b/tasks/dbt-three-way-matching/solution/solve.sh index 9c848c42..e7a9c1c2 100644 --- a/tasks/dbt-three-way-matching/solution/solve.sh +++ b/tasks/dbt-three-way-matching/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-three-way-matching/tests/test_outputs.py b/tasks/dbt-three-way-matching/tests/test_outputs.py index a9741a69..5f43054d 100644 --- a/tasks/dbt-three-way-matching/tests/test_outputs.py +++ b/tasks/dbt-three-way-matching/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,7 +78,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-warehouse-fulfillment-analytics/tests/test_outputs.py b/tasks/dbt-warehouse-fulfillment-analytics/tests/test_outputs.py index ede5d739..ca12e78c 100644 --- a/tasks/dbt-warehouse-fulfillment-analytics/tests/test_outputs.py +++ b/tasks/dbt-warehouse-fulfillment-analytics/tests/test_outputs.py @@ -85,7 +85,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -96,7 +96,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/dbt-web-session-analytics/solution/solve.sh b/tasks/dbt-web-session-analytics/solution/solve.sh index 437fa96f..2500b166 100644 --- a/tasks/dbt-web-session-analytics/solution/solve.sh +++ b/tasks/dbt-web-session-analytics/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-web-session-analytics/tests/test_outputs.py b/tasks/dbt-web-session-analytics/tests/test_outputs.py index ee62c940..cf5d1746 100644 --- a/tasks/dbt-web-session-analytics/tests/test_outputs.py +++ b/tasks/dbt-web-session-analytics/tests/test_outputs.py @@ -63,7 +63,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -74,11 +74,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='web_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/dbt-weekly-sales-growth/solution/solve.sh b/tasks/dbt-weekly-sales-growth/solution/solve.sh index 38cd19be..511b0344 100644 --- a/tasks/dbt-weekly-sales-growth/solution/solve.sh +++ b/tasks/dbt-weekly-sales-growth/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/dbt-weekly-sales-growth/tests/test_outputs.py b/tasks/dbt-weekly-sales-growth/tests/test_outputs.py index 0ae96d1a..7dbd1254 100644 --- a/tasks/dbt-weekly-sales-growth/tests/test_outputs.py +++ b/tasks/dbt-weekly-sales-growth/tests/test_outputs.py @@ -132,7 +132,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -143,7 +143,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/deferred-revenue-recognition/solution/solve.sh b/tasks/deferred-revenue-recognition/solution/solve.sh index e54f8359..f6c08d3d 100644 --- a/tasks/deferred-revenue-recognition/solution/solve.sh +++ b/tasks/deferred-revenue-recognition/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/deferred-revenue-recognition/tests/test_outputs.py b/tasks/deferred-revenue-recognition/tests/test_outputs.py index 8689af54..230a9d9b 100644 --- a/tasks/deferred-revenue-recognition/tests/test_outputs.py +++ b/tasks/deferred-revenue-recognition/tests/test_outputs.py @@ -73,7 +73,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -84,7 +84,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/fifo-inventory-cogs/tests/test_outputs.py b/tasks/fifo-inventory-cogs/tests/test_outputs.py index 0fc60d24..0ca6f464 100644 --- a/tasks/fifo-inventory-cogs/tests/test_outputs.py +++ b/tasks/fifo-inventory-cogs/tests/test_outputs.py @@ -58,7 +58,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -69,7 +69,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/late-arriving-orders-reconciliation/solution/solve.sh b/tasks/late-arriving-orders-reconciliation/solution/solve.sh index 0e0bc07d..ed557cd4 100644 --- a/tasks/late-arriving-orders-reconciliation/solution/solve.sh +++ b/tasks/late-arriving-orders-reconciliation/solution/solve.sh @@ -44,7 +44,7 @@ def get_connection(): conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/late-arriving-orders-reconciliation/tests/test_outputs.py b/tasks/late-arriving-orders-reconciliation/tests/test_outputs.py index 7f1c8a66..18a3fe9c 100644 --- a/tasks/late-arriving-orders-reconciliation/tests/test_outputs.py +++ b/tasks/late-arriving-orders-reconciliation/tests/test_outputs.py @@ -65,7 +65,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -76,7 +76,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/marketing-campaigns-harbor/tests/test_outputs.py b/tasks/marketing-campaigns-harbor/tests/test_outputs.py index fa53037a..040977e6 100644 --- a/tasks/marketing-campaigns-harbor/tests/test_outputs.py +++ b/tasks/marketing-campaigns-harbor/tests/test_outputs.py @@ -69,7 +69,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -80,7 +80,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/payment-risk-scoring/solution/solve.sh b/tasks/payment-risk-scoring/solution/solve.sh index c5575171..d11d6288 100644 --- a/tasks/payment-risk-scoring/solution/solve.sh +++ b/tasks/payment-risk-scoring/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/payment-risk-scoring/tests/test_outputs.py b/tasks/payment-risk-scoring/tests/test_outputs.py index ec7a13c7..6e99bc16 100644 --- a/tasks/payment-risk-scoring/tests/test_outputs.py +++ b/tasks/payment-risk-scoring/tests/test_outputs.py @@ -62,7 +62,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -73,7 +73,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/pos-operations/tests/test_outputs.py b/tasks/pos-operations/tests/test_outputs.py index afc6d8a6..93219f8c 100644 --- a/tasks/pos-operations/tests/test_outputs.py +++ b/tasks/pos-operations/tests/test_outputs.py @@ -65,7 +65,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -76,7 +76,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/promotional-lift-analysis/solution/solve.sh b/tasks/promotional-lift-analysis/solution/solve.sh index 06dc10c8..9c085ffe 100644 --- a/tasks/promotional-lift-analysis/solution/solve.sh +++ b/tasks/promotional-lift-analysis/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], @@ -278,7 +278,7 @@ if db_type == 'snowflake': ) conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/promotional-lift-analysis/tests/test_outputs.py b/tasks/promotional-lift-analysis/tests/test_outputs.py index 65882b6c..c07b2c79 100644 --- a/tasks/promotional-lift-analysis/tests/test_outputs.py +++ b/tasks/promotional-lift-analysis/tests/test_outputs.py @@ -67,7 +67,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -78,11 +78,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='promo_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/shipping-fulfillment-quality-scoring/tests/test_outputs.py b/tasks/shipping-fulfillment-quality-scoring/tests/test_outputs.py index 3e98226a..92709b0c 100644 --- a/tasks/shipping-fulfillment-quality-scoring/tests/test_outputs.py +++ b/tasks/shipping-fulfillment-quality-scoring/tests/test_outputs.py @@ -62,7 +62,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -73,7 +73,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/tier-migration-analysis/solution/solve.sh b/tasks/tier-migration-analysis/solution/solve.sh index 94119d0e..6e0f6449 100755 --- a/tasks/tier-migration-analysis/solution/solve.sh +++ b/tasks/tier-migration-analysis/solution/solve.sh @@ -28,7 +28,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/tier-migration-analysis/tests/test_outputs.py b/tasks/tier-migration-analysis/tests/test_outputs.py index 851a90e9..1199e945 100644 --- a/tasks/tier-migration-analysis/tests/test_outputs.py +++ b/tasks/tier-migration-analysis/tests/test_outputs.py @@ -71,7 +71,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -82,7 +82,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/time-decay-attribution-model/solution/solve.sh b/tasks/time-decay-attribution-model/solution/solve.sh index e590eabb..ec0dab7c 100644 --- a/tasks/time-decay-attribution-model/solution/solve.sh +++ b/tasks/time-decay-attribution-model/solution/solve.sh @@ -24,7 +24,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], @@ -67,7 +67,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/time-decay-attribution-model/tests/test_outputs.py b/tasks/time-decay-attribution-model/tests/test_outputs.py index a5e93fd7..bd931cf8 100644 --- a/tasks/time-decay-attribution-model/tests/test_outputs.py +++ b/tasks/time-decay-attribution-model/tests/test_outputs.py @@ -76,7 +76,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -87,11 +87,11 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], - schema='attribution_analytics', + schema='main', warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], role=os.environ.get('SNOWFLAKE_ROLE', None) ) diff --git a/tasks/web-session-quality-scoring/tests/test_outputs.py b/tasks/web-session-quality-scoring/tests/test_outputs.py index 7b73c314..13f2145b 100644 --- a/tasks/web-session-quality-scoring/tests/test_outputs.py +++ b/tasks/web-session-quality-scoring/tests/test_outputs.py @@ -61,7 +61,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -72,7 +72,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'], diff --git a/tasks/workforce-analytics/solution/solve.sh b/tasks/workforce-analytics/solution/solve.sh index 002899a4..0ed3d396 100644 --- a/tasks/workforce-analytics/solution/solve.sh +++ b/tasks/workforce-analytics/solution/solve.sh @@ -28,7 +28,7 @@ pkb = p_key.private_bytes(encoding=serialization.Encoding.DER, format=serializat conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=pkb, warehouse=os.environ['SNOWFLAKE_WAREHOUSE'], diff --git a/tasks/workforce-analytics/tests/test_outputs.py b/tasks/workforce-analytics/tests/test_outputs.py index 82f2aeb3..8007e12e 100644 --- a/tasks/workforce-analytics/tests/test_outputs.py +++ b/tasks/workforce-analytics/tests/test_outputs.py @@ -71,7 +71,7 @@ def get_db_connection(): if password: conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], password=password, database=os.environ['SNOWFLAKE_DATABASE'], @@ -82,7 +82,7 @@ def get_db_connection(): # Fall back to private key auth conn = snowflake.connector.connect( account=os.environ['SNOWFLAKE_ACCOUNT'], - host=os.environ.get('SNOWFLAKE_HOST') or None, + **({'host': os.environ['SNOWFLAKE_HOST']} if os.environ.get('SNOWFLAKE_HOST') else {}), user=os.environ['SNOWFLAKE_USER'], private_key=get_private_key(), database=os.environ['SNOWFLAKE_DATABASE'],