From 050c0a213033f6f83b5937c0f34a027347bfbb2a Mon Sep 17 00:00:00 2001 From: Scott Winkler Date: Thu, 22 Sep 2022 11:28:07 -0700 Subject: [PATCH] feat: add connection param for snowhouse (#1231) * add connection param for snowhouse * add connection param for snowhouse * add connection param for snowhouse * add connection param for snowhouse * add connection param for snowhouse --- pkg/provider/provider.go | 9 +++++---- pkg/provider/provider_test.go | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index baafdb8ced..d1a125fc9c 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -352,10 +352,11 @@ func DSN( } config := gosnowflake.Config{ - Account: account, - User: user, - Region: region, - Role: role, + Account: account, + User: user, + Region: region, + Role: role, + Application: "terraform-provider-snowflake", } // If host is set trust it and do not use the region value diff --git a/pkg/provider/provider_test.go b/pkg/provider/provider_test.go index c419fde4e7..a1e89f2ddb 100644 --- a/pkg/provider/provider_test.go +++ b/pkg/provider/provider_test.go @@ -40,13 +40,13 @@ func TestDSN(t *testing.T) { wantErr bool }{ {"simple", args{"acct", "user", "pass", false, "region", "role", "", ""}, - "user:pass@acct.region.snowflakecomputing.com:443?ocspFailOpen=true®ion=region&role=role&validateDefaultParameters=true", false}, + "user:pass@acct.region.snowflakecomputing.com:443?application=terraform-provider-snowflake&ocspFailOpen=true®ion=region&role=role&validateDefaultParameters=true", false}, {"us-west-2 special case", args{"acct2", "user2", "pass2", false, "us-west-2", "role2", "", ""}, - "user2:pass2@acct2.snowflakecomputing.com:443?ocspFailOpen=true&role=role2&validateDefaultParameters=true", false}, + "user2:pass2@acct2.snowflakecomputing.com:443?application=terraform-provider-snowflake&ocspFailOpen=true&role=role2&validateDefaultParameters=true", false}, {"customhostwregion", args{"acct3", "user3", "pass3", false, "", "role3", "zha123.us-east-1.privatelink.snowflakecomputing.com", ""}, - "user3:pass3@zha123.us-east-1.privatelink.snowflakecomputing.com:443?account=acct3&ocspFailOpen=true&role=role3&validateDefaultParameters=true", false}, + "user3:pass3@zha123.us-east-1.privatelink.snowflakecomputing.com:443?account=acct3&application=terraform-provider-snowflake&ocspFailOpen=true&role=role3&validateDefaultParameters=true", false}, {"customhostignoreregion", args{"acct4", "user4", "pass4", false, "fakeregion", "role4", "zha1234.us-east-1.privatelink.snowflakecomputing.com", ""}, - "user4:pass4@zha1234.us-east-1.privatelink.snowflakecomputing.com:443?account=acct4&ocspFailOpen=true&role=role4&validateDefaultParameters=true", false}, + "user4:pass4@zha1234.us-east-1.privatelink.snowflakecomputing.com:443?account=acct4&application=terraform-provider-snowflake&ocspFailOpen=true&role=role4&validateDefaultParameters=true", false}, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -78,9 +78,9 @@ func TestOAuthDSN(t *testing.T) { wantErr bool }{ {"simple_oauth", args{"acct", "user", pseudorandom_access_token, "region", "role"}, - "user:@acct.region.snowflakecomputing.com:443?authenticator=oauth&ocspFailOpen=true®ion=region&role=role&token=ETMsjLOLvQ-C%2FbzGmmdvbEM%2FRSQFFX-a%2BsefbQeQoJqwdFNXZ%2BftBIdwlasApA%2B%2FMItZLNRRW-rYJiEZMvAAdzpGLxaghIoww%2BvDOuIeAFBDUxTAY-I%2BqGbQOXipkNcmzwuAaugjYtlTjPXGjqKw-OSsVacQXzsQyAMnbMyUrbdhRQEETIqTAdMuDqJBeaSj%2BLMsKDXzLd-guSlm-mmv%2B%3D&validateDefaultParameters=true", false}, + "user:@acct.region.snowflakecomputing.com:443?application=terraform-provider-snowflake&authenticator=oauth&ocspFailOpen=true®ion=region&role=role&token=ETMsjLOLvQ-C%2FbzGmmdvbEM%2FRSQFFX-a%2BsefbQeQoJqwdFNXZ%2BftBIdwlasApA%2B%2FMItZLNRRW-rYJiEZMvAAdzpGLxaghIoww%2BvDOuIeAFBDUxTAY-I%2BqGbQOXipkNcmzwuAaugjYtlTjPXGjqKw-OSsVacQXzsQyAMnbMyUrbdhRQEETIqTAdMuDqJBeaSj%2BLMsKDXzLd-guSlm-mmv%2B%3D&validateDefaultParameters=true", false}, {"oauth_over_password", args{"acct", "user", pseudorandom_access_token, "region", "role"}, - "user:@acct.region.snowflakecomputing.com:443?authenticator=oauth&ocspFailOpen=true®ion=region&role=role&token=ETMsjLOLvQ-C%2FbzGmmdvbEM%2FRSQFFX-a%2BsefbQeQoJqwdFNXZ%2BftBIdwlasApA%2B%2FMItZLNRRW-rYJiEZMvAAdzpGLxaghIoww%2BvDOuIeAFBDUxTAY-I%2BqGbQOXipkNcmzwuAaugjYtlTjPXGjqKw-OSsVacQXzsQyAMnbMyUrbdhRQEETIqTAdMuDqJBeaSj%2BLMsKDXzLd-guSlm-mmv%2B%3D&validateDefaultParameters=true", false}, + "user:@acct.region.snowflakecomputing.com:443?application=terraform-provider-snowflake&authenticator=oauth&ocspFailOpen=true®ion=region&role=role&token=ETMsjLOLvQ-C%2FbzGmmdvbEM%2FRSQFFX-a%2BsefbQeQoJqwdFNXZ%2BftBIdwlasApA%2B%2FMItZLNRRW-rYJiEZMvAAdzpGLxaghIoww%2BvDOuIeAFBDUxTAY-I%2BqGbQOXipkNcmzwuAaugjYtlTjPXGjqKw-OSsVacQXzsQyAMnbMyUrbdhRQEETIqTAdMuDqJBeaSj%2BLMsKDXzLd-guSlm-mmv%2B%3D&validateDefaultParameters=true", false}, {"empty_token_no_password_errors_out", args{"acct", "user", "", "region", "role"}, "", true}, }