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.

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

Add non_identity_browser_isolation_enabled field in Browser Isolation… #2878

Merged
merged 5 commits into from
Oct 26, 2023

Conversation

pierreca
Copy link

… settings

  • Update to cloudflare/cloudflare-go v0.80.0
  • Update Browser Isolation settings to reflect the breaking change and the new field

@github-actions
Copy link

This project handles dependency version bumps (including upstream changes from cloudflare-go) independently of the standard PR process using automation. This allows the dependency upgrades to land without causing merge conflicts in multiple branches and handled in a consistent way. The exception to this is security related dependency upgrades but they should be co-ordinated with the maintainer team privately.

Please remove the changes to the go.mod or go.sum files from this PR in order to proceed with review and merging.

@pierreca
Copy link
Author

@jacobbednarz i'm not used to modifying the terraform provider, I have no idea if this constitutes a complete change or if something else is needed.

@github-actions
Copy link

github-actions bot commented Oct 25, 2023

changelog detected ✅

@jacobbednarz
Copy link
Member

yep, we want a changelog here. however, as the automation mentions, we want to remove the version bump commit. we have automation that handles that outside of PRs to prevent merge conflict hell.

@pierreca pierreca force-pushed the biso/non-identity-onramp branch from 6cc70e7 to 9c62692 Compare October 25, 2023 00:37
… settings

- handle SDK breaking change: url_browser_isolation_enabled bool -> *bool
- add non_identity_browser_isolation_enabled
@pierreca pierreca force-pushed the biso/non-identity-onramp branch from 9c62692 to fee208b Compare October 25, 2023 00:38
@pierreca
Copy link
Author

I've removed the version bump, I'm assuming the unit test will succeed when rebased on a commit that includes the version bump.
this being said, i'm not sure if those two modifications are the only things needed to enable these features or if I miss a piece of code somewhere else?

@jacobbednarz
Copy link
Member

jacobbednarz commented Oct 25, 2023

if you want to test out your changes you can use the local development guides to have the two non-released versions (sdk and provider) running together.

once you have your tests setup, you can run the acceptance test suite (careful, this creates and manages real resources) using the docs.

@jacobbednarz
Copy link
Member

acceptance tests all looking good

TF_ACC=1 go test ./internal/sdkv2provider -v -run "^(TestAccCloudflareAccessPolicy_|TestAccCloudflareTeamsAccounts_)" -count 1 -timeout 120m -parallel 1
=== RUN   TestAccCloudflareAccessPolicy_ServiceToken
--- PASS: TestAccCloudflareAccessPolicy_ServiceToken (13.36s)
=== RUN   TestAccCloudflareAccessPolicy_AnyServiceToken
--- PASS: TestAccCloudflareAccessPolicy_AnyServiceToken (12.65s)
=== RUN   TestAccCloudflareAccessPolicy_WithZoneID
--- PASS: TestAccCloudflareAccessPolicy_WithZoneID (20.41s)
=== RUN   TestAccCloudflareAccessPolicy_Group
--- PASS: TestAccCloudflareAccessPolicy_Group (16.19s)
=== RUN   TestAccCloudflareAccessPolicy_MTLS
--- PASS: TestAccCloudflareAccessPolicy_MTLS (12.08s)
=== RUN   TestAccCloudflareAccessPolicy_CommonName
--- PASS: TestAccCloudflareAccessPolicy_CommonName (12.39s)
=== RUN   TestAccCloudflareAccessPolicy_EmailDomain
--- PASS: TestAccCloudflareAccessPolicy_EmailDomain (12.30s)
=== RUN   TestAccCloudflareAccessPolicy_Emails
--- PASS: TestAccCloudflareAccessPolicy_Emails (11.96s)
=== RUN   TestAccCloudflareAccessPolicy_Everyone
--- PASS: TestAccCloudflareAccessPolicy_Everyone (11.82s)
=== RUN   TestAccCloudflareAccessPolicy_IPs
--- PASS: TestAccCloudflareAccessPolicy_IPs (12.15s)
=== RUN   TestAccCloudflareAccessPolicy_AuthMethod
--- PASS: TestAccCloudflareAccessPolicy_AuthMethod (12.48s)
=== RUN   TestAccCloudflareAccessPolicy_Geo
--- PASS: TestAccCloudflareAccessPolicy_Geo (11.94s)
=== RUN   TestAccCloudflareAccessPolicy_Okta
--- PASS: TestAccCloudflareAccessPolicy_Okta (11.81s)
=== RUN   TestAccCloudflareAccessPolicy_PurposeJustification
--- PASS: TestAccCloudflareAccessPolicy_PurposeJustification (15.08s)
=== RUN   TestAccCloudflareAccessPolicy_ApprovalGroup
--- PASS: TestAccCloudflareAccessPolicy_ApprovalGroup (13.50s)
=== RUN   TestAccCloudflareAccessPolicy_ExternalEvaluation
--- PASS: TestAccCloudflareAccessPolicy_ExternalEvaluation (12.21s)
=== RUN   TestAccCloudflareAccessPolicy_IsolationRequired
--- PASS: TestAccCloudflareAccessPolicy_IsolationRequired (17.54s)
=== RUN   TestAccCloudflareTeamsAccounts_ConfigurationBasic
--- PASS: TestAccCloudflareTeamsAccounts_ConfigurationBasic (12.29s)
PASS
ok  	github.com/cloudflare/terraform-provider-cloudflare/internal/sdkv2provider	242.709s

@jacobbednarz jacobbednarz merged commit 46fbc26 into cloudflare:master Oct 26, 2023
@github-actions github-actions bot added this to the v4.18.0 milestone Oct 26, 2023
github-actions bot pushed a commit that referenced this pull request Oct 26, 2023
Copy link

This functionality has been released in v4.18.0 of the Terraform Cloudflare Provider.

Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants