Skip to content

Commit

Permalink
Merge branch 'master' into tarnfeld/add-optional-routing-field
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobbednarz authored Nov 22, 2024
2 parents a219789 + f61924a commit 0047bda
Show file tree
Hide file tree
Showing 45 changed files with 871 additions and 144 deletions.
3 changes: 3 additions & 0 deletions .changelog/4419.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/cloudflare_access_application: support SCIM schema strictness setting for outbound provisioning
```
3 changes: 3 additions & 0 deletions .changelog/4477.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_zero_trust_list: Consider `items_with_description` when updating a ZT list
```
3 changes: 3 additions & 0 deletions .changelog/4511.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_list: Don't read list items if there are none configured
```
3 changes: 3 additions & 0 deletions .changelog/4531.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:dependency
provider: bump goreleaser/goreleaser-action from 6.0.0 to 6.1.0
```
3 changes: 3 additions & 0 deletions .changelog/4541.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:dependency
provider: bump golang.org/x/net from 0.30.0 to 0.31.0
```
3 changes: 3 additions & 0 deletions .changelog/4544.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_certificate_pack: Fix importing existing resources issue due to 3 ignored required fields in importer
```
3 changes: 3 additions & 0 deletions .changelog/4588.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/cloudflare_notification_policy: add support for `image_resizing_notification` alert type
```
3 changes: 3 additions & 0 deletions .changelog/4597.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_zero_trust_access_policy: make gsuite parameters required
```
3 changes: 3 additions & 0 deletions .changelog/4598.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_logpush_job: add dlp_forensic_copies to allowed dataset values
```
3 changes: 3 additions & 0 deletions .changelog/4602.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/cloudflare_access_identity_provider: Adds identity update behavior field in SCIM configuration
```
3 changes: 3 additions & 0 deletions .changelog/4613.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:dependency
provider: bump github.com/hashicorp/terraform-plugin-testing from 1.10.0 to 1.11.0
```
3 changes: 3 additions & 0 deletions .changelog/4632.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:dependency
provider: bump github.com/cloudflare/cloudflare-go from 0.109.0 to 0.110.0
```
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6.0.0
uses: goreleaser/goreleaser-action@v6.1.0
with:
version: latest
args: release --clean
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
engine marzano(0.1)
language hcl

