Add support for configuring authenticated origin pulls #749

dhaynespls · 2020-07-28T22:18:10Z

high level schema:

// Global AOP
resource "cloudflare_authenticated_origin_pulls" "foobar" {
  zone_id = ""
  enabled = true
}

resource "cloudflare_authenticated_origin_pulls_certificate" "foo" {
  certificate = ""
  private_key = ""
  type = ""
}


// Per Zone AOP
resource "cloudflare_authenticated_origin_pulls" "foobar" {
  zone_id = ""
  authenticated_origin_pulls_certificate = authenticated_origin_pulls_certificate.foo.id
  enabled = true
}

// Per Hostname AOP
resource "cloudflare_authenticated_origin_pulls" "foobar" {
  zone_id = ""
  hostname = "foobar.com"
  authenticated_origin_pulls_certificate = authenticated_origin_pulls_certificate.foo.id
  enabled = true
}

Through these two resources, and combinations of their attributes we can allow for all AOP endpoints to be hit based on the data provided.

Closes #736

- AOP resource will be used for all forms of AOP, here we toggle global AOP

- This resource functions as a mechanism to upload certificates to the per-zone and per-hostname AOP endpoints which can be later referenced by the AOP resource by ID

…chanisms - AopType specifies which API the certificate should be uploaded to - You cannot edit certificates - Any changes must result in a reupload

- API is selected based on provided parameters

dhaynespls · 2020-07-28T22:26:11Z

Tests will fail until cloudflare/cloudflare-go#511 is merged

jacobbednarz

A few minor nitpicks/questions from me but overall looks good!

Could you also add the website documentation to this PR?

cloudflare/resource_cloudflare_authenticated_origin_pulls.go

cloudflare/resource_cloudflare_authenticated_origin_pulls_certificate.go

cloudflare/resource_cloudflare_authenticated_origin_pulls_certificate_test.go

Define one, rather than three times Co-authored-by: Jacob Bednarz <[email protected]>

https://github.com/golang/go/wiki/CodeReviewComments#error-strings Co-authored-by: Jacob Bednarz <[email protected]>

Co-authored-by: Jacob Bednarz <[email protected]>

dhaynespls · 2020-07-30T18:10:31Z

Oh and good catch about docs I completely forgot they were a thing -- plus this resource is pretty confusing without some supporting docs about how to use it!

…of github.com:dhaynespls/terraform-provider-cloudflare into dhaynespls/736-add-authenticated-origin-pulls-support

dhaynespls · 2020-08-12T00:21:45Z

I will also look into importing as there is a use case where one has already configured all of the different types of AOP / has uploaded certificates that they'd like to import into terraform.

- Still need to add sections on importing when that is done.

… status code

…aform

…lls-support

dhaynespls · 2020-08-12T22:55:53Z

@jacobbednarz Ready for review again! Though I'm not sure what's going on with the website build 🤔

jacobbednarz · 2020-08-14T01:53:29Z

Though I'm not sure what's going on with the website build

If you pull in the latest master, the website-build steps should be fixed again with a temporary workaround while the new documentation stuff is sorted out for the registry.

This resource is restricted to one at a time in the zone and if we run these tests, they collide resulting in a validation error. Running them sequentially is slower but reliable.

jacobbednarz · 2020-08-14T02:42:50Z

Hope you don't mind @dhaynespls but I pushed up a couple of commits that addressed some issues in the integration suite where parallelisation of the certificate creation tests collided as there is a one per zone restriction on it. With the fixes, the integration suite for these changes is ✅

jacobbednarz

LGTM! Thanks for the persisted effort here @dhaynespls! You rock!

cdloh · 2020-08-17T15:59:56Z

@patryk @jacobbednarz this MR appears to have removed the cloudflare_custom_hostname resource.

Restore custom_hostname resource accidentally removed in #749

dhaynespls · 2020-08-17T16:09:57Z

Good catch thank you @cdloh. I went ahead and merged as it's just a single line change in provider.go.

# By Jacob Bednarz (3) and others # Via GitHub (4) and Callum Loh (1) * master: Restore custom_hostname resource accidentally removed in cloudflare#749 Add support for configuring authenticated origin pulls (cloudflare#749) Update CHANGELOG.md ci: fix website-test Update CHANGELOG.md Add more info on cloudflare_zones data source breaking change Compare firewall descriptions after converting unicode + HTML entities Update CHANGELOG.md Support Spectrum applications with port ranges # Conflicts: # cloudflare/provider.go

* WDAPI-645 add device posture integration api * Update device_posture_rule.go Co-authored-by: Jacob Bednarz <[email protected]> Co-authored-by: andrew <[email protected]> Co-authored-by: Jacob Bednarz <[email protected]>

dhaynespls added 5 commits July 21, 2020 16:08

736: Global AOP can be toggled through AOP resource

0af952e

- AOP resource will be used for all forms of AOP, here we toggle global AOP

736: WIP first pass on aop_certificate resource

05cf9f5

- This resource functions as a mechanism to upload certificates to the per-zone and per-hostname AOP endpoints which can be later referenced by the AOP resource by ID

736: Add support for AOP certificates as a resource

2f217a8

736: AOP Certificates have AccTests, and handle Create,Read,Update me…

121a9cf

…chanisms - AopType specifies which API the certificate should be uploaded to - You cannot edit certificates - Any changes must result in a reupload

736: Add support for configuring all AOP APIs within the AOP resource

a68c407

- API is selected based on provided parameters

dhaynespls requested review from jacobbednarz and patryk July 28, 2020 22:19

patryk force-pushed the master branch from 17c0f3b to 9ca2067 Compare July 29, 2020 22:34

jacobbednarz reviewed Jul 30, 2020

View reviewed changes

dhaynespls and others added 3 commits July 30, 2020 10:45

749: Refactor checksum computing for AOP resource more idiomatic

f0389c0

Define one, rather than three times Co-authored-by: Jacob Bednarz <[email protected]>

749: Idiomatic go error strings

8760619

https://github.com/golang/go/wiki/CodeReviewComments#error-strings Co-authored-by: Jacob Bednarz <[email protected]>

749: Remove unnecessary newlines in acceptance tests

aeba4f9

Co-authored-by: Jacob Bednarz <[email protected]>

jacobbednarz added the workflow/pending-contributor-response Indicates an issue or PR requires a response from a contributor. label Aug 10, 2020

dhaynespls added 2 commits August 11, 2020 17:17

736: Remove debug print statements

0a2ebba

Merge branch 'dhaynespls/736-add-authenticated-origin-pulls-support' …

b294ebc

…of github.com:dhaynespls/terraform-provider-cloudflare into dhaynespls/736-add-authenticated-origin-pulls-support

dhaynespls marked this pull request as draft August 12, 2020 00:20

dhaynespls added 3 commits August 12, 2020 11:59

736: First pass on docs

fd05f60

- Still need to add sections on importing when that is done.

736: Handle 404 case in reading certs, and return error for any other…

c9b0dfb

… status code

736: Add support for importing AOP resources / certificates into terr…

d47f5ea

…aform

dhaynespls marked this pull request as ready for review August 12, 2020 22:47

Merge branch 'master' into dhaynespls/736-add-authenticated-origin-pu…

d4c92de

…lls-support

jacobbednarz added 2 commits August 14, 2020 12:30

don't parallelise shared certificate creation

5c9bc73

This resource is restricted to one at a time in the zone and if we run these tests, they collide resulting in a validation error. Running them sequentially is slower but reliable.

Append name to the hostname for uniqueness

6bdf475

jacobbednarz approved these changes Aug 14, 2020

View reviewed changes

Make ZoneID ForceNew

b54e183

patryk approved these changes Aug 17, 2020

View reviewed changes

patryk merged commit b9a42dc into cloudflare:master Aug 17, 2020

cdloh pushed a commit to cdloh/terraform-provider-cloudflare that referenced this pull request Aug 17, 2020

Restore custom_hostname resource accidentally removed in cloudflare#749

861f4c2

cdloh mentioned this pull request Aug 17, 2020

Restore custom_hostname resource accidentally removed in #749 #769

Merged

dhaynespls added a commit that referenced this pull request Aug 17, 2020

Merge pull request #769 from cdloh/restore_cloudflare_custom_hostname

16d57db

Restore custom_hostname resource accidentally removed in #749

dhaynespls deleted the dhaynespls/736-add-authenticated-origin-pulls-support branch August 17, 2020 17:09

bryanchug mentioned this pull request Sep 2, 2020

cloudflare_custom_hostname import does not import anything #783

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for configuring authenticated origin pulls #749

Add support for configuring authenticated origin pulls #749

dhaynespls commented Jul 28, 2020

dhaynespls commented Jul 28, 2020

jacobbednarz left a comment

dhaynespls commented Jul 30, 2020

dhaynespls commented Aug 12, 2020

dhaynespls commented Aug 12, 2020

jacobbednarz commented Aug 14, 2020

jacobbednarz commented Aug 14, 2020

jacobbednarz left a comment

cdloh commented Aug 17, 2020

dhaynespls commented Aug 17, 2020

Add support for configuring authenticated origin pulls #749

Add support for configuring authenticated origin pulls #749

Conversation

dhaynespls commented Jul 28, 2020

dhaynespls commented Jul 28, 2020

jacobbednarz left a comment

Choose a reason for hiding this comment

dhaynespls commented Jul 30, 2020

dhaynespls commented Aug 12, 2020

dhaynespls commented Aug 12, 2020

jacobbednarz commented Aug 14, 2020

jacobbednarz commented Aug 14, 2020

jacobbednarz left a comment

Choose a reason for hiding this comment

cdloh commented Aug 17, 2020

dhaynespls commented Aug 17, 2020