Skip to content

Commit e094a06

Browse files
sfc-gh-jcieslaksfc-gh-jcieslak
committed
wip
1 parent 5a4bacd commit e094a06

File tree

4 files changed

+67
-37
lines changed

4 files changed

+67
-37
lines changed

‎pkg/resources/schema_acceptance_test.go

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -47,43 +47,57 @@ func TestAcc_Schema(t *testing.T) {
4747
})
4848
}
4949

50-
//func TestAcc_SchemaRename(t *testing.T) {
51-
// oldSchemaName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
52-
// newSchemaName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
53-
//
54-
// resource.ParallelTest(t, resource.TestCase{
55-
// Providers: acc.TestAccProviders(),
56-
// PreCheck: func() { acc.TestAccPreCheck(t) },
57-
// CheckDestroy: nil,
58-
// Steps: []resource.TestStep{
59-
//, {
60-
// Config: schemaConfig(oldSchemaName, acc.TestDatabaseName),
61-
// Check: resource.ComposeTestCheckFunc(
62-
// resource.TestCheckResourceAttr("snowflake_schema.test", "name", oldSchemaName),
63-
// resource.TestCheckResourceAttr("snowflake_schema.test", "database", acc.TestDatabaseName),
64-
// resource.TestCheckResourceAttr("snowflake_schema.test", "comment", "Terraform acceptance test"),
65-
// checkBool("snowflake_schema.test", "is_transient", false), // this is from user_acceptance_test.go
66-
// checkBool("snowflake_schema.test", "is_managed", false),
67-
// ),
68-
// },
69-
// {
70-
// Config: schemaConfig(newSchemaName, acc.TestDatabaseName),
71-
// Check: resource.ComposeTestCheckFunc(
72-
// resource.TestCheckResourceAttr("snowflake_schema.test", "name", newSchemaName),
73-
// resource.TestCheckResourceAttr("snowflake_schema.test", "database", acc.TestDatabaseName),
74-
// resource.TestCheckResourceAttr("snowflake_schema.test", "comment", "Terraform acceptance test"),
75-
// checkBool("snowflake_schema.test", "is_transient", false), // this is from user_acceptance_test.go
76-
// checkBool("snowflake_schema.test", "is_managed", false),
77-
// ),
78-
// },
79-
// },
80-
// })
81-
//}
50+
func TestAcc_Schema_Rename(t *testing.T) {
51+
oldSchemaName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
52+
newSchemaName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
53+
comment := "Terraform acceptance test"
54+
55+
resource.Test(t, resource.TestCase{
56+
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
57+
PreCheck: func() { acc.TestAccPreCheck(t) },
58+
TerraformVersionChecks: []tfversion.TerraformVersionCheck{
59+
tfversion.RequireAbove(tfversion.Version1_5_0),
60+
},
61+
CheckDestroy: testAccCheckSchemaDestroy,
62+
Steps: []resource.TestStep{
63+
{
64+
ConfigDirectory: config.TestNameDirectory(),
65+
ConfigVariables: map[string]config.Variable{
66+
"name": config.StringVariable(oldSchemaName),
67+
"database": config.StringVariable(acc.TestDatabaseName),
68+
"comment": config.StringVariable(comment),
69+
},
70+
Check: resource.ComposeTestCheckFunc(
71+
resource.TestCheckResourceAttr("snowflake_schema.test", "name", oldSchemaName),
72+
resource.TestCheckResourceAttr("snowflake_schema.test", "database", acc.TestDatabaseName),
73+
resource.TestCheckResourceAttr("snowflake_schema.test", "comment", comment),
74+
checkBool("snowflake_schema.test", "is_transient", false),
75+
checkBool("snowflake_schema.test", "is_managed", false),
76+
),
77+
},
78+
{
79+
ConfigDirectory: config.TestNameDirectory(),
80+
ConfigVariables: map[string]config.Variable{
81+
"name": config.StringVariable(newSchemaName),
82+
"database": config.StringVariable(acc.TestDatabaseName),
83+
"comment": config.StringVariable(comment),
84+
},
85+
Check: resource.ComposeTestCheckFunc(
86+
resource.TestCheckResourceAttr("snowflake_schema.test", "name", newSchemaName),
87+
resource.TestCheckResourceAttr("snowflake_schema.test", "database", acc.TestDatabaseName),
88+
resource.TestCheckResourceAttr("snowflake_schema.test", "comment", comment),
89+
checkBool("snowflake_schema.test", "is_transient", false),
90+
checkBool("snowflake_schema.test", "is_managed", false),
91+
),
92+
},
93+
},
94+
})
95+
}
8296

8397
// TestAcc_Schema_TwoSchemasWithTheSameNameOnDifferentDatabases proves https://github.com/Snowflake-Labs/terraform-provider-snowflake/issues/2209 issue.
8498
func TestAcc_Schema_TwoSchemasWithTheSameNameOnDifferentDatabases(t *testing.T) {
8599
name := "test_schema"
86-
newDatabaseName := strings.ToUpper(acctest.RandStringFromCharSet(10, acctest.CharSetAlpha))
100+
newDatabaseName := "SELDQBXEKC"
87101

88102
resource.Test(t, resource.TestCase{
89103
ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,

‎pkg/resources/testdata/TestAcc_Schema_Rename/test.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
resource "snowflake_schema" "test" {
2+
name = var.name
3+
database = var.database
4+
comment = var.comment
5+
}

‎pkg/resources/testdata/TestAcc_Schema_Rename/variables.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
variable "name" {
2+
type = string
3+
}
4+
5+
variable "database" {
6+
type = string
7+
}
8+
9+
variable "comment" {
10+
type = string
11+
}

‎pkg/sdk/schemas.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,10 @@ func (v *schemas) Show(ctx context.Context, opts *ShowSchemaOptions) ([]Schema,
389389

390390
func (v *schemas) ShowByID(ctx context.Context, id DatabaseObjectIdentifier) (*Schema, error) {
391391
schemas, err := v.client.Schemas.Show(ctx, &ShowSchemaOptions{
392-
//In: &SchemaIn{
393-
// Database: Bool(true),
394-
// Name: NewAccountObjectIdentifier(id.DatabaseName()),
395-
//},
392+
In: &SchemaIn{
393+
Database: Bool(true),
394+
Name: NewAccountObjectIdentifier(id.DatabaseName()),
395+
},
396396
Like: &Like{
397397
Pattern: String(id.Name()),
398398
},

0 commit comments

Comments
 (0)