Skip to content
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

logpush_job: make ownership_challenge optional #1048

Merged
merged 2 commits into from
May 2, 2021
Merged

logpush_job: make ownership_challenge optional #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b395f
logpush_job: make ownership_challenge optional
taurelius Apr 27, 2021
eda9ab4
Move ownership_challenge check
taurelius Apr 29, 2021
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
15 changes: 12 additions & 3 deletions cloudflare/resource_cloudflare_logpush_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"regexp"
"strconv"
"strings"

Expand Down Expand Up @@ -51,7 +52,7 @@ func resourceCloudflareLogpushJob() *schema.Resource {
},
"ownership_challenge": {
Type: schema.TypeString,
Required: true,
Optional: true,
},
},
}
Expand All @@ -67,14 +68,22 @@ func getJobFromResource(d *schema.ResourceData) (cloudflare.LogpushJob, error) {
}
}

destConf := d.Get("destination_conf").(string)
ownershipChallenge := d.Get("ownership_challenge").(string)
var re = regexp.MustCompile(`^((datadog|splunk)://|s3://.+endpoint=)`)

if ownershipChallenge == "" && !re.MatchString(destConf) {
return cloudflare.LogpushJob{}, fmt.Errorf("ownership_challenge must be set for the provided destination_conf")
}

job := cloudflare.LogpushJob{
ID: id,
Enabled: d.Get("enabled").(bool),
Name: d.Get("name").(string),
Dataset: d.Get("dataset").(string),
LogpullOptions: d.Get("logpull_options").(string),
DestinationConf: d.Get("destination_conf").(string),
OwnershipChallenge: d.Get("ownership_challenge").(string),
DestinationConf: destConf,
OwnershipChallenge: ownershipChallenge,
}

return job, nil
Expand Down
9 changes: 5 additions & 4 deletions website/docs/r/logpush_job.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ description: |-

# cloudflare_logpush_job

Provides a resource which manages Cloudflare Logpush jobs. On it's own, this
resource cannot be automatically created. In order to have this automated, you
must have:
Provides a resource which manages Cloudflare Logpush jobs. For Logpush jobs pushing to Amazon S3, Google Cloud Storage,
Microsoft Azure or Sumo Logic, this resource cannot be automatically created. In order to have this automated, you must
have:

- `cloudflare_logpush_ownership_challenge`: Configured to generate the challenge
to confirm ownership of the destination.
Expand Down Expand Up @@ -84,7 +84,8 @@ The following arguments are supported:
* `name` - (Required) The name of the logpush job to create. Must match the regular expression `^[a-zA-Z0-9\-\.]*$`.
* `zone_id` - (Required) The zone ID where the logpush job should be created.
* `destination_conf` - (Required) Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
* `ownership_challenge` - (Required) Ownership challenge token to prove destination ownership. See [Developer documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#usage).
* `dataset` - (Required) Which type of dataset resource to use. Available values are `"firewall_events"`, `"http_requests"`, and `"spectrum_events"`.
* `logpull_options` - (Optional) Configuration string for the Logshare API. It specifies things like requested fields and timestamp formats. See [Logpull options documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#options).
* `ownership_challenge` - (Optional) Ownership challenge token to prove destination ownership, required when destination is Amazon S3, Google Cloud Storage,
Microsoft Azure or Sumo Logic. See [Developer documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#usage).
* `enabled` - (Optional) Whether to enable the job.