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

Jump to bottom

fix: Stream append only #653

Merged
merged 5 commits into from
Aug 23, 2021
Merged

fix: Stream append only #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a512b8f
fix: Changed stream append_only to use mode value
Aug 20, 2021
4ba59e7
fix: Added append_only stream acceptance test
Aug 20, 2021
a627975
Merge branch 'main' into fix-stream-append-only
koslam Aug 22, 2021
2546704
fix: Updated stream acceptance test for append_only
koslam Aug 22, 2021
546f1d3
Merge branch 'main' into fix-stream-append-only
alldoami Aug 23, 2021
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
2 changes: 1 addition & 1 deletion pkg/resources/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func ReadStream(d *schema.ResourceData, meta interface{}) error {
return err
}

err = d.Set("append_only", stream.AppendOnly)
err = d.Set("append_only", stream.Mode.String == "APPEND_ONLY")
if err != nil {
return err
}
Expand Down
34 changes: 26 additions & 8 deletions pkg/resources/stream_acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestAcc_Stream(t *testing.T) {
Providers: providers(),
Steps: []resource.TestStep{
{
Config: streamConfig(accName),
Config: streamConfig(accName, false),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "name", accName),
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "database", accName),
Expand All @@ -27,11 +27,28 @@ func TestAcc_Stream(t *testing.T) {
checkBool("snowflake_stream.test_stream", "show_initial_rows", false),
),
},
{
Config: streamConfig(accName, true),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "name", accName),
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "database", accName),
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "schema", accName),
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "on_table", fmt.Sprintf("%s.%s.%s", accName, accName, "STREAM_ON_TABLE")),
resource.TestCheckResourceAttr("snowflake_stream.test_stream", "comment", "Terraform acceptance test"),
checkBool("snowflake_stream.test_stream", "append_only", true),
checkBool("snowflake_stream.test_stream", "show_initial_rows", false),
),
},
},
})
}

func streamConfig(name string) string {
func streamConfig(name string, append_only bool) string {
append_only_config := ""
if append_only {
append_only_config = "append_only = true"
}

s := `
resource "snowflake_database" "test_database" {
name = "%s"
Expand Down Expand Up @@ -62,12 +79,13 @@ resource "snowflake_table" "test_stream_on_table" {
}

resource "snowflake_stream" "test_stream" {
database = snowflake_database.test_database.name
schema = snowflake_schema.test_schema.name
name = "%s"
comment = "Terraform acceptance test"
on_table = "${snowflake_database.test_database.name}.${snowflake_schema.test_schema.name}.${snowflake_table.test_stream_on_table.name}"
database = snowflake_database.test_database.name
schema = snowflake_schema.test_schema.name
name = "%s"
comment = "Terraform acceptance test"
on_table = "${snowflake_database.test_database.name}.${snowflake_schema.test_schema.name}.${snowflake_table.test_stream_on_table.name}"
%s
}
`
return fmt.Sprintf(s, name, name, name)
return fmt.Sprintf(s, name, name, name, append_only_config)
}
28 changes: 28 additions & 0 deletions pkg/resources/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,34 @@ func TestStreamRead(t *testing.T) {
})
}

func TestStreamReadAppendOnlyMode(t *testing.T) {
r := require.New(t)

d := stream(t, "database_name|schema_name|stream_name", map[string]interface{}{"name": "stream_name", "comment": "grand comment"})

WithMockDb(t, func(db *sql.DB, mock sqlmock.Sqlmock) {
rows := sqlmock.NewRows([]string{"name", "database_name", "schema_name", "owner", "comment", "table_name", "type", "stale", "mode"}).AddRow("stream_name", "database_name", "schema_name", "owner_name", "grand comment", "target_table", "DELTA", false, "APPEND_ONLY")
mock.ExpectQuery(`SHOW STREAMS LIKE 'stream_name' IN DATABASE "database_name"`).WillReturnRows(rows)
err := resources.ReadStream(d, db)
r.NoError(err)
r.Equal(true, d.Get("append_only").(bool))
})
}

func TestStreamReadDefaultMode(t *testing.T) {
r := require.New(t)

d := stream(t, "database_name|schema_name|stream_name", map[string]interface{}{"name": "stream_name", "comment": "grand comment"})

WithMockDb(t, func(db *sql.DB, mock sqlmock.Sqlmock) {
rows := sqlmock.NewRows([]string{"name", "database_name", "schema_name", "owner", "comment", "table_name", "type", "stale", "mode"}).AddRow("stream_name", "database_name", "schema_name", "owner_name", "grand comment", "target_table", "DELTA", false, "DEFAULT")
mock.ExpectQuery(`SHOW STREAMS LIKE 'stream_name' IN DATABASE "database_name"`).WillReturnRows(rows)
err := resources.ReadStream(d, db)
r.NoError(err)
r.Equal(false, d.Get("append_only").(bool))
})
}

func TestStreamDelete(t *testing.T) {
r := require.New(t)

Expand Down