Skip to content

Overwrite RETL model resource schedule values even if null #162

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

Merged
merged 3 commits into from
Jan 6, 2025
Merged

Overwrite RETL model resource schedule values even if null #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c228301
Overwrite RETL model resource schedule values even if null
deanhuynh Jan 6, 2025
9084507
Fix some build issues
deanhuynh Jan 6, 2025
e84ffaa
Test cleanup for deprecated fields
deanhuynh Jan 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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
version: latest

generate:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
Expand Down
1 change: 0 additions & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ linters:
- forcetypeassert
- godot
- gofmt
- gomnd
- gosimple
- govet
- ineffassign
Expand Down
4 changes: 2 additions & 2 deletions internal/provider/reverse_etl_model_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ func (r *reverseETLModelResource) Read(ctx context.Context, req resource.ReadReq
}

// Since we deprecated these values, we just need to set them to the plan values so there are no errors
if !previousState.ScheduleConfig.IsNull() && !previousState.ScheduleConfig.IsUnknown() {
if !previousState.ScheduleConfig.IsUnknown() {
resp.State.SetAttribute(ctx, path.Root("schedule_config"), previousState.ScheduleConfig)
}
if !previousState.ScheduleStrategy.IsNull() && !previousState.ScheduleStrategy.IsUnknown() {
if !previousState.ScheduleStrategy.IsUnknown() {
resp.State.SetAttribute(ctx, path.Root("schedule_strategy"), previousState.ScheduleStrategy)
}
}
Expand Down
38 changes: 4 additions & 34 deletions internal/provider/reverse_etl_model_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
"description": "My reverse etl model description",
"enabled": true,
"query": "SELECT hi FROM greetings",
"queryIdentifierColumn": "hi",
"scheduleStrategy": "SPECIFIC_DAYS",
"scheduleConfig": {"days":[0,1,2,3],"hours":[0,1,3,2],"timezone":"America/Los_Angeles"}
"queryIdentifierColumn": "hi"
}
}
}
Expand All @@ -46,9 +44,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
"description": "My new reverse etl model description",
"enabled": false,
"query": "SELECT hello FROM greetings",
"queryIdentifierColumn": "hello",
"scheduleStrategy": "SPECIFIC_DAYS",
"scheduleConfig": {"days":[0,1,2,3,4],"hours":[0,1,5],"timezone":"America/Los_Angeles"}
"queryIdentifierColumn": "hello"
}
}
}
Expand All @@ -66,9 +62,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
"description": "My reverse etl model description",
"enabled": true,
"query": "SELECT hi FROM greetings",
"queryIdentifierColumn": "hi",
"scheduleStrategy": "SPECIFIC_DAYS",
"scheduleConfig": {"days":[0,1,2,3],"hours":[0,1,3,2],"timezone":"America/Los_Angeles"}
"queryIdentifierColumn": "hi"
}
}
}
Expand All @@ -84,9 +78,7 @@ func TestAccReverseETLModelResource(t *testing.T) {
"description": "My new reverse etl model description",
"enabled": false,
"query": "SELECT hello FROM greetings",
"queryIdentifierColumn": "hello",
"scheduleStrategy": "SPECIFIC_DAYS",
"scheduleConfig": {"days":[0,1,2,3,4],"hours":[0,1,5],"timezone":"America/Los_Angeles"}
"queryIdentifierColumn": "hello"
}
}
}
Expand Down Expand Up @@ -117,14 +109,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
name = "My reverse etl model name"
enabled = true
description = "My reverse etl model description"
schedule_strategy = "SPECIFIC_DAYS"
query = "SELECT hi FROM greetings"
query_identifier_column = "hi"
schedule_config = jsonencode({
"days": [0, 1, 2, 3],
"hours": [0, 1, 3, 2],
"timezone": "America/Los_Angeles"
})
}
`,
Check: resource.ComposeAggregateTestCheckFunc(
Expand All @@ -133,10 +119,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "name", "My reverse etl model name"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "enabled", "true"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "description", "My reverse etl model description"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_strategy", "SPECIFIC_DAYS"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query", "SELECT hi FROM greetings"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query_identifier_column", "hi"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_config", "{\"days\":[0,1,2,3],\"hours\":[0,1,3,2],\"timezone\":\"America/Los_Angeles\"}"),
),
},
// ImportState testing
Expand All @@ -148,14 +132,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
name = "My reverse etl model name"
enabled = true
description = "My reverse etl model description"
schedule_strategy = "SPECIFIC_DAYS"
query = "SELECT hi FROM greetings"
query_identifier_column = "hi"
schedule_config = jsonencode({
"days": [0, 1, 2, 3],
"hours": [0, 1, 3, 2],
"timezone": "America/Los_Angeles"
})
}
`,
ImportState: true,
Expand All @@ -169,14 +147,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
name = "My new reverse etl model name"
enabled = false
description = "My new reverse etl model description"
schedule_strategy = "SPECIFIC_DAYS"
query = "SELECT hello FROM greetings"
query_identifier_column = "hello"
schedule_config = jsonencode({
"days": [0, 1, 2, 3, 4],
"hours": [0, 1, 5],
"timezone": "America/Los_Angeles"
})
}
`,
Check: resource.ComposeAggregateTestCheckFunc(
Expand All @@ -185,10 +157,8 @@ func TestAccReverseETLModelResource(t *testing.T) {
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "name", "My new reverse etl model name"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "enabled", "false"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "description", "My new reverse etl model description"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_strategy", "SPECIFIC_DAYS"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query", "SELECT hello FROM greetings"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "query_identifier_column", "hello"),
resource.TestCheckResourceAttr("segment_reverse_etl_model.test", "schedule_config", "{\"days\":[0,1,2,3,4],\"hours\":[0,1,5],\"timezone\":\"America/Los_Angeles\"}"),
),
},
// Delete testing automatically occurs in TestCase
Expand Down
Loading