From 2e5ac0d5a17fda0dc3716d9e7c66323a96cc1f94 Mon Sep 17 00:00:00 2001 From: Duc Nguyen Date: Thu, 28 Apr 2022 15:53:26 -0700 Subject: [PATCH 1/3] do not require ownership challenge for https logpush endpoints --- cloudflare/resource_cloudflare_logpush_job.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudflare/resource_cloudflare_logpush_job.go b/cloudflare/resource_cloudflare_logpush_job.go index 9eac2dc6d1..e62b6eba8b 100644 --- a/cloudflare/resource_cloudflare_logpush_job.go +++ b/cloudflare/resource_cloudflare_logpush_job.go @@ -42,7 +42,7 @@ func getJobFromResource(d *schema.ResourceData) (cloudflare.LogpushJob, *AccessI destConf := d.Get("destination_conf").(string) ownershipChallenge := d.Get("ownership_challenge").(string) - var re = regexp.MustCompile(`^((datadog|splunk)://|s3://.+endpoint=)`) + var re = regexp.MustCompile(`^((datadog|splunk)://|s3://.+endpoint=|https://)`) if ownershipChallenge == "" && !re.MatchString(destConf) { return cloudflare.LogpushJob{}, identifier, fmt.Errorf("ownership_challenge must be set for the provided destination_conf") From 71038583a92e468112d0bc39caf9b5df0c7b189c Mon Sep 17 00:00:00 2001 From: Duc Nguyen Date: Thu, 28 Apr 2022 18:24:12 -0700 Subject: [PATCH 2/3] Update cloudflare/resource_cloudflare_logpush_job.go with suggested change Co-authored-by: Cole Mackenzie --- cloudflare/resource_cloudflare_logpush_job.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudflare/resource_cloudflare_logpush_job.go b/cloudflare/resource_cloudflare_logpush_job.go index e62b6eba8b..5c13e25db2 100644 --- a/cloudflare/resource_cloudflare_logpush_job.go +++ b/cloudflare/resource_cloudflare_logpush_job.go @@ -42,7 +42,7 @@ func getJobFromResource(d *schema.ResourceData) (cloudflare.LogpushJob, *AccessI destConf := d.Get("destination_conf").(string) ownershipChallenge := d.Get("ownership_challenge").(string) - var re = regexp.MustCompile(`^((datadog|splunk)://|s3://.+endpoint=|https://)`) + var re = regexp.MustCompile(`^((datadog|splunk|https)://|s3://.+endpoint=)`) if ownershipChallenge == "" && !re.MatchString(destConf) { return cloudflare.LogpushJob{}, identifier, fmt.Errorf("ownership_challenge must be set for the provided destination_conf") From 3b68904c1f8f0d5150d5472bbcca49b269a448d1 Mon Sep 17 00:00:00 2001 From: Duc Nguyen Date: Thu, 28 Apr 2022 18:28:22 -0700 Subject: [PATCH 3/3] add changelog entry for PR 1588 --- .changelog/1588.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/1588.txt diff --git a/.changelog/1588.txt b/.changelog/1588.txt new file mode 100644 index 0000000000..e5108f00d7 --- /dev/null +++ b/.changelog/1588.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/cloudflare_logpush_job: make ownership challenge check for https not required +```