feat: Adjust owner_role_type and schema_evolution_record columns (#2740)

- **Support schema evolution record** - **Support owner role type column** - **Support owner role type in other views**   ## Test Plan  * [ ] acceptance tests  * [x] integration tests ## References  https://docs.snowflake.com/en/user-guide/data-load-schema-evolution
Snowflake-Labs · Apr 26, 2024 · 424e393 · 424e393
1 parent eba3029
commit 424e393
Show file tree

Hide file tree

Showing 29 changed files with 284 additions and 126 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -67,7 +67,7 @@ We've included an example env file `test.env.example` with the environment varia
 
 ## Advanced Debugging
 
-If you want to build and test the provider locally you should edit you `~.terraformrc` file to include the following:
+If you want to build and test the provider locally you should edit your `~/.terraformrc` file to include the following:
 
 ```
 provider_installation {

diff --git a/docs/resources/table.md b/docs/resources/table.md
@@ -121,6 +121,10 @@ Optional:
 - `masking_policy` (String) Masking policy to apply on column. It has to be a fully qualified name.
 - `nullable` (Boolean) Whether this column can contain null values. **Note**: Depending on your Snowflake version, the default value will not suffice if this column is used in a primary key constraint.
 
+Read-Only:
+
+- `schema_evolution_record` (String) Record of schema evolution.
+
 <a id="nestedblock--column--default"></a>
 ### Nested Schema for `column.default`
 

diff --git a/pkg/acceptance/helpers/stage_client.go b/pkg/acceptance/helpers/stage_client.go
@@ -116,3 +116,14 @@ func (c *StageClient) PutOnStageWithContent(t *testing.T, id sdk.SchemaObjectIde
 		require.NoError(t, err)
 	})
 }
+
+func (c *StageClient) CopyIntoTableFromFile(t *testing.T, table, stage sdk.SchemaObjectIdentifier, filename string) {
+	t.Helper()
+	ctx := context.Background()
+
+	_, err := c.context.client.ExecForTests(ctx, fmt.Sprintf(`COPY INTO %s
+	FROM @%s/%s
+	FILE_FORMAT = (type=json)
+	MATCH_BY_COLUMN_NAME = CASE_INSENSITIVE`, table.FullyQualifiedName(), stage.FullyQualifiedName(), filename))
+	require.NoError(t, err)
+}
diff --git a/pkg/acceptance/helpers/table_client.go b/pkg/acceptance/helpers/table_client.go
@@ -131,4 +131,5 @@ type InformationSchemaColumns struct {
 	IdentityCycle          sql.NullString `db:"IDENTITY_CYCLE"`
 	IdentityOrdered        sql.NullString `db:"IDENTITY_ORDERED"`
 	Comment                sql.NullString `db:"COMMENT"`
+	SchemaEvolutionRecord  sql.NullString `db:"SCHEMA_EVOLUTION_RECORD"`
 }
diff --git a/pkg/resources/table.go b/pkg/resources/table.go
@@ -145,6 +145,11 @@ var tableSchema = map[string]*schema.Schema{
 					Default:     "",
 					Description: "Column collation, e.g. utf8",
 				},
+				"schema_evolution_record": {
+					Type:        schema.TypeString,
+					Computed:    true,
+					Description: "Record of schema evolution.",
+				},
 			},
 		},
 	},
@@ -496,6 +501,11 @@ func toColumnConfig(descriptions []sdk.TableColumnDetails) []any {
 				flat["default"] = []any{def}
 			}
 		}
+
+		if td.SchemaEvolutionRecord != nil {
+			flat["schema_evolution_record"] = *td.SchemaEvolutionRecord
+		}
+
 		flattened = append(flattened, flat)
 	}
 	return flattened

diff --git a/pkg/resources/table_acceptance_test.go b/pkg/resources/table_acceptance_test.go
@@ -164,6 +164,7 @@ func TestAcc_Table(t *testing.T) {
 					resource.TestCheckResourceAttr("snowflake_table.test_table", "column.0.type", "VARIANT"),
 					resource.TestCheckResourceAttr("snowflake_table.test_table", "column.1.name", "column2"),
 					resource.TestCheckResourceAttr("snowflake_table.test_table", "column.1.comment", ""),
+					resource.TestCheckResourceAttr("snowflake_table.test_table", "column.1.schema_evolution_record", ""),
 					resource.TestCheckNoResourceAttr("snowflake_table.test_table", "primary_key.0"),
 				),
 			},

diff --git a/pkg/sdk/alerts.go b/pkg/sdk/alerts.go
@@ -2,6 +2,7 @@ package sdk
 
 import (
 	"context"
+	"database/sql"
 	"errors"
 	"fmt"
 	"time"
@@ -218,35 +219,37 @@ func (v *Alert) ObjectType() ObjectType {
 }
 
 type Alert struct {
-	CreatedOn    time.Time
-	Name         string
-	DatabaseName string
-	SchemaName   string
-	Owner        string
-	Comment      *string
-	Warehouse    string
-	Schedule     string
-	State        AlertState
-	Condition    string
-	Action       string
+	CreatedOn     time.Time
+	Name          string
+	DatabaseName  string
+	SchemaName    string
+	Owner         string
+	Comment       *string
+	Warehouse     string
+	Schedule      string
+	State         AlertState
+	Condition     string
+	Action        string
+	OwnerRoleType string
 }
 
 type alertDBRow struct {
-	CreatedOn    time.Time `db:"created_on"`
-	Name         string    `db:"name"`
-	DatabaseName string    `db:"database_name"`
-	SchemaName   string    `db:"schema_name"`
-	Owner        string    `db:"owner"`
-	Comment      *string   `db:"comment"`
-	Warehouse    string    `db:"warehouse"`
-	Schedule     string    `db:"schedule"`
-	State        string    `db:"state"` // suspended, started
-	Condition    string    `db:"condition"`
-	Action       string    `db:"action"`
+	CreatedOn     time.Time      `db:"created_on"`
+	Name          string         `db:"name"`
+	DatabaseName  string         `db:"database_name"`
+	SchemaName    string         `db:"schema_name"`
+	Owner         string         `db:"owner"`
+	Comment       *string        `db:"comment"`
+	Warehouse     string         `db:"warehouse"`
+	Schedule      string         `db:"schedule"`
+	State         string         `db:"state"` // suspended, started
+	Condition     string         `db:"condition"`
+	Action        string         `db:"action"`
+	OwnerRoleType sql.NullString `db:"owner_role_type"`
 }
 
 func (row alertDBRow) convert() *Alert {
-	return &Alert{
+	alert := &Alert{
 		CreatedOn:    row.CreatedOn,
 		Name:         row.Name,
 		DatabaseName: row.DatabaseName,
@@ -259,6 +262,11 @@ func (row alertDBRow) convert() *Alert {
 		Condition:    row.Condition,
 		Action:       row.Action,
 	}
+	if row.OwnerRoleType.Valid {
+		alert.OwnerRoleType = row.OwnerRoleType.String
+	}
+
+	return alert
 }
 
 func (opts *ShowAlertOptions) validate() error {

diff --git a/pkg/sdk/databases.go b/pkg/sdk/databases.go
@@ -57,6 +57,7 @@ type Database struct {
 	DroppedOn     time.Time
 	Transient     bool
 	Kind          string
+	OwnerRoleType string
 }
 
 func (v *Database) ID() AccountObjectIdentifier {
@@ -80,6 +81,7 @@ type databaseRow struct {
 	ResourceGroup sql.NullString `db:"resource_group"`
 	DroppedOn     sql.NullTime   `db:"dropped_on"`
 	Kind          sql.NullString `db:"kind"`
+	OwnerRoleType sql.NullString `db:"owner_role_type"`
 }
 
 func (row databaseRow) convert() *Database {
@@ -129,6 +131,9 @@ func (row databaseRow) convert() *Database {
 	if row.Kind.Valid {
 		database.Kind = row.Kind.String
 	}
+	if row.OwnerRoleType.Valid {
+		database.OwnerRoleType = row.OwnerRoleType.String
+	}
 	return database
 }
 

diff --git a/pkg/sdk/dynamic_table.go b/pkg/sdk/dynamic_table.go
@@ -125,6 +125,7 @@ type DynamicTable struct {
 	IsClone             bool
 	IsReplica           bool
 	DataTimestamp       time.Time
+	OwnerRoleType       string
 }
 
 func (dt *DynamicTable) ID() SchemaObjectIdentifier {
@@ -153,6 +154,7 @@ type dynamicTableRow struct {
 	IsClone             bool           `db:"is_clone"`
 	IsReplica           bool           `db:"is_replica"`
 	DataTimestamp       sql.NullTime   `db:"data_timestamp"`
+	OwnerRoleType       sql.NullString `db:"owner_role_type"`
 }
 
 func (dtr dynamicTableRow) convert() *DynamicTable {
@@ -185,6 +187,10 @@ func (dtr dynamicTableRow) convert() *DynamicTable {
 	if dtr.LastSuspendedOn.Valid {
 		dt.LastSuspendedOn = dtr.LastSuspendedOn.Time
 	}
+	if dtr.OwnerRoleType.Valid {
+		dt.OwnerRoleType = dtr.OwnerRoleType.String
+	}
+
 	return dt
 }
 

diff --git a/pkg/sdk/masking_policy.go b/pkg/sdk/masking_policy.go
@@ -230,6 +230,7 @@ type MaskingPolicy struct {
 	Owner               string
 	Comment             string
 	ExemptOtherPolicies bool
+	OwnerRoleType       string
 }
 
 func (v *MaskingPolicy) ID() SchemaObjectIdentifier {
@@ -267,6 +268,7 @@ func (row maskingPolicyDBRow) convert() *MaskingPolicy {
 		Owner:               row.Owner,
 		Comment:             row.Comment,
 		ExemptOtherPolicies: exemptOtherPolicies,
+		OwnerRoleType:       row.OwnerRoleType,
 	}
 }
 

diff --git a/pkg/sdk/password_policy.go b/pkg/sdk/password_policy.go
@@ -251,13 +251,14 @@ func (opts *ShowPasswordPolicyOptions) validate() error {
 
 // PasswordPolicy is a user-friendly result for a CREATE PASSWORD POLICY query.
 type PasswordPolicy struct {
-	CreatedOn    time.Time
-	Name         string
-	DatabaseName string
-	SchemaName   string
-	Kind         string
-	Owner        string
-	Comment      string
+	CreatedOn     time.Time
+	Name          string
+	DatabaseName  string
+	SchemaName    string
+	Kind          string
+	Owner         string
+	Comment       string
+	OwnerRoleType string
 }
 
 func (v *PasswordPolicy) ID() SchemaObjectIdentifier {
@@ -283,13 +284,14 @@ type passwordPolicyDBRow struct {
 
 func (row passwordPolicyDBRow) convert() PasswordPolicy {
 	return PasswordPolicy{
-		CreatedOn:    row.CreatedOn,
-		Name:         row.Name,
-		DatabaseName: row.DatabaseName,
-		SchemaName:   row.SchemaName,
-		Kind:         row.Kind,
-		Owner:        row.Owner,
-		Comment:      row.Comment,
+		CreatedOn:     row.CreatedOn,
+		Name:          row.Name,
+		DatabaseName:  row.DatabaseName,
+		SchemaName:    row.SchemaName,
+		Kind:          row.Kind,
+		Owner:         row.Owner,
+		Comment:       row.Comment,
+		OwnerRoleType: row.OwnerRoleType,
 	}
 }
 

diff --git a/pkg/sdk/session_policies_def.go b/pkg/sdk/session_policies_def.go
@@ -73,7 +73,8 @@ var SessionPoliciesDef = g.NewInterface(
 			Field("kind", "string").
 			Field("owner", "string").
 			Field("comment", "string").
-			Field("options", "string"),
+			Field("options", "string").
+			Field("owner_role_type", "string"),
 		g.PlainStruct("SessionPolicy").
 			Field("CreatedOn", "string").
 			Field("Name", "string").
@@ -82,7 +83,8 @@ var SessionPoliciesDef = g.NewInterface(
 			Field("Kind", "string").
 			Field("Owner", "string").
 			Field("Comment", "string").
-			Field("Options", "string"),
+			Field("Options", "string").
+			Field("OwnerRoleType", "string"),
 		g.NewQueryStruct("ShowSessionPolicies").
 			Show().
 			SQL("SESSION POLICIES"),

diff --git a/pkg/sdk/session_policies_gen.go b/pkg/sdk/session_policies_gen.go
@@ -66,25 +66,27 @@ type ShowSessionPolicyOptions struct {
 }
 
 type showSessionPolicyDBRow struct {
-	CreatedOn    string `db:"created_on"`
-	Name         string `db:"name"`
-	DatabaseName string `db:"database_name"`
-	SchemaName   string `db:"schema_name"`
-	Kind         string `db:"kind"`
-	Owner        string `db:"owner"`
-	Comment      string `db:"comment"`
-	Options      string `db:"options"`
+	CreatedOn     string `db:"created_on"`
+	Name          string `db:"name"`
+	DatabaseName  string `db:"database_name"`
+	SchemaName    string `db:"schema_name"`
+	Kind          string `db:"kind"`
+	Owner         string `db:"owner"`
+	Comment       string `db:"comment"`
+	Options       string `db:"options"`
+	OwnerRoleType string `db:"owner_role_type"`
 }
 
 type SessionPolicy struct {
-	CreatedOn    string
-	Name         string
-	DatabaseName string
-	SchemaName   string
-	Kind         string
-	Owner        string
-	Comment      string
-	Options      string
+	CreatedOn     string
+	Name          string
+	DatabaseName  string
+	SchemaName    string
+	Kind          string
+	Owner         string
+	Comment       string
+	Options       string
+	OwnerRoleType string
 }
 
 // DescribeSessionPolicyOptions is based on https://docs.snowflake.com/en/sql-reference/sql/desc-session-policy.

diff --git a/pkg/sdk/session_policies_impl_gen.go b/pkg/sdk/session_policies_impl_gen.go
@@ -110,14 +110,15 @@ func (r *ShowSessionPolicyRequest) toOpts() *ShowSessionPolicyOptions {
 
 func (r showSessionPolicyDBRow) convert() *SessionPolicy {
 	return &SessionPolicy{
-		CreatedOn:    r.CreatedOn,
-		Name:         r.Name,
-		DatabaseName: r.DatabaseName,
-		SchemaName:   r.SchemaName,
-		Kind:         r.Kind,
-		Owner:        r.Owner,
-		Comment:      r.Comment,
-		Options:      r.Options,
+		CreatedOn:     r.CreatedOn,
+		Name:          r.Name,
+		DatabaseName:  r.DatabaseName,
+		SchemaName:    r.SchemaName,
+		Kind:          r.Kind,
+		Owner:         r.Owner,
+		Comment:       r.Comment,
+		Options:       r.Options,
+		OwnerRoleType: r.OwnerRoleType,
 	}
 }