Skip to content
This repository has been archived by the owner on Jan 13, 2023. It is now read-only.

LogpushJob.Filter is optional #50

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1712.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_logpush_job: Fix for optional `filter` attribute
```
11 changes: 7 additions & 4 deletions internal/provider/resource_cloudflare_logpush_job.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
}
Expand Down