Skip to content

Marks both logpull_options and output_options as computed #5785

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

Open
wants to merge 1 commit into
base: v4
Choose a base branch
from
+8 −15
Open

Marks both logpull_options and output_options as computed #5785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .changelog/5785.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_logpush_job: mark both logpull_options and output_options as computed
```
2 changes: 1 addition & 1 deletion docs/resources/logpush_job.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ resource "cloudflare_logpush_job" "example_job" {
- `filter` (String) Use filters to select the events to include and/or remove from your logs. For more information, refer to [Filters](https://developers.cloudflare.com/logs/reference/logpush-api-configuration/filters/).
- `frequency` (String, Deprecated) A higher frequency will result in logs being pushed on faster with smaller files. `low` frequency will push logs less often with larger files. Available values: `high`, `low`. Defaults to `high`.
- `kind` (String) The kind of logpush job to create. Available values: `edge`, `instant-logs`, `""`.
- `logpull_options` (String) Configuration string for the Logshare API. It specifies things like requested fields and timestamp formats. See [Logpush options documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#options).
- `logpull_options` (String) Configuration string for the Logshare API. It specifies things like requested fields and timestamp formats. See [Logpush options documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#options). For easier use, you should use "output_options".
- `max_upload_bytes` (Number) The maximum uncompressed file size of a batch of logs. Value must be between 5MB and 1GB.
- `max_upload_interval_seconds` (Number) The maximum interval in seconds for log batches. Value must be between 30 and 300.
- `max_upload_records` (Number) The maximum number of log lines per batch. Value must be between 1000 and 1,000,000.
Expand Down
14 changes: 1 addition & 13 deletions internal/sdkv2provider/resource_cloudflare_logpush_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,6 @@ func resourceCloudflareLogpushJobCreate(ctx context.Context, d *schema.ResourceD
job.Filter = &jobFilter
}

if err != nil {
return diag.FromErr(fmt.Errorf("error parsing logpush job from resource: %w", err))
}

tflog.Debug(ctx, fmt.Sprintf("Creating Cloudflare Logpush job for %s from struct: %+v", identifier, job))

j, err := client.CreateLogpushJob(ctx, identifier, job)
Expand Down Expand Up @@ -289,14 +285,6 @@ func resourceCloudflareLogpushJobUpdate(ctx context.Context, d *schema.ResourceD
job.Filter = &jobFilter
}

if err != nil {
return diag.FromErr(fmt.Errorf("error parsing logpush job from resource: %w", err))
}

if err != nil {
return diag.FromErr(fmt.Errorf("error parsing logpush job from resource: %w", err))
}

tflog.Info(ctx, fmt.Sprintf("Updating Cloudflare Logpush job for %s from struct: %+v", identifier, job))

err = client.UpdateLogpushJob(ctx, identifier, job)
Expand Down Expand Up @@ -334,7 +322,7 @@ func resourceCloudflareLogpushJobDelete(ctx context.Context, d *schema.ResourceD
}

func resourceCloudflareLogpushJobImport(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
// split the id so we can lookup
// split the id so we can look up
idAttr := strings.Split(d.Id(), "/")

if len(idAttr) != 3 || !contains([]string{"zone", "account"}, idAttr[0]) || idAttr[1] == "" || idAttr[2] == "" {
Expand Down
4 changes: 3 additions & 1 deletion internal/sdkv2provider/schema_cloudflare_logpush_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ func resourceCloudflareLogpushJobSchema() map[string]*schema.Schema {
"logpull_options": {
Type: schema.TypeString,
Optional: true,
Description: `Configuration string for the Logshare API. It specifies things like requested fields and timestamp formats. See [Logpush options documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#options).`,
Computed: true,
Description: `Configuration string for the Logshare API. It specifies things like requested fields and timestamp formats. See [Logpush options documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#options). For easier use, you should use "output_options".`,
},
"destination_conf": {
Type: schema.TypeString,
Expand Down Expand Up @@ -123,6 +124,7 @@ func resourceCloudflareLogpushJobSchema() map[string]*schema.Schema {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Computed: true,
Description: "Structured replacement for logpull_options. When including this field, the logpull_option field will be ignored",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down