From 6f1778dc5d3891e5b2dafa34e49042906e303cac Mon Sep 17 00:00:00 2001 From: "S. Brent Faulkner" Date: Mon, 20 Jun 2022 10:21:08 -0400 Subject: [PATCH] LogpushJob.Filter is optional --- go.mod | 2 +- go.sum | 6 ++---- internal/provider/resource_cloudflare_logpush_job.go | 11 +++++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index f7a87f7c99..7132b0ed22 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/cloudflare/terraform-provider-cloudflare go 1.17 -replace github.com/cloudflare/cloudflare-go => github.com/shopify/cloudflare-go v0.7.4-0.20220601181031-08b76a8c8a1a +replace github.com/cloudflare/cloudflare-go => github.com/shopify/cloudflare-go v0.7.4-0.20220620132815-f02bab10b3c4 require ( github.com/agext/levenshtein v1.2.3 // indirect diff --git a/go.sum b/go.sum index 98bc8ff65c..05689f14eb 100644 --- a/go.sum +++ b/go.sum @@ -947,13 +947,11 @@ github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM= +github.com/shopify/cloudflare-go v0.7.4-0.20220620132815-f02bab10b3c4 h1:lnoKWe74uGSLPYQuLb1KYbjKxljpMoEIQHiPla/4oqU= +github.com/shopify/cloudflare-go v0.7.4-0.20220620132815-f02bab10b3c4/go.mod h1:o0jm+vdFrhwy7GOT3PB/71JQ6kElUQcifPc2Z9KTxeE= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopify/cloudflare-go v0.7.4-0.20220524200708-1c6eaaa9b6b6 h1:qVNN2tyDhclFmVmIDWzNHjiwbhG9Bk3y7LoO5UIgqfU= -github.com/shopify/cloudflare-go v0.7.4-0.20220524200708-1c6eaaa9b6b6/go.mod h1:6VPJV6VD+42Q85HQWv9ITAy6P01QOCwuxJ+3UetJelw= -github.com/shopify/cloudflare-go v0.7.4-0.20220601181031-08b76a8c8a1a h1:EgSmk22v0UR390WXr2oZ+MegV7puX8jsEg65eZBW+LI= -github.com/shopify/cloudflare-go v0.7.4-0.20220601181031-08b76a8c8a1a/go.mod h1:MmAqiRfD8rjKEuUe4MYNHfHjYhFWfW7PNe12CCQWqPY= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= diff --git a/internal/provider/resource_cloudflare_logpush_job.go b/internal/provider/resource_cloudflare_logpush_job.go index ba474d0f4d..30bcb8d098 100644 --- a/internal/provider/resource_cloudflare_logpush_job.go +++ b/internal/provider/resource_cloudflare_logpush_job.go @@ -81,7 +81,7 @@ func getJobFromResource(d *schema.ResourceData) (cloudflare.LogpushJob, *AccessI if err != nil { return job, identifier, err } - job.Filter = jobFilter + job.Filter = &jobFilter } return job, identifier, nil @@ -118,13 +118,15 @@ func resourceCloudflareLogpushJobRead(ctx context.Context, d *schema.ResourceDat return nil } - if job.Filter.Where.Validate() == nil { - filterstr, err := json.Marshal(job.Filter) + var filter string + + if job.Filter != nil { + b, err := json.Marshal(job.Filter) if err != nil { return diag.FromErr(err) } - d.Set("filter", string(filterstr)) + filter = string(b) } d.Set("name", job.Name) @@ -133,6 +135,7 @@ func resourceCloudflareLogpushJobRead(ctx context.Context, d *schema.ResourceDat d.Set("destination_conf", job.DestinationConf) d.Set("ownership_challenge", d.Get("ownership_challenge")) d.Set("frequency", job.Frequency) + d.Set("filter", filter) return nil }