From c2283011cedc509484d90aa92840eed4fec6e475 Mon Sep 17 00:00:00 2001 From: Dean Huynh Date: Mon, 6 Jan 2025 11:58:56 -0800 Subject: [PATCH 1/3] Overwrite RETL model resource schedule values even if null --- internal/provider/reverse_etl_model_resource.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/provider/reverse_etl_model_resource.go b/internal/provider/reverse_etl_model_resource.go index f47784e..087ec87 100644 --- a/internal/provider/reverse_etl_model_resource.go +++ b/internal/provider/reverse_etl_model_resource.go @@ -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) } } From 9084507e31eee07888619385f2eccba0eb53e3c8 Mon Sep 17 00:00:00 2001 From: Dean Huynh Date: Mon, 6 Jan 2025 12:07:27 -0800 Subject: [PATCH 2/3] Fix some build issues --- .github/workflows/test.yml | 2 +- .golangci.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9874313..f794b65 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 diff --git a/.golangci.yml b/.golangci.yml index 8abb937..139bde1 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -14,7 +14,6 @@ linters: - forcetypeassert - godot - gofmt - - gomnd - gosimple - govet - ineffassign From e84ffaa5423f8fa7d686ee1137fa63d6300698f8 Mon Sep 17 00:00:00 2001 From: Dean Huynh Date: Mon, 6 Jan 2025 12:14:48 -0800 Subject: [PATCH 3/3] Test cleanup for deprecated fields --- .../reverse_etl_model_resource_test.go | 38 ++----------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/internal/provider/reverse_etl_model_resource_test.go b/internal/provider/reverse_etl_model_resource_test.go index 352b5f8..f66aa5f 100644 --- a/internal/provider/reverse_etl_model_resource_test.go +++ b/internal/provider/reverse_etl_model_resource_test.go @@ -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" } } } @@ -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" } } } @@ -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" } } } @@ -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" } } } @@ -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( @@ -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 @@ -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, @@ -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( @@ -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