pattern cloudflare_terraform_v4_40_0_zero_trust_namespace_renames_configuration() {
any {
`"cloudflare_access_application"` => `"clouflare_zero_trust_access_application"`,
`"cloudflare_access_ca_certificate"` => `"clouflare_zero_trust_access_short_lived_certificate"`,
`"cloudflare_access_custom_page"` => `"clouflare_zero_trust_access_custom_page"`,
`"cloudflare_access_group"` => `"clouflare_zero_trust_access_group"`,
`"cloudflare_access_identity_provider"` => `"clouflare_zero_trust_access_identity_provider"`,
`"cloudflare_access_keys_configuration"` => `"clouflare_zero_trust_access_key_configuration"`,
`"cloudflare_access_mutual_tls_certificate"` => `"clouflare_zero_trust_access_mtls_certificate"`,
`"cloudflare_access_mutual_tls_hostname_settings"` => `"clouflare_zero_trust_access_mtls_hostname_settings"`,
`"cloudflare_access_organization"` => `"clouflare_zero_trust_organization"`,
`"cloudflare_access_policy"` => `"clouflare_zero_trust_access_policy"`,
`"cloudflare_access_service_token"` => `"clouflare_zero_trust_access_service_token"`,
`"cloudflare_access_tag"` => `"clouflare_zero_trust_access_tag"`,
`"cloudflare_device_dex_test"` => `"clouflare_zero_trust_dex_test"`,
`"cloudflare_device_managed_networks"` => `"clouflare_zero_trust_device_managed_networks"`,
`"cloudflare_device_policy_certificates"` => `"clouflare_zero_trust_device_certificates"`,
`"cloudflare_device_posture_integration"` => `"clouflare_zero_trust_device_posture_integration"`,
`"cloudflare_device_posture_rule"` => `"clouflare_zero_trust_device_posture_rule"`,
`"cloudflare_device_settings_policy"` => `"clouflare_zero_trust_device_profiles"`,
`"cloudflare_dlp_profile"` => `"clouflare_zero_trust_dlp_profile"`,
`"cloudflare_dlp_custom_profile"` => `"clouflare_zero_trust_dlp_custom_profile"`,
`"cloudflare_dlp_predefined_profile"` => `"clouflare_zero_trust_dlp_predefined_profile"`,
`"cloudflare_fallback_domain"` => `"clouflare_zero_trust_local_domain_fallback"`,
`"cloudflare_risk_behavior"` => `"clouflare_zero_trust_risk_behavior"`,
`"cloudflare_split_tunnel"` => `"clouflare_zero_trust_split_tunnels"`,
`"cloudflare_teams_account"` => `"clouflare_zero_trust_gateway_settings"`,
`"cloudflare_teams_list"` => `"clouflare_zero_trust_list"`,
`"cloudflare_teams_location"` => `"clouflare_zero_trust_dns_location"`,
`"cloudflare_teams_proxy_endpoint"` => `"clouflare_zero_trust_gateway_proxy_endpoint"`,
`"cloudflare_teams_rule"` => `"clouflare_zero_trust_gateway_policy"`,
`"cloudflare_tunnel"` => `"clouflare_zero_trust_tunnel_cloudflared"`,
`"cloudflare_tunnel_config"` => `"clouflare_zero_trust_tunnel_cloudflared_config"`,
`"cloudflare_tunnel_route"` => `"clouflare_zero_trust_tunnel_route"`,
`"cloudflare_tunnel_virtual_network"` => `"clouflare_zero_trust_tunnel_virtual_network"`,

// handle references
`cloudflare_access_application` => `clouflare_zero_trust_access_application`,
`cloudflare_access_ca_certificate` => `clouflare_zero_trust_access_short_lived_certificate`,
`cloudflare_access_custom_page` => `clouflare_zero_trust_access_custom_page`,
`cloudflare_access_group` => `clouflare_zero_trust_access_group`,
`cloudflare_access_identity_provider` => `clouflare_zero_trust_access_identity_provider`,
`cloudflare_access_keys_configuration` => `clouflare_zero_trust_access_key_configuration`,
`cloudflare_access_mutual_tls_certificate` => `clouflare_zero_trust_access_mtls_certificate`,
`cloudflare_access_mutual_tls_hostname_settings` => `clouflare_zero_trust_access_mtls_hostname_settings`,
`cloudflare_access_organization` => `clouflare_zero_trust_organization`,
`cloudflare_access_policy` => `clouflare_zero_trust_access_policy`,
`cloudflare_access_service_token` => `clouflare_zero_trust_access_service_token`,
`cloudflare_access_tag` => `clouflare_zero_trust_access_tag`,
`cloudflare_device_dex_test` => `clouflare_zero_trust_dex_test`,
`cloudflare_device_managed_networks` => `clouflare_zero_trust_device_managed_networks`,
`cloudflare_device_policy_certificates` => `clouflare_zero_trust_device_certificates`,
`cloudflare_device_posture_integration` => `clouflare_zero_trust_device_posture_integration`,
`cloudflare_device_posture_rule` => `clouflare_zero_trust_device_posture_rule`,
`cloudflare_device_settings_policy` => `clouflare_zero_trust_device_profiles`,
`cloudflare_dlp_profile` => `clouflare_zero_trust_dlp_profile`,
`cloudflare_dlp_custom_profile` => `clouflare_zero_trust_dlp_custom_profile`,
`cloudflare_dlp_predefined_profile` => `clouflare_zero_trust_dlp_predefined_profile`,
`cloudflare_fallback_domain` => `clouflare_zero_trust_local_domain_fallback`,
`cloudflare_risk_behavior` => `clouflare_zero_trust_risk_behavior`,
`cloudflare_split_tunnel` => `clouflare_zero_trust_split_tunnels`,
`cloudflare_teams_account` => `clouflare_zero_trust_gateway_settings`,
`cloudflare_teams_list` => `clouflare_zero_trust_list`,
`cloudflare_teams_location` => `clouflare_zero_trust_dns_location`,
`cloudflare_teams_proxy_endpoint` => `clouflare_zero_trust_gateway_proxy_endpoint`,
`cloudflare_teams_rule` => `clouflare_zero_trust_gateway_policy`,
`cloudflare_tunnel` => `clouflare_zero_trust_tunnel_cloudflared`,
`cloudflare_tunnel_config` => `clouflare_zero_trust_tunnel_cloudflared_config`,
`cloudflare_tunnel_route` => `clouflare_zero_trust_tunnel_route`,
`cloudflare_tunnel_virtual_network` => `clouflare_zero_trust_tunnel_virtual_network`,
}
}

cloudflare_terraform_v4_40_0_zero_trust_namespace_renames_configuration()
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
engine marzano(0.1)
language json

pattern cloudflare_terraform_v4_40_0_zero_trust_namespace_renames_state() {
any {
`"cloudflare_access_application"` => `"clouflare_zero_trust_access_application"`,
`"cloudflare_access_ca_certificate"` => `"clouflare_zero_trust_access_short_lived_certificate"`,
`"cloudflare_access_custom_page"` => `"clouflare_zero_trust_access_custom_page"`,
`"cloudflare_access_group"` => `"clouflare_zero_trust_access_group"`,
`"cloudflare_access_identity_provider"` => `"clouflare_zero_trust_access_identity_provider"`,
`"cloudflare_access_keys_configuration"` => `"clouflare_zero_trust_access_key_configuration"`,
`"cloudflare_access_mutual_tls_certificate"` => `"clouflare_zero_trust_access_mtls_certificate"`,
`"cloudflare_access_mutual_tls_hostname_settings"` => `"clouflare_zero_trust_access_mtls_hostname_settings"`,
`"cloudflare_access_organization"` => `"clouflare_zero_trust_organization"`,
`"cloudflare_access_policy"` => `"clouflare_zero_trust_access_policy"`,
`"cloudflare_access_service_token"` => `"clouflare_zero_trust_access_service_token"`,
`"cloudflare_access_tag"` => `"clouflare_zero_trust_access_tag"`,
`"cloudflare_device_dex_test"` => `"clouflare_zero_trust_dex_test"`,
`"cloudflare_device_managed_networks"` => `"clouflare_zero_trust_device_managed_networks"`,
`"cloudflare_device_policy_certificates"` => `"clouflare_zero_trust_device_certificates"`,
`"cloudflare_device_posture_integration"` => `"clouflare_zero_trust_device_posture_integration"`,
`"cloudflare_device_posture_rule"` => `"clouflare_zero_trust_device_posture_rule"`,
`"cloudflare_device_settings_policy"` => `"clouflare_zero_trust_device_profiles"`,
`"cloudflare_dlp_profile"` => `"clouflare_zero_trust_dlp_profile"`,
`"cloudflare_dlp_custom_profile"` => `"clouflare_zero_trust_dlp_custom_profile"`,
`"cloudflare_dlp_predefined_profile"` => `"clouflare_zero_trust_dlp_predefined_profile"`,
`"cloudflare_fallback_domain"` => `"clouflare_zero_trust_local_domain_fallback"`,
`"cloudflare_risk_behavior"` => `"clouflare_zero_trust_risk_behavior"`,
`"cloudflare_split_tunnel"` => `"clouflare_zero_trust_split_tunnels"`,
`"cloudflare_teams_account"` => `"clouflare_zero_trust_gateway_settings"`,
`"cloudflare_teams_list"` => `"clouflare_zero_trust_list"`,
`"cloudflare_teams_location"` => `"clouflare_zero_trust_dns_location"`,
`"cloudflare_teams_proxy_endpoint"` => `"clouflare_zero_trust_gateway_proxy_endpoint"`,
`"cloudflare_teams_rule"` => `"clouflare_zero_trust_gateway_policy"`,
`"cloudflare_tunnel"` => `"clouflare_zero_trust_tunnel_cloudflared"`,
`"cloudflare_tunnel_config"` => `"clouflare_zero_trust_tunnel_cloudflared_config"`,
`"cloudflare_tunnel_route"` => `"clouflare_zero_trust_tunnel_route"`,
`"cloudflare_tunnel_virtual_network"` => `"clouflare_zero_trust_tunnel_virtual_network"`,

// handle dependencies
`"cloudflare_access_application.$dep"` => `"clouflare_zero_trust_access_application.$dep"`,
`"cloudflare_access_ca_certificate.$dep"` => `"clouflare_zero_trust_access_short_lived_certificate.$dep"`,
`"cloudflare_access_custom_page.$dep"` => `"clouflare_zero_trust_access_custom_page.$dep"`,
`"cloudflare_access_group.$dep"` => `"clouflare_zero_trust_access_group.$dep"`,
`"cloudflare_access_identity_provider.$dep"` => `"clouflare_zero_trust_access_identity_provider.$dep"`,
`"cloudflare_access_keys_configuration.$dep"` => `"clouflare_zero_trust_access_key_configuration.$dep"`,
`"cloudflare_access_mutual_tls_certificate.$dep"` => `"clouflare_zero_trust_access_mtls_certificate.$dep"`,
`"cloudflare_access_mutual_tls_hostname_settings.$dep"` => `"clouflare_zero_trust_access_mtls_hostname_settings.$dep"`,
`"cloudflare_access_organization.$dep"` => `"clouflare_zero_trust_organization.$dep"`,
`"cloudflare_access_policy.$dep"` => `"clouflare_zero_trust_access_policy.$dep"`,
`"cloudflare_access_service_token.$dep"` => `"clouflare_zero_trust_access_service_token.$dep"`,
`"cloudflare_access_tag.$dep"` => `"clouflare_zero_trust_access_tag.$dep"`,
`"cloudflare_device_dex_test.$dep"` => `"clouflare_zero_trust_dex_test.$dep"`,
`"cloudflare_device_managed_networks.$dep"` => `"clouflare_zero_trust_device_managed_networks.$dep"`,
`"cloudflare_device_policy_certificates.$dep"` => `"clouflare_zero_trust_device_certificates.$dep"`,
`"cloudflare_device_posture_integration.$dep"` => `"clouflare_zero_trust_device_posture_integration.$dep"`,
`"cloudflare_device_posture_rule.$dep"` => `"clouflare_zero_trust_device_posture_rule.$dep"`,
`"cloudflare_device_settings_policy.$dep"` => `"clouflare_zero_trust_device_profiles.$dep"`,
`"cloudflare_dlp_profile.$dep"` => `"clouflare_zero_trust_dlp_profile.$dep"`,
`"cloudflare_dlp_custom_profile.$dep"` => `"clouflare_zero_trust_dlp_custom_profile.$dep"`,
`"cloudflare_dlp_predefined_profile.$dep"` => `"clouflare_zero_trust_dlp_predefined_profile.$dep"`,
`"cloudflare_fallback_domain.$dep"` => `"clouflare_zero_trust_local_domain_fallback.$dep"`,
`"cloudflare_risk_behavior.$dep"` => `"clouflare_zero_trust_risk_behavior.$dep"`,
`"cloudflare_split_tunnel.$dep"` => `"clouflare_zero_trust_split_tunnels.$dep"`,
`"cloudflare_teams_account.$dep"` => `"clouflare_zero_trust_gateway_settings.$dep"`,
`"cloudflare_teams_list.$dep"` => `"clouflare_zero_trust_list.$dep"`,
`"cloudflare_teams_location.$dep"` => `"clouflare_zero_trust_dns_location.$dep"`,
`"cloudflare_teams_proxy_endpoint.$dep"` => `"clouflare_zero_trust_gateway_proxy_endpoint.$dep"`,
`"cloudflare_teams_rule.$dep"` => `"clouflare_zero_trust_gateway_policy.$dep"`,
`"cloudflare_tunnel.$dep"` => `"clouflare_zero_trust_tunnel_cloudflared.$dep"`,
`"cloudflare_tunnel_config.$dep"` => `"clouflare_zero_trust_tunnel_cloudflared_config.$dep"`,
`"cloudflare_tunnel_route.$dep"` => `"clouflare_zero_trust_tunnel_route.$dep"`,
`"cloudflare_tunnel_virtual_network.$dep"` => `"clouflare_zero_trust_tunnel_virtual_network.$dep"`,
}
}

cloudflare_terraform_v4_40_0_zero_trust_namespace_renames_state()
25 changes: 24 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
## 4.46.0 (Unreleased)
## 4.47.0 (Unreleased)

## 4.46.0 (November 13th, 2024)

ENHANCEMENTS:

* resource/cloudflare_waiting_room: add "bg-BG", "hr-HR", "cs-CZ", "da-DK", "fi-FI", "lt-LT", "ms-MY", "nb-NO", "ro-RO", "el-GR", "he-IL" "hi-IN", "hu-HU", "sr-BA", "sk-SK", "sl-SI", "sv-SE", "tl-PH", "th-TH", "uk-UA", and "vi-VN" to default_template_language field ([#4509](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4509))

BUG FIXES:

* resource/cloudflare_certificate_pack: Fix importing existing resources issue due to 3 ignored required fields in importer ([#4544](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4544))
* resource/cloudflare_list: Don't read list items if there are none configured ([#4511](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4511))
* resource/cloudflare_zero_trust_list: Consider `items_with_description` when updating a ZT list ([#4477](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4477))
* resource/turnstile: Force recreate on region update ([#4496](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4496))

DEPENDENCIES:

* provider: bump github.com/cloudflare/cloudflare-go from 0.108.0 to 0.109.0 ([#4523](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4523))
* provider: bump github.com/hashicorp/terraform-plugin-framework-validators from 0.14.0 to 0.15.0 ([#4492](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4492))
* provider: bump github.com/hashicorp/terraform-plugin-go from 0.24.0 to 0.25.0 ([#4483](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4483))
* provider: bump github.com/hashicorp/terraform-plugin-mux from 0.16.0 to 0.17.0 ([#4484](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4484))
* provider: bump github.com/hashicorp/terraform-plugin-sdk/v2 from 2.34.0 to 2.35.0 ([#4491](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4491))
* provider: bump golang.org/x/net from 0.30.0 to 0.31.0 ([#4541](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4541))
* provider: bump goreleaser/goreleaser-action from 6.0.0 to 6.1.0 ([#4531](https://github.com/cloudflare/terraform-provider-cloudflare/issues/4531))

## 4.45.0 (October 30th, 2024)

Expand Down
Loading

0 comments on commit 0047bda

Please sign in to comment.