BUGFIX: BIND %D not working after v4.28.0 (#3900)

# Issue

Fixes #3898

After the v4.28.0 upgrade, the `%D` option in BIND's `"filenameformat"`
option no longer works (returns "") when reading the zonefile (but it
works for writing to one!). As a result, "push" always re-creates the
zonefile even if there are no changes.

# Resolution

Fix `%D` in the zone reading code.

Author: tlimoncelli

models/domain.go

@@ -13,7 +13,6 @@ const (
 	DomainTag         = "dnscontrol_tag"         // A copy of DomainConfig.Tag
 	DomainUniqueName  = "dnscontrol_uniquename"  // A copy of DomainConfig.UniqueName
 	DomainNameRaw     = "dnscontrol_nameraw"     // A copy of DomainConfig.NameRaw
-	DomainNameASCII   = "dnscontrol_nameascii"   // A copy of DomainConfig.NameASCII
 	DomainNameUnicode = "dnscontrol_nameunicode" // A copy of DomainConfig.NameUnicode
 )
 
@@ -81,9 +80,8 @@ func (dc *DomainConfig) PostProcess() {
 	if dc.Tag != "" {
 		dc.Metadata[DomainTag] = dc.Tag
 	}
-	//dc.Metadata[DomainNameRaw] = dc.NameRaw
-	//dc.Metadata[DomainNameASCII] = dc.Name
-	//dc.Metadata[DomainNameUnicode] = dc.NameUnicode
+	dc.Metadata[DomainNameRaw] = dc.NameRaw
+	dc.Metadata[DomainNameUnicode] = dc.NameUnicode
 	dc.Metadata[DomainUniqueName] = dc.UniqueName
 }
 

pkg/js/parse_tests/001-basic.json

@@ -11,6 +11,8 @@
         "Cloudflare": -1
       },
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/002-ttl.json

@@ -11,6 +11,8 @@
         "Cloudflare": -1
       },
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/003-meta.json

@@ -4,6 +4,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/004-ips.json

@@ -11,6 +11,8 @@
         "Cloudflare": 0
       },
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/005-ignored-records.json

@@ -4,6 +4,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",
@@ -56,6 +58,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "diff2.com",
+        "dnscontrol_nameunicode": "diff2.com",
         "dnscontrol_uniquename": "diff2.com"
       },
       "name": "diff2.com",

pkg/js/parse_tests/006-transforms.json

@@ -11,6 +11,8 @@
         "Cloudflare": -1
       },
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/007-importTransformTTL.json

@@ -4,6 +4,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "foo1.com",
+        "dnscontrol_nameunicode": "foo1.com",
         "dnscontrol_uniquename": "foo1.com"
       },
       "name": "foo1.com",
@@ -29,6 +31,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "inny",
+        "dnscontrol_nameunicode": "inny",
         "dnscontrol_uniquename": "inny"
       },
       "name": "inny",
@@ -54,6 +58,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "com.inny",
+        "dnscontrol_nameunicode": "com.inny",
         "dnscontrol_uniquename": "com.inny"
       },
       "name": "com.inny",

pkg/js/parse_tests/008-import.json

@@ -4,6 +4,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "foo.com",
+        "dnscontrol_nameunicode": "foo.com",
         "dnscontrol_uniquename": "foo.com"
       },
       "name": "foo.com",

pkg/js/parse_tests/009-reverse.json

@@ -4,6 +4,8 @@
     {
       "dnsProviders": {},
       "meta": {
+        "dnscontrol_nameraw": "2.1.in-addr.arpa",
+        "dnscontrol_nameunicode": "2.1.in-addr.arpa",
         "dnscontrol_uniquename": "2.1.in-addr.arpa"
       },
       "name": "2.1.in-addr.arpa",