From eeed1aa3674e42031b63d83512e03f52779e7511 Mon Sep 17 00:00:00 2001
From: Ross McFarland <rwmcfa1@gmail.com>
Date: Thu, 18 Sep 2025 10:28:25 -0700
Subject: [PATCH] Improve AutoArpa wildcard handling with wildcard_replacement
 option

---
 .../3d960d8405e646d6a57602286d295bbf.md       |  4 ++++
 octodns/processor/arpa.py                     | 14 ++++++++++---
 tests/test_octodns_processor_arpa.py          | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 .changelog/3d960d8405e646d6a57602286d295bbf.md

diff --git a/.changelog/3d960d8405e646d6a57602286d295bbf.md b/.changelog/3d960d8405e646d6a57602286d295bbf.md
new file mode 100644
index 0000000..b271bcd
--- /dev/null
+++ b/.changelog/3d960d8405e646d6a57602286d295bbf.md
@@ -0,0 +1,4 @@
+---
+type: minor
+---
+Improve AutoArpa wildcard handling with wildcard_replacement option
\ No newline at end of file
diff --git a/octodns/processor/arpa.py b/octodns/processor/arpa.py
index d360b19..b229bd9 100644
--- a/octodns/processor/arpa.py
+++ b/octodns/processor/arpa.py
@@ -18,25 +18,30 @@ class AutoArpa(BaseProcessor):
         populate_should_replace=False,
         max_auto_arpa=999,
         inherit_ttl=False,
+        wildcard_replacement=None,
     ):
         super().__init__(name)
         self.log = getLogger(f'AutoArpa[{name}]')
         self.log.info(
-            '__init__: ttl=%d, populate_should_replace=%s, max_auto_arpa=%d, inherit_ttl=%s',
+            '__init__: ttl=%d, populate_should_replace=%s, max_auto_arpa=%d, inherit_ttl=%s, wildcard_replacement=%s',
             ttl,
             populate_should_replace,
             max_auto_arpa,
             inherit_ttl,
+            wildcard_replacement,
         )
         self.ttl = ttl
         self.populate_should_replace = populate_should_replace
         self.max_auto_arpa = max_auto_arpa
         self.inherit_ttl = inherit_ttl
+        self.wildcard_replacement = wildcard_replacement
         self._records = defaultdict(list)
 
     def process_source_zone(self, desired, sources):
         for record in desired.records:
-            if record._type in ('A', 'AAAA'):
+            if record._type in ('A', 'AAAA') and (
+                record.name != '*' or self.wildcard_replacement is not None
+            ):
                 ips = record.values
                 if record.geo:
                     for geo in record.geo.values():
@@ -46,6 +51,9 @@ class AutoArpa(BaseProcessor):
                         for value in pool.data['values']:
                             ips.append(value['value'])
 
+                fqdn = record.fqdn
+                if self.wildcard_replacement is not None:
+                    fqdn = fqdn.replace('*', self.wildcard_replacement)
                 for ip in ips:
                     ptr = ip_address(ip).reverse_pointer
                     auto_arpa_priority = record.octodns.get(
@@ -56,7 +64,7 @@ class AutoArpa(BaseProcessor):
                     else:
                         record_ttl = self.ttl
                     self._records[f'{ptr}.'].append(
-                        (auto_arpa_priority, record_ttl, record.fqdn)
+                        (auto_arpa_priority, record_ttl, fqdn)
                     )
 
         return desired
diff --git a/tests/test_octodns_processor_arpa.py b/tests/test_octodns_processor_arpa.py
index be4c2fd..6152abc 100644
--- a/tests/test_octodns_processor_arpa.py
+++ b/tests/test_octodns_processor_arpa.py
@@ -367,3 +367,23 @@ class TestAutoArpa(TestCase):
         aa.populate(arpa)
         (ptr,) = arpa.records
         self.assertEqual(64, ptr.ttl)
+
+    def test_wildcard(self):
+        zone = Zone('unit.tests.', [])
+        record = Record.new(
+            zone, '*', {'ttl': 32, 'type': 'A', 'value': '1.2.3.4'}
+        )
+        zone.add_record(record)
+
+        # with defaults, wildcards are ignored
+        aa = AutoArpa('auto-arpa')
+        aa.process_source_zone(zone, [])
+        self.assertEqual({}, aa._records)
+
+        # with a wildcard fill-in set they are included using it
+        aa = AutoArpa('auto-arpa', wildcard_replacement='wildcard')
+        aa.process_source_zone(zone, [])
+        self.assertEqual(
+            {'4.3.2.1.in-addr.arpa.': [(999, 3600, 'wildcard.unit.tests.')]},
+            aa._records,
+        )