src/octodns_netbox_dns/__init__.py

@@ -92,12 +92,12 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
 
     def _escape_semicolon(self, value: str) -> str:
         fixed = value.replace(";", "\\;")
-        self.log.debug(f"in='{value}', escaped='{fixed}'")
+        self.log.debug(f"in='{value}', fixed='{fixed}'")
         return fixed
 
     def _unescape_semicolon(self, value: str) -> str:
         fixed = value.replace("\\\\", "\\").replace("\\;", ";")
-        self.log.debug(f"in='{value}', unescaped='{fixed}'")
+        self.log.debug(f"in='{value}', fixed='{fixed}'")
         return fixed
 
     def _get_nb_view(self, view: str | None | Literal[False]) -> dict[str, int | str]:
@@ -339,11 +339,6 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
 
         return True
 
-    def _unescape_for_netbox(self, rcd_type: str, value: str) -> str:
-        if rcd_type not in ["TXT", "SPF"]:
-            return value
-        return self._unescape_semicolon(value)
-
     def _apply(self, plan: octodns.provider.plan.Plan) -> None:
         """apply the changes to the NetBox DNS zone.
 
@@ -362,15 +357,17 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
 
                     new_changeset = self._format_changeset(change.new)
                     for record in new_changeset:
-                        self.log.debug(f"ADD {change.new._type} {rcd_name} {record}")
-                        self.api.plugins.netbox_dns.records.create(
-                            zone=nb_zone.id,
-                            name=rcd_name,
-                            type=change.new._type,
-                            ttl=change.new.ttl,
-                            value=self._unescape_for_netbox(change.new._type, record),
-                            disable_ptr=self.disable_ptr,
+                        nb_record: pynetbox.core.response.Record = (
+                            self.api.plugins.netbox_dns.records.create(
+                                zone=nb_zone.id,
+                                name=rcd_name,
+                                type=change.new._type,
+                                ttl=change.new.ttl,
+                                value=self._unescape_semicolon(record),
+                                disable_ptr=self.disable_ptr,
+                            )
                         )
+                        self.log.debug(f"ADD {nb_record.type} {nb_record.name} {nb_record.value}")
 
                 case octodns.record.Delete():
                     nb_records: pynetbox.core.response.RecordSet = (
@@ -414,19 +411,19 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
                             )
                             nb_record.delete()
                         if nb_record.value in to_update:
+                            nb_record.ttl = change.new.ttl
                             self.log.debug(
                                 f"MODIFY {nb_record.type} {nb_record.name} {nb_record.value}"
                             )
-                            nb_record.ttl = change.new.ttl
                             nb_record.save()
 
                     for record in to_create:
-                        self.log.debug(f"ADD {change.new._type} {rcd_name} {record}")
                         nb_record = self.api.plugins.netbox_dns.records.create(
                             zone=nb_zone.id,
                             name=rcd_name,
                             type=change.new._type,
                             ttl=change.new.ttl,
-                            value=self._unescape_for_netbox(change.new._type, record),
+                            value=self._unescape_semicolon(record),
                             disable_ptr=self.disable_ptr,
                         )
+                        self.log.debug(f"ADD {nb_record.type} {nb_record.name} {nb_record.value}")