Add SVCB and HTTPS record type support

octodns_powerdns/__init__.py

@@ -13,6 +13,14 @@
 from octodns.record import Record
 from octodns.record.ds import DsValue
 
+try:  # pragma: no cover
+    from octodns.record.https import HttpsValue
+    from octodns.record.svcb import SvcbValue
+
+    SUPPORTS_SVCB = True
+except ImportError:  # pragma: no cover
+    SUPPORTS_SVCB = False
+
 from .record import PowerDnsLuaRecord
 
 # TODO: remove __VERSION__ with the next major version release
@@ -55,6 +63,11 @@ class PowerDnsBaseProvider(BaseProvider):
             PowerDnsLuaRecord._type,
         )
     )
+    # These are only supported if we have a new enough octoDNS core
+    if SUPPORTS_SVCB:  # pragma: no cover
+        SUPPORTS.add('HTTPS')
+        SUPPORTS.add('SVCB')
+
     TIMEOUT = 5
 
     POWERDNS_MODES_OF_OPERATION = {
@@ -327,6 +340,20 @@ def _data_for_SRV(self, rrset):
             )
         return {'type': rrset['type'], 'values': values, 'ttl': rrset['ttl']}
 
+    def _data_for_HTTPS(self, rrset):
+        values = []
+        for record in rrset['records']:
+            value = HttpsValue.parse_rdata_text(record['content'])
+            values.append(value)
+        return {'type': rrset['type'], 'values': values, 'ttl': rrset['ttl']}
+
+    def _data_for_SVCB(self, rrset):
+        values = []
+        for record in rrset['records']:
+            value = SvcbValue.parse_rdata_text(record['content'])
+            values.append(value)
+        return {'type': rrset['type'], 'values': values, 'ttl': rrset['ttl']}
+
     def _data_for_LUA(self, rrset):
         values = []
         for record in rrset['records']:
@@ -593,6 +620,13 @@ def _records_for_SRV(self, record):
             for v in record.values
         ], record._type
 
+    def _records_for_SVCB(self, record):
+        return [
+            {'content': v.rdata_text, 'disabled': False} for v in record.values
+        ], record._type
+
+    _records_for_HTTPS = _records_for_SVCB
+
     def _records_for_PowerDnsProvider_LUA(self, record):
         return [
             {'content': f'{v._type} "{v.script}"', 'disabled': False}

requirements.txt

@@ -6,7 +6,7 @@ dnspython==2.6.1
 fqdn==1.5.1
 idna==3.7
 natsort==8.4.0
-octodns==1.7.0
+octodns==1.9.1
 python-dateutil==2.9.0.post0
 requests==2.32.2
 six==1.16.0

tests/config/unit.tests.yaml

@@ -96,6 +96,11 @@ excluded:
     - test
   type: CNAME
   value: unit.tests.
+https:
+  type: HTTPS
+  value:
+    svcpriority: 1
+    targetname: www.unit.tests.
 ignored:
   octodns:
     ignored: true
@@ -190,6 +195,13 @@ sub:
       flags: 12345
       protocol: 13
       public_key: 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF
+svcb:
+  type: SVCB
+  values:
+    - svcpriority: 1
+      targetname: www.unit.tests.
+    - svcpriority: 2
+      targetname: backups.unit.tests.
 txt:
   ttl: 600
   type: TXT

tests/fixtures/powerdns-full-data.json

@@ -347,6 +347,34 @@
             ],
             "ttl": 3600,
             "type": "DS"
+        },
+        {
+            "comments": [],
+            "name": "https.unit.tests.",
+            "records": [
+                {
+                    "content": "1 www.unit.tests.",
+                    "disabled": false
+                }
+            ],
+            "ttl": 3600,
+            "type": "HTTPS"
+        },
+        {
+            "comments": [],
+            "name": "svcb.unit.tests.",
+            "records": [
+                {
+                    "content": "1 www.unit.tests.",
+                    "disabled": false
+                },
+                {
+                    "content": "2 backups.unit.tests.",
+                    "disabled": false
+                }
+            ],
+            "ttl": 3600,
+            "type": "SVCB"
         }
     ],
     "serial": 2017012803,

tests/test_octodns_provider_powerdns.py

@@ -294,15 +294,15 @@ def test_provider(self):
         )
         source.populate(expected)
         expected_n = len(expected.records) - 4
-        self.assertEqual(23, expected_n)
+        self.assertEqual(25, expected_n)
 
         # No diffs == no changes
         with requests_mock() as mock:
             mock.get(ANY, status_code=200, text=FULL_TEXT)
 
             zone = Zone('unit.tests.', [])
             provider.populate(zone)
-            self.assertEqual(23, len(zone.records))
+            self.assertEqual(25, len(zone.records))
             changes = expected.changes(zone, provider)
             self.assertEqual(0, len(changes))
 
@@ -399,7 +399,7 @@ def test_small_change(self):
             'test', join(dirname(__file__), 'config'), supports_root_ns=False
         )
         source.populate(expected)
-        self.assertEqual(27, len(expected.records))
+        self.assertEqual(29, len(expected.records))
 
         # A small change to a single record
         with requests_mock() as mock: