.github/workflows/stale.yml

@@ -0,0 +1,22 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '38 16 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: "This issue hasn't been updated in a while. If it's still reproducing, please comment to let us know. Thank you!"
+        stale-pr-message: "This pull request hasn't been updated in a while, and is being marked as stale. Thanks!"
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

.grit/patterns/cloudflare_terraform_v5_attribute_renames_configuration.grit

@@ -5,6 +5,9 @@ pattern cloudflare_terraform_v5_attribute_renames_configuration() {
     // provider
     `version = $version` => `version = "~> 5"` where { $match <: within `provider "cloudflare" { $_ }` },
 
+    // cloudflare_origin_ca_certificate
+    `min_days_for_renewal = $days` as $attribute => . where { $attribute <: within `resource "cloudflare_origin_ca_certificate" $_ { $_ }` },
+
     // cloudflare_api_token
     `policy = $v` as $attribute => `policies = $v` where { $attribute <: within `resource "cloudflare_api_token" $_ { $_ }` },
 

.grit/patterns/cloudflare_terraform_v5_attribute_renames_state.grit

@@ -3,253 +3,212 @@ language json
 pattern cloudflare_terraform_v5_attribute_renames_state() {
   any {
     // clear out any previously defined schema bumps
-    `"schema_version": $version`=> `"schema_version": 0`,
-
-    // cloudflare_api_token
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_api_token`,
-            $instances <: contains `"policy": $v` => `"policies": $v`
+        $resource_type <: r"^cloudflare_.*",
+        $instances <: any {
+          contains `"schema_version": $version`=> `"schema_version": 0`
         }
     },
 
-    // cloudflare_account_member
+    // cloudflare_api_token
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_account_member`,
-            $instances <: contains `"role_ids": $v` => `"roles": $v`
+        $resource_type <: contains `cloudflare_api_token`,
+        $instances <: any {
+          contains `"policy": $policy` => `"policies": $policy`
         }
     },
+
+    // cloudflare_account_member
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_account_member`,
-            $instances <: contains `"email_address": $v` => `"email": $v`
+        $resource_type <: contains `cloudflare_account_member`,
+        $instances <: any {
+          contains `"role_ids": $roles` => `"roles": $roles`,
+          contains `"email_address": $ea` => `"email": $ea`,
         }
     },
 
     // cloudflare_byo_ip_prefix
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_byo_ip_prefix`,
-            $instances <: contains `"advertisement": $v` => `"advertised": $v`
+        $resource_type <: contains `cloudflare_byo_ip_prefix`,
+        $instances <: any {
+          contains `"advertisement": $ad` => `"advertised": $ad`
         }
     },
 
     // cloudflare_hostname_tls_setting
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_hostname_tls_setting`,
-            $instances <: contains `"setting": $v` => `"setting_id": $v`
+        $resource_type <: contains `cloudflare_hostname_tls_setting`,
+        $instances <: any {
+          contains `"setting": $setting` => `"setting_id": $setting`
         }
     },
 
     // cloudflare_load_balancer
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_load_balancer`,
-            $instances <: contains `"fallback_pool_id": $v` => `"fallback_pool": $v`
-        }
-    },
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_load_balancer`,
-            $instances <: contains `"default_pool_ids": $v` => `"default_pools": $v`
+        $resource_type <: contains `cloudflare_load_balancer`,
+        $instances <: any {
+          contains `"fallback_pool_id": $fp` => `"fallback_pool": $fp`,
+          contains `"default_pool_ids": $dp` => `"default_pools": $dp`,
         }
     },
 
     // cloudflare_queue
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_queue`,
-            $instances <: contains `"name": $v` => `"queue_name": $v`
+        $resource_type <: contains `cloudflare_queue`,
+        $instances <: any {
+          contains `"name": $q` => `"queue_name": $q`
         }
     },
 
     // cloudflare_r2_bucket
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_r2_bucket`,
-            $instances <: contains `"location_hint": $v` => `"location": $v`
+        $resource_type <: contains `cloudflare_r2_bucket`,
+        $instances <: any {
+          contains `"location_hint": $lh` => `"location": $lh`
         }
     },
 
     // cloudflare_worker_kv
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_worker_kv`,
-            $instances <: contains `"key": $v` => `"key_name": $v`
+        $resource_type <: contains `cloudflare_worker_kv`,
+        $instances <: any {
+          contains `"key": $key` => `"key_name": $key`
         }
     },
 
     // cloudflare_logpull_retention
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_logpull_retention`,
-            $instances <: contains `"enabled": $v` => `"flag": $v`
+        $resource_type <: contains `cloudflare_logpull_retention`,
+        $instances <: any {
+          contains `"enabled": $flag` => `"flag": $flag`
         }
     },
 
     // cloudflare_logpush_ownership_challenge
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_logpush_ownership_challenge`,
-            $instances <: contains `"ownership_challenge_filename": $v` => `"filename": $v`
+        $resource_type <: contains `cloudflare_logpush_ownership_challenge`,
+        $instances <: any {
+          contains `"ownership_challenge_filename": $ocf` => `"filename": $ocf`
         }
     },
 
     // cloudflare_zero_trust_tunnel_cloudflared
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zero_trust_tunnel_cloudflared`,
-            $instances <: contains `"secret": $v` => `"tunnel_secret": $v`
+        $resource_type <: contains `cloudflare_zero_trust_tunnel_cloudflared`,
+        $instances <: any {
+          contains `"secret": $ts` => `"tunnel_secret": $ts`
         }
     },
 
     // cloudflare_zero_trust_access_short_lived_certificate
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zero_trust_access_short_lived_certificate`,
-            $instances <: contains `"application_id": $v` => `"app_id": $v`
+        $resource_type <: contains `cloudflare_zero_trust_access_short_lived_certificate`,
+        $instances <: any {
+          contains `"application_id": $app_id` => `"app_id": $app_id`
         }
     },
 
     // cloudflare_workers_secret
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_workers_secret`,
-            $instances <: contains `"secret_text": $v` => `"text": $v`
+        $resource_type <: contains `cloudflare_workers_secret`,
+        $instances <: any {
+          contains `"secret_text": $st` => `"text": $st`
         }
     },
 
     // cloudflare_workers_kv
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_workers_kv`,
-            $instances <: contains `"key": $v` => `"key_name": $v`
+        $resource_type <: contains `cloudflare_workers_kv`,
+        $instances <: any {
+          contains `"key": $kn` => `"key_name": $kn`
         }
     },
 
     // cloudflare_tiered_cache
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_tiered_cache`,
-            $instances <: contains `"cache_type": $v` => `"value": $v`
+        $resource_type <: contains `cloudflare_tiered_cache`,
+        $instances <: any {
+          contains `"cache_type": $ct` => `"value": $ct`
         }
     },
 
     // cloudflare_zone
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zone`,
-            $instances <: contains `"zone": $v` => `"name": $v`
+        $resource_type <: contains `cloudflare_zone`,
+        $instances <: any {
+            contains `"zone": $z` => `"name": $z`,
+            contains `"account_id": $av` => `"account": {
+                "id": $av
+            }`,
+            contains `"jump_start": $_` => .,
+            contains `"plan": $_` => .
         }
     },
 
     // cloudflare_access_policy & cloudflare_zero_trust_access_group
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_access_policy`,
-            $instances <: contains `"application_id": $v` => .
-        }
-    },
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_access_policy`,
-            $instances <: contains `"precedence": $v` => .
-        }
-    },
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zero_trust_access_group`,
-            $instances <: contains `"application_id": $v` => .
+        $resource_type <: contains `cloudflare_access_policy`,
+        $instances <: any {
+          contains `"application_id": $_` => .,
+          contains `"precedence": $_` => .,
         }
     },
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zero_trust_access_group`,
-            $instances <: contains `"precedence": $v` => .
+        $resource_type <: contains `cloudflare_zero_trust_access_group`,
+        $instances <: any {
+          contains `"application_id": $_` => .,
+          contains `"precedence": $_` => .,
         }
     },
 
     // cloudflare_access_service_token & cloudflare_zero_trust_access_service_token
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_access_service_token`,
-            $instances <: contains `"min_days_for_renewal": $v` => .
+        $resource_type <: contains `cloudflare_access_service_token`,
+        $instances <: any {
+          contains `"min_days_for_renewal": $_` => .,
         }
     },
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zero_trust_access_service_token`,
-            $instances <: contains `"min_days_for_renewal": $v` => .
+        $resource_type <: contains `cloudflare_zero_trust_access_service_token`,
+        $instances <: any {
+          contains `"min_days_for_renewal": $_` => .,
         }
     },
 
     // cloudflare_tunnel & zero_trust_tunnel_cloudflared
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_tunnel`,
-            $instances <: contains `"secret": $v` => .
-        }
-    },
-     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_tunnel`,
-            $instances <: contains `"cname": $v` => .
-        }
-    },
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `zero_trust_tunnel_cloudflared`,
-            $instances <: contains `"secret": $v` => .
+        $resource_type <: contains `cloudflare_tunnel`,
+        $instances <: any {
+          contains `"secret": $_` => .,
+          contains `"cname": $_` => .,
         }
     },
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `zero_trust_tunnel_cloudflared`,
-            $instances <: contains `"cname": $v` => .
+        $resource_type <: contains `zero_trust_tunnel_cloudflared`,
+        $instances <: any {
+          contains `"secret": $_` => .,
+          contains `"cname": $_` => .,
         }
     },
 
-    // cloudflare_zone
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zone`,
-            $instances <: contains `"plan": $v` => .
-        }
-    },
-    `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_zone`,
-            $instances <: contains `"jump_start": $v` => .
-        }
-    },
-
     // cloudflare_record
-   `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_record`,
-            $instances <: contains `"data": [{$obj}]` => `"data": {
-            $obj
-        }`  
-        }
-    }, 
-   `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_record`,
-            $instances <: contains `"data": []` => `"data": {}`
-        }
-    },    
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_record`,
-            $instances <: contains `"hostname": $v` => .
+        $resource_type <: contains `cloudflare_record`,
+        $instances <: any {
+          contains `"data": [{$obj}]` => `"data": {
+              $obj
+          }`,
+          contains `"data": []` => `"data": {}`,
+          contains `"hostname": $_` => .,
+          contains `"allow_overwrite": $_` => .,
         }
     },
+
+    // cloudflare_origin_ca_certificate
     `{ "mode": "managed", "type": "$resource_type", $..., "instances":[$instances] }` where {
-        and {
-            $resource_type <: contains `cloudflare_record`,
-            $instances <: contains `"allow_overwrite": $v` => .
+        $resource_type <: contains `cloudflare_origin_ca_certificate`,
+        $instances <: any {
+          contains `"min_days_for_renewal": $_` => .
         }
     },
   }