Skip to content

Commit

Permalink
Fix acceptance tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfc-gh-asawicki
sfc-gh-asawicki committed May 28, 2024
1 parent a052f34 commit 350a1f7
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 188 deletions.
34 changes: 19 additions & 15 deletions pkg/resources/grant_ownership_acceptance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func TestAcc_GrantOwnership_OnObject_Schema_ToAccountRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()

schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
schemaFullyQualifiedName := schemaId.FullyQualifiedName()

Expand Down Expand Up @@ -171,13 +171,13 @@ func TestAcc_GrantOwnership_OnObject_Schema_ToAccountRole(t *testing.T) {
func TestAcc_GrantOwnership_OnObject_Schema_ToDatabaseRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
schemaFullyQualifiedName := schemaId.FullyQualifiedName()

databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
databaseRoleName := databaseRoleId.Name()
databaseRoleFullyQualifiedName := databaseId.FullyQualifiedName()
databaseRoleFullyQualifiedName := databaseRoleId.FullyQualifiedName()

configVariables := config.Variables{
"database_role_name": config.StringVariable(databaseRoleName),
Expand Down Expand Up @@ -222,8 +222,9 @@ func TestAcc_GrantOwnership_OnObject_Schema_ToDatabaseRole(t *testing.T) {
func TestAcc_GrantOwnership_OnObject_Table_ToAccountRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()
schemaName := acc.TestClient().Ids.Alpha()
tableId := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
tableId := acc.TestClient().Ids.RandomSchemaObjectIdentifierInSchema(schemaId)

accountRoleId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
accountRoleName := accountRoleId.Name()
Expand Down Expand Up @@ -272,13 +273,13 @@ func TestAcc_GrantOwnership_OnObject_Table_ToAccountRole(t *testing.T) {
func TestAcc_GrantOwnership_OnObject_Table_ToDatabaseRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
tableId := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
tableId := acc.TestClient().Ids.RandomSchemaObjectIdentifierInSchema(schemaId)
tableName := tableId.Name()
tableFullyQualifiedName := tableId.FullyQualifiedName()

databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
databaseRoleName := databaseRoleId.Name()
databaseRoleFullyQualifiedName := databaseRoleId.FullyQualifiedName()

Expand Down Expand Up @@ -475,7 +476,7 @@ func TestAcc_GrantOwnership_OnFuture_InDatabase_ToAccountRole(t *testing.T) {
func TestAcc_GrantOwnership_OnFuture_InSchema_ToAccountRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
schemaFullyQualifiedName := schemaId.FullyQualifiedName()

Expand Down Expand Up @@ -679,10 +680,13 @@ func TestAcc_GrantOwnership_AccountRoleRemovedOutsideTerraform(t *testing.T) {
}

func TestAcc_GrantOwnership_OnMaterializedView(t *testing.T) {
databaseName := acc.TestClient().Ids.Alpha()
schemaName := acc.TestClient().Ids.Alpha()
tableName := acc.TestClient().Ids.Alpha()
materializedViewId := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
schemaName := schemaId.Name()
tableId := acc.TestClient().Ids.RandomSchemaObjectIdentifierInSchema(schemaId)
tableName := tableId.Name()
materializedViewId := acc.TestClient().Ids.RandomSchemaObjectIdentifierInSchema(schemaId)

accountRoleId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
accountRoleName := accountRoleId.Name()
Expand Down Expand Up @@ -1092,7 +1096,7 @@ func TestAcc_GrantOwnership_OnDatabaseRole(t *testing.T) {
databaseId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
databaseName := databaseId.Name()

databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
databaseRoleId := acc.TestClient().Ids.RandomDatabaseObjectIdentifierInDatabase(databaseId)
databaseRoleFullyQualifiedName := databaseRoleId.FullyQualifiedName()

accountRoleId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
Expand Down
9 changes: 5 additions & 4 deletions pkg/resources/grant_privileges_to_account_role_acceptance_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func TestAcc_GrantPrivilegesToAccountRole_OnSchema(t *testing.T) {
}
resourceName := "snowflake_grant_privileges_to_account_role.test"

schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.SchemaId()

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

func TestAcc_GrantPrivilegesToAccountRole_UpdatePrivileges_SnowflakeChecked(t *testing.T) {
roleId := acc.TestClient().Ids.RandomAccountObjectIdentifier()
schemaName := "test_database_role_schema_name"
schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()

configVariables := func(allPrivileges bool, privileges []string, schemaName string) config.Variables {
configVariables := config.Variables{
"name": config.StringVariable(roleId.FullyQualifiedName()),
Expand Down Expand Up @@ -895,7 +896,7 @@ func TestAcc_GrantPrivilegesToAccountRole_UpdatePrivileges_SnowflakeChecked(t *t
ConfigVariables: configVariables(false, []string{
sdk.SchemaPrivilegeCreateTask.String(),
sdk.SchemaPrivilegeCreateExternalTable.String(),
}, schemaName),
}, schemaId.Name()),
Check: queriedAccountRolePrivilegesEqualTo(
roleId,
sdk.SchemaPrivilegeCreateTask.String(),
Expand Down Expand Up @@ -1201,7 +1202,7 @@ func TestAcc_GrantPrivilegesToAccountRole_MLPrivileges(t *testing.T) {
}
resourceName := "snowflake_grant_privileges_to_account_role.test"

schemaId := acc.TestClient().Ids.RandomDatabaseObjectIdentifier()
schemaId := acc.TestClient().Ids.SchemaId()

resource.Test(t, resource.TestCase{
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
Expand Down
Loading

0 comments on commit 350a1f7

Please sign in to comment.