Merge pull request #4969 from cloudflare/release-please--branches--main--changes--next

Author: jacobbednarz

.github/workflows/ci.yml

@@ -10,10 +10,7 @@ on:
 
 jobs:
   lint:
-    name: lint
     runs-on: ubuntu-latest
-    
-
     steps:
       - uses: actions/checkout@v4
 
@@ -27,10 +24,9 @@ jobs:
 
       - name: Run lints
         run: ./scripts/lint
+
   test:
-    name: test
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
 
@@ -43,4 +39,4 @@ jobs:
         run: ./scripts/bootstrap
 
       - name: Run tests
-        run: ./scripts/test
+        run: ./scripts/test

.github/workflows/release.yml renamed to .github/workflows/publish-release.yml

@@ -1,4 +1,12 @@
-name: Release
+---
+name: Publish Release
+
+permissions:
+  contents: write
+
+concurrency:
+  group: publish
+
 on:
   push:
     tags:
@@ -10,8 +18,8 @@ jobs:
       - name: Cleanup unused directories and tools
         run: |
           df -h /
-          sudo apt-get remove -y '^aspnetcore-.*' '^dotnet-.*' '^llvm-.*' 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-chrome-stable firefox powershell mono-devel google-cloud-sdk google-cloud-cli microsoft-edge-stable snapd --fix-missing 
-          sudo apt-get autoremove -y 
+          sudo apt-get remove -y '^aspnetcore-.*' '^dotnet-.*' '^llvm-.*' 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-chrome-stable firefox powershell mono-devel google-cloud-sdk google-cloud-cli microsoft-edge-stable snapd --fix-missing
+          sudo apt-get autoremove -y
           sudo apt-get clean
           sudo docker image prune --all --force
           sudo rm -rf \
@@ -27,7 +35,7 @@ jobs:
             /usr/local/share/chromium \
             /usr/local/share/powershell \
             /usr/share/dotnet \
-            /usr/share/swift 
+            /usr/share/swift
           ghcup nuke
           df -h /
       - name: Checkout

.github/workflows/release-doctor.yml

@@ -0,0 +1,22 @@
+name: Release Doctor
+on:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  release_doctor:
+    name: release doctor
+    runs-on: ubuntu-latest
+    if: github.repository == 'cloudflare/terraform-provider-cloudflare' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || startsWith(github.head_ref, 'release-please') || github.head_ref == 'next')
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check release environment
+        run: |
+          bash ./scripts/check-release-environment
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

.goreleaser.yml

@@ -12,18 +12,24 @@ builds:
     ldflags:
       - "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}"
     goos:
+      - darwin
       - freebsd
-      - windows
       - linux
-      - darwin
+      - windows
     goarch:
-      - amd64
       - "386"
+      - amd64
       - arm
       - arm64
     ignore:
-      - goos: darwin
-        goarch: "386"
+      - goarch: "386"
+        goos: darwin
+      - goarch: arm
+        goos: windows
+      - goarch: arm64
+        goos: freebsd
+      - goarch: arm64
+        goos: windows
     binary: "{{ .ProjectName }}_v{{ .Version }}"
 archives:
   - formats: [ 'zip' ]

.grit/patterns/cloudflare_terraform_v5_attribute_renames_configuration.grit

@@ -127,6 +127,9 @@ pattern cloudflare_terraform_v5_attribute_renames_configuration() {
     // cloudflare_tiered_cache
     `cache_type = $v` as $attribute => `value = $v` where { $attribute <: within `resource "cloudflare_tiered_cache" $_ { $_ }` },
 
+    // cloudflare_dns_record
+    `hostname = $v` as $hostname => . where { $attribute <: within `resource "cloudflare_dns_record" $_ { $_ }` },
+
     // cloudflare_web_analytics_site
     `ruleset_id = $v` as $attribute => `ruleset = {
       id = $v

.grit/patterns/cloudflare_terraform_v5_attribute_renames_state.grit

@@ -224,7 +224,7 @@ pattern cloudflare_terraform_v5_attribute_renames_state() {
             $instances <: contains `"jump_start": $v` => .
         }
     },
-
+    
     // cloudflare_record
    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
         and {

.grit/patterns/cloudflare_terraform_v5_resource_renames_configuration.grit

@@ -27,7 +27,6 @@ pattern cloudflare_terraform_v5_resource_renames_configuration() {
     `"cloudflare_dlp_custom_profile"` => `"cloudflare_zero_trust_dlp_custom_profile"`,
     `"cloudflare_dlp_predefined_profile"` => `"cloudflare_zero_trust_dlp_predefined_profile"`,
     `"cloudflare_dlp_profile"` => `"cloudflare_zero_trust_dlp_profile"`,
-    `"cloudflare_fallback_domain"` => `"cloudflare_zero_trust_local_domain_fallback"`,
     `"cloudflare_gateway_app_types"` => `"cloudflare_zero_trust_gateway_app_types"`,
     `"cloudflare_gre_tunnel"` => `"cloudflare_magic_wan_gre_tunnel"`,
     `"cloudflare_ipsec_tunnel"` => `"cloudflare_magic_wan_ipsec_tunnel"`,
@@ -42,14 +41,13 @@ pattern cloudflare_terraform_v5_resource_renames_configuration() {
     `"cloudflare_teams_rule"` => `"cloudflare_zero_trust_gateway_policy"`,
     `"cloudflare_tunnel"` => `"cloudflare_zero_trust_tunnel_cloudflared"`,
     `"cloudflare_tunnel_config"` => `"cloudflare_zero_trust_tunnel_cloudflared_config"`,
-    `"cloudflare_tunnel_route"` => `"cloudflare_zero_trust_tunnel_route"`,
-    `"cloudflare_tunnel_virtual_network"` => `"cloudflare_zero_trust_tunnel_virtual_network"`,
+    `"cloudflare_tunnel_route"` => `"cloudflare_zero_trust_tunnel_cloudflared_route"`,
+    `"cloudflare_tunnel_virtual_network"` => `"cloudflare_zero_trust_tunnel_cloudflared_virtual_network"`,
     `"cloudflare_worker_cron_trigger"` => `"cloudflare_workers_cron_trigger"`,
     `"cloudflare_worker_domain"` => `"cloudflare_workers_custom_domain"`,
     `"cloudflare_worker_script"` => `"cloudflare_workers_script"`,
     `"cloudflare_worker_secret"` => `"cloudflare_workers_secret"`,
     `"cloudflare_workers_for_platforms_namespace"` => `"cloudflare_workers_for_platforms_dispatch_namespace"`,
-    `"cloudflare_zone_dnssec"` => `"cloudflare_dns_zone_dnssec"`,
     `"cloudflare_managed_headers"` => `"cloudflare_managed_transforms"`,
   } as $old_name where {
     $old_name <: within `resource $_ { $_ }`

.grit/patterns/cloudflare_terraform_v5_resource_renames_state.grit

@@ -29,7 +29,6 @@ pattern cloudflare_terraform_v5_resource_renames_state() {
     `"cloudflare_dlp_profile"` => `"cloudflare_zero_trust_dlp_profile"`,
     `"cloudflare_dlp_custom_profile"` => `"cloudflare_zero_trust_dlp_custom_profile"`,
     `"cloudflare_dlp_predefined_profile"` => `"cloudflare_zero_trust_dlp_predefined_profile"`,
-    `"cloudflare_fallback_domain"` => `"cloudflare_zero_trust_local_domain_fallback"`,
     `"cloudflare_risk_behavior"` => `"cloudflare_zero_trust_risk_behavior"`,
     `"cloudflare_split_tunnel"` => `"cloudflare_zero_trust_split_tunnels"`,
     `"cloudflare_teams_account"` => `"cloudflare_zero_trust_gateway_settings"`,
@@ -39,8 +38,8 @@ pattern cloudflare_terraform_v5_resource_renames_state() {
     `"cloudflare_teams_rule"` => `"cloudflare_zero_trust_gateway_policy"`,
     `"cloudflare_tunnel"` => `"cloudflare_zero_trust_tunnel_cloudflared"`,
     `"cloudflare_tunnel_config"` => `"cloudflare_zero_trust_tunnel_cloudflared_config"`,
-    `"cloudflare_tunnel_route"` => `"cloudflare_zero_trust_tunnel_route"`,
-    `"cloudflare_tunnel_virtual_network"` => `"cloudflare_zero_trust_tunnel_virtual_network"`,
+    `"cloudflare_tunnel_route"` => `"cloudflare_zero_trust_tunnel_cloudflared_route"`,
+    `"cloudflare_tunnel_virtual_network"` => `"cloudflare_zero_trust_tunnel_cloudflared_virtual_network"`,
 
     // handle dependencies
     `"cloudflare_access_application.$dep"` => `"cloudflare_zero_trust_access_application.$dep"`,
@@ -60,17 +59,14 @@ pattern cloudflare_terraform_v5_resource_renames_state() {
     `"cloudflare_device_policy_certificates.$dep"` => `"cloudflare_zero_trust_device_certificates.$dep"`,
     `"cloudflare_device_posture_integration.$dep"` => `"cloudflare_zero_trust_device_posture_integration.$dep"`,
     `"cloudflare_device_posture_rule.$dep"` => `"cloudflare_zero_trust_device_posture_rule.$dep"`,
-    `"cloudflare_device_settings_policy.$dep"` => `"cloudflare_zero_trust_device_profiles.$dep"`,
     `"cloudflare_dlp_custom_profile.$dep"` => `"cloudflare_zero_trust_dlp_custom_profile.$dep"`,
     `"cloudflare_dlp_predefined_profile.$dep"` => `"cloudflare_zero_trust_dlp_predefined_profile.$dep"`,
     `"cloudflare_dlp_profile.$dep"` => `"cloudflare_zero_trust_dlp_profile.$dep"`,
-    `"cloudflare_fallback_domain.$dep"` => `"cloudflare_zero_trust_local_domain_fallback.$dep"`,
     `"cloudflare_gateway_app_types.$dep"` => `"cloudflare_zero_trust_gateway_app_types.$dep"`,
     `"cloudflare_gre_tunnel.$dep"` => `"cloudflare_magic_wan_gre_tunnel.$dep"`,
     `"cloudflare_ipsec_tunnel.$dep"` => `"cloudflare_magic_wan_ipsec_tunnel.$dep"`,
     `"cloudflare_record.$dep"` => `"cloudflare_dns_record.$dep"`,
     `"cloudflare_risk_behavior.$dep"` => `"cloudflare_zero_trust_risk_behavior.$dep"`,
-    `"cloudflare_split_tunnel.$dep"` => `"cloudflare_zero_trust_split_tunnels.$dep"`,
     `"cloudflare_static_route.$dep"` => `"cloudflare_magic_wan_static_route.$dep"`,
     `"cloudflare_teams_account.$dep"` => `"cloudflare_zero_trust_gateway_settings.$dep"`,
     `"cloudflare_teams_list.$dep"` => `"cloudflare_zero_trust_list.$dep"`,
@@ -79,14 +75,13 @@ pattern cloudflare_terraform_v5_resource_renames_state() {
     `"cloudflare_teams_rule.$dep"` => `"cloudflare_zero_trust_gateway_policy.$dep"`,
     `"cloudflare_tunnel.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared.$dep"`,
     `"cloudflare_tunnel_config.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared_config.$dep"`,
-    `"cloudflare_tunnel_route.$dep"` => `"cloudflare_zero_trust_tunnel_route.$dep"`,
-    `"cloudflare_tunnel_virtual_network.$dep"` => `"cloudflare_zero_trust_tunnel_virtual_network.$dep"`,
+    `"cloudflare_tunnel_route.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared_route.$dep"`,
+    `"cloudflare_tunnel_virtual_network.$dep"` => `"cloudflare_zero_trust_tunnel_cloudflared_virtual_network.$dep"`,
     `"cloudflare_worker_cron_trigger.$dep"` => `"cloudflare_workers_cron_trigger.$dep"`,
     `"cloudflare_worker_domain.$dep"` => `"cloudflare_workers_custom_domain.$dep"`,
     `"cloudflare_worker_script.$dep"` => `"cloudflare_workers_script.$dep"`,
     `"cloudflare_worker_secret.$dep"` => `"cloudflare_workers_secret.$dep"`,
     `"cloudflare_workers_for_platforms_namespace.$dep"` => `"cloudflare_workers_for_platforms_dispatch_namespace.$dep"`,
-    `"cloudflare_zone_dnssec.$dep"` => `"cloudflare_dns_zone_dnssec.$dep"`,
     `"cloudflare_managed_headers.$dep"` => `"cloudflare_managed_transforms.$dep"`,
   }
 }

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "5.1.0"
+}

.stats.yml

@@ -1,2 +1,2 @@
-configured_endpoints: 1508
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-bc8740036f5c85815dd08ce4d1787a79b09e8133dc24fcdf8c594aad2c5cc69d.yml
+configured_endpoints: 1525
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-fc562128cab85cd116a8c4e1fe17a0f09a5019da2d1bbe162c476aa999932c4e.yml