Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace underscores with hyphens in account ids #1067

Merged
merged 3 commits into from
Jun 6, 2024
Merged

replace underscores with hyphens in account ids #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f7594
replace underscores with hyphens in account ids
colin-rogers-dbt Jun 4, 2024
b97bcf4
fix unit test fixtures
colin-rogers-dbt Jun 4, 2024
84488ef
add changie
colin-rogers-dbt Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/unreleased/Features-20240604-154856.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Features
body: Replace underscores with hyphens in account IDs to prevent SSL issues
time: 2024-06-04T15:48:56.845374-07:00
custom:
Author: colin-rogers-dbt
Issue: "1068"
1 change: 1 addition & 0 deletions dbt/adapters/snowflake/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def __post_init__(self):
base_msg="Authenticator is not set to oauth, but an oauth-only parameter is set! Did you mean to set authenticator: oauth?"
)
)
self.account = self.account.replace("_", "-")

@property
def type(self):
Expand Down
13 changes: 13 additions & 0 deletions tests/unit/test_connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,16 @@ def test_connections_does_not_set_logs_in_response_to_env_var(monkeypatch):

assert log_mock.debug.call_count == 0
assert log_mock.set_adapter_dependency_log_level.call_count == 0


def test_connnections_credentials_replaces_underscores_with_hyphens():
credentials = {
"account": "account_id_with_underscores",
"user": "user",
"password": "password",
"database": "database",
"warehouse": "warehouse",
"schema": "schema",
}
creds = connections.SnowflakeCredentials(**credentials)
assert creds.account == "account-id-with-underscores"
36 changes: 18 additions & 18 deletions tests/unit/test_snowflake_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def test_client_session_keep_alive_false_by_default(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand All @@ -305,7 +305,7 @@ def test_client_session_keep_alive_true(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=True,
database="test_database",
Expand All @@ -332,7 +332,7 @@ def test_client_has_query_tag(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -366,7 +366,7 @@ def test_user_pass_authentication(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -397,7 +397,7 @@ def test_authenticator_user_pass_authentication(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -428,7 +428,7 @@ def test_authenticator_externalbrowser_authentication(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -461,7 +461,7 @@ def test_authenticator_oauth_authentication(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -499,7 +499,7 @@ def test_authenticator_private_key_authentication(self, mock_get_private_key):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -533,7 +533,7 @@ def test_authenticator_private_key_authentication_no_passphrase(self, mock_get_p
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -562,7 +562,7 @@ def test_query_tag(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -592,7 +592,7 @@ def test_reuse_connections_with_keep_alive(self):
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=True,
database="test_database",
Expand Down Expand Up @@ -626,7 +626,7 @@ def test_authenticator_private_key_string_authentication(self, mock_get_private_
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -662,7 +662,7 @@ def test_authenticator_private_key_string_authentication_no_passphrase(
self.snowflake.assert_has_calls(
[
mock.call(
account="test_account",
account="test-account",
autocommit=True,
client_session_keep_alive=False,
database="test_database",
Expand Down Expand Up @@ -907,7 +907,7 @@ class TestSnowflakeAdapterCredentials(unittest.TestCase):

def test_private_key_string(self):
creds = SnowflakeCredentials(
account="test_account",
account="test-account",
user="test_user",
database="test_database",
schema="public",
Expand All @@ -917,7 +917,7 @@ def test_private_key_string(self):

def test_private_key_string_encrypted(self):
creds = SnowflakeCredentials(
account="test_account",
account="test-account",
user="test_user",
database="test_database",
schema="public",
Expand All @@ -928,7 +928,7 @@ def test_private_key_string_encrypted(self):

def test_malformed_private_key_string(self):
creds = SnowflakeCredentials(
account="test_account",
account="test-account",
user="test_user",
database="test_database",
schema="public",
Expand All @@ -938,7 +938,7 @@ def test_malformed_private_key_string(self):

def test_invalid_private_key_string(self):
creds = SnowflakeCredentials(
account="test_account",
account="test-account",
user="test_user",
database="test_database",
schema="public",
Expand All @@ -948,7 +948,7 @@ def test_invalid_private_key_string(self):

def test_invalid_private_key_path(self):
creds = SnowflakeCredentials(
account="test_account",
account="test-account",
user="test_user",
database="test_database",
schema="public",
Expand Down
Loading