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

chore: fix failing tests #3428

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

chore: fix failing tests #3428

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a6d81cb
wip
sfc-gh-jcieslak Mar 3, 2025
2135df9
Fix failing tests
sfc-gh-jcieslak Mar 3, 2025
422ba5a
Fix failing tests
sfc-gh-jcieslak Mar 4, 2025
cfa0904
Changes after review
sfc-gh-jcieslak Mar 4, 2025
4f59922
Changes after review
sfc-gh-jcieslak Mar 4, 2025
ecde2e6
Changes after review
sfc-gh-jcieslak Mar 4, 2025
a1031f8
Changes after review
sfc-gh-jcieslak Mar 4, 2025
95283e9
Changes after failing test
sfc-gh-jcieslak Mar 5, 2025
be290c3
Update migration guide
sfc-gh-jcieslak Mar 6, 2025
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 pkg/acceptance/bettertestspoc/config/model/account_model_ext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package model

import (
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
)
Expand All @@ -9,3 +10,8 @@ func (a *AccountModel) WithAdminUserTypeEnum(adminUserType sdk.UserType) *Accoun
a.AdminUserType = tfconfig.StringVariable(string(adminUserType))
return a
}

func (a *AccountModel) WithAdminRsaPublicKeyMultiline(adminRsaPublicKey string) *AccountModel {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it can be generated already, I will update the readme

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added to the list of multiline string arguments

a.AdminRsaPublicKey = config.MultilineWrapperVariable(adminRsaPublicKey)
return a
}
22 changes: 11 additions & 11 deletions pkg/resources/account_acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestAcc_Account_Minimal(t *testing.T) {
region := acc.TestClient().Context.CurrentRegion(t)

configModel := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down Expand Up @@ -142,7 +142,7 @@ func TestAcc_Account_Complete(t *testing.T) {

configModel := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypePerson).
WithAdminRsaPublicKey(key).
WithAdminRsaPublicKeyMultiline(key).
WithFirstName(firstName).
WithLastName(lastName).
WithMustChangePassword(r.BooleanTrue).
Expand Down Expand Up @@ -252,10 +252,10 @@ func TestAcc_Account_Rename(t *testing.T) {

configModel := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)
newConfigModel := model.Account("test", name, string(sdk.EditionStandard), email, 3, newId).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down Expand Up @@ -311,17 +311,17 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {

configModelWithOrgAdminTrue := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key).
WithAdminRsaPublicKeyMultiline(key).
WithIsOrgAdmin(r.BooleanTrue)

configModelWithOrgAdminFalse := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key).
WithAdminRsaPublicKeyMultiline(key).
WithIsOrgAdmin(r.BooleanFalse)

configModelWithoutOrgAdmin := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down Expand Up @@ -510,7 +510,7 @@ func TestAcc_Account_TryToCreateWithoutOrgadmin(t *testing.T) {

configModel := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down Expand Up @@ -538,15 +538,15 @@ func TestAcc_Account_InvalidValues(t *testing.T) {

configModelInvalidUserType := model.Account("test", name, string(sdk.EditionStandard), email, 3, id).
WithAdminUserType("invalid_user_type").
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

configModelInvalidAccountEdition := model.Account("test", name, "invalid_account_edition", email, 3, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

configModelInvalidGracePeriodInDays := model.Account("test", name, string(sdk.EditionStandard), email, 2, id).
WithAdminUserTypeEnum(sdk.UserTypeService).
WithAdminRsaPublicKey(key)
WithAdminRsaPublicKeyMultiline(key)

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down
8 changes: 4 additions & 4 deletions pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_Basic(t *testing.T) {

resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.#", "1"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_client_type.0.value", string(sdk.OauthSecurityIntegrationClientTypeConfidential)),
resource.TestCheckNoResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttrSet("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.enabled.0.value", "false"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_use_secondary_roles.0.value", "NONE"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.blocked_roles_list.0.value", "ACCOUNTADMIN,SECURITYADMIN"),
Expand Down Expand Up @@ -140,7 +140,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_Basic(t *testing.T) {

resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.#", "1"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_client_type.0.value", string(sdk.OauthSecurityIntegrationClientTypeConfidential)),
resource.TestCheckNoResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttrSet("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.enabled.0.value", "true"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_use_secondary_roles.0.value", "IMPLICIT"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.blocked_roles_list.0.value", "ACCOUNTADMIN,SECURITYADMIN"),
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_Basic(t *testing.T) {

resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.#", "1"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_client_type.0.value", string(sdk.OauthSecurityIntegrationClientTypeConfidential)),
resource.TestCheckNoResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttrSet("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.enabled.0.value", "true"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_use_secondary_roles.0.value", "IMPLICIT"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.blocked_roles_list.0.value", "ACCOUNTADMIN,SECURITYADMIN"),
Expand Down Expand Up @@ -271,7 +271,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_Basic(t *testing.T) {

resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.#", "1"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_client_type.0.value", string(sdk.OauthSecurityIntegrationClientTypeConfidential)),
resource.TestCheckNoResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttrSet("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_redirect_uri.0.value"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.enabled.0.value", "false"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.oauth_use_secondary_roles.0.value", "NONE"),
resource.TestCheckResourceAttr("snowflake_oauth_integration_for_partner_applications.test", "describe_output.0.blocked_roles_list.0.value", "ACCOUNTADMIN,SECURITYADMIN"),
Expand Down
10 changes: 5 additions & 5 deletions pkg/sdk/testint/authentication_policies_gen_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package testint

import (
"fmt"
"strings"
"testing"

assertions "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
Expand Down Expand Up @@ -223,10 +224,9 @@ func TestInt_AuthenticationPolicies(t *testing.T) {
assert.Len(t, authenticationPolicies, 1)
})

// TODO(SNOW-1663343): starts_with doesn't work (returns all)
t.Run("starts_with", func(t *testing.T) {
authenticationPolicies, err := client.AuthenticationPolicies.Show(ctx, sdk.NewShowAuthenticationPolicyRequest().
WithStartsWith("test_auth_policy_").
WithStartsWith("test_auth_policy").
WithIn(sdk.In{Schema: id.SchemaId()}))
require.NoError(t, err)
assert.Len(t, authenticationPolicies, 3)
Expand Down Expand Up @@ -258,13 +258,13 @@ func TestInt_AuthenticationPolicies(t *testing.T) {
assert.Len(t, authenticationPolicies, 1)
})

// TODO(SNOW-1663343): limit from doesn't work (should return 0 elements because alphabetically test_auth_policyzzz is last in the output)
t.Run("limit from", func(t *testing.T) {
authenticationPolicies, err := client.AuthenticationPolicies.Show(ctx, sdk.NewShowAuthenticationPolicyRequest().
WithLimit(sdk.LimitFrom{Rows: sdk.Int(2), From: sdk.String(id.Name())}).
WithLimit(sdk.LimitFrom{Rows: sdk.Int(1), From: sdk.String("test_auth_policy")}).
WithIn(sdk.In{Schema: id.SchemaId()}))
require.NoError(t, err)
assert.Len(t, authenticationPolicies, 2)
require.Len(t, authenticationPolicies, 1)
require.True(t, strings.HasPrefix(authenticationPolicies[0].Name, "test_auth_policy"))
})
})

Expand Down
Loading