Merge pull request #22277 from is-a-dev/record-to-records

rename `record` key to `records`

Author: wdhdev

.github/workflows/ci.yml

@@ -43,5 +43,11 @@ jobs:
               env:
                   GH_TOKEN: ${{ github.token }}
 
+            - name: Run DNSControl tests
+              if: github.event_name == 'pull_request' && contains(fromJson(env.CHANGED_FILES), 'dnsconfig.js')
+              uses: is-a-dev/dnscontrol-action@main
+              with:
+                  args: check
+
             - name: Run tests
               run: npx ava tests/*.test.js --timeout=1m

dnsconfig.js

@@ -19,61 +19,62 @@ function getDomainsList(filesPath) {
 }
 
 var domains = getDomainsList("./domains");
-var records = [];
+var zone = [];
 
 for (var subdomain in domains) {
     var subdomainName = domains[subdomain].name;
-    var domainData = domains[subdomain].data;
-    var proxyState = domainData.proxied ? CF_PROXY_ON : CF_PROXY_OFF;
+    var data = domains[subdomain].data;
+    var records = data.records;
+    var proxyState = data.proxied ? CF_PROXY_ON : CF_PROXY_OFF;
 
     // Handle A records
-    if (domainData.record.A) {
-        for (var a in domainData.record.A) {
-            records.push(A(subdomainName, IP(domainData.record.A[a]), proxyState));
+    if (records.A) {
+        for (var a in records.A) {
+            zone.push(A(subdomainName, IP(records.A[a]), proxyState));
         }
     }
 
     // Handle AAAA records
-    if (domainData.record.AAAA) {
-        for (var aaaa in domainData.record.AAAA) {
-            records.push(AAAA(subdomainName, domainData.record.AAAA[aaaa], proxyState));
+    if (records.AAAA) {
+        for (var aaaa in records.AAAA) {
+            zone.push(AAAA(subdomainName, records.AAAA[aaaa], proxyState));
         }
     }
 
     // Handle CAA records
-    if (domainData.record.CAA) {
-        for (var caa in domainData.record.CAA) {
-            var caaRecord = domainData.record.CAA[caa];
-            records.push(CAA(subdomainName, caaRecord.tag, caaRecord.value));
+    if (records.CAA) {
+        for (var caa in records.CAA) {
+            var caaRecord = records.CAA[caa];
+            zone.push(CAA(subdomainName, caaRecord.tag, caaRecord.value));
         }
     }
 
     // Handle CNAME records
-    if (domainData.record.CNAME) {
-        records.push(ALIAS(subdomainName, domainData.record.CNAME + ".", proxyState));
+    if (records.CNAME) {
+        zone.push(ALIAS(subdomainName, records.CNAME + ".", proxyState));
     }
 
     // Handle DS records
-    if (domainData.record.DS) {
-        for (var ds in domainData.record.DS) {
-            var dsRecord = domainData.record.DS[ds];
-            records.push(
+    if (records.DS) {
+        for (var ds in records.DS) {
+            var dsRecord = records.DS[ds];
+            zone.push(
                 DS(subdomainName, dsRecord.key_tag, dsRecord.algorithm, dsRecord.digest_type, dsRecord.digest)
             );
         }
     }
 
     // Handle MX records
-    if (domainData.record.MX) {
-        for (var mx in domainData.record.MX) {
-            var mxRecord = domainData.record.MX[mx];
+    if (records.MX) {
+        for (var mx in records.MX) {
+            var mxRecord = records.MX[mx];
 
             if (typeof mxRecord === "string") {
-                records.push(
-                    MX(subdomainName, 10 + parseInt(mx), domainData.record.MX[mx] + ".")
+                zone.push(
+                    MX(subdomainName, 10 + parseInt(mx), records.MX[mx] + ".")
                 );
             } else {
-                records.push(
+                zone.push(
                     MX(
                         subdomainName,
                         parseInt(mxRecord.priority),
@@ -85,28 +86,28 @@ for (var subdomain in domains) {
     }
 
     // Handle NS records
-    if (domainData.record.NS) {
-        for (var ns in domainData.record.NS) {
-            records.push(NS(subdomainName, domainData.record.NS[ns] + "."));
+    if (records.NS) {
+        for (var ns in records.NS) {
+            zone.push(NS(subdomainName, records.NS[ns] + "."));
         }
     }
 
     // Handle SRV records
-    if (domainData.record.SRV) {
-        for (var srv in domainData.record.SRV) {
-            var srvRecord = domainData.record.SRV[srv];
-            records.push(
+    if (records.SRV) {
+        for (var srv in records.SRV) {
+            var srvRecord = records.SRV[srv];
+            zone.push(
                 SRV(subdomainName, srvRecord.priority, srvRecord.weight, srvRecord.port, srvRecord.target + ".")
             );
         }
     }
 
     // Handle TLSA records
-    if (domainData.record.TLSA) {
-        for (var tlsa in domainData.record.TLSA) {
-            var tlsaRecord = domainData.record.TLSA[tlsa];
+    if (records.TLSA) {
+        for (var tlsa in records.TLSA) {
+            var tlsaRecord = records.TLSA[tlsa];
 
-            records.push(
+            zone.push(
                 TLSA(
                     subdomainName,
                     tlsaRecord.usage,
@@ -119,19 +120,19 @@ for (var subdomain in domains) {
     }
 
     // Handle TXT records
-    if (domainData.record.TXT) {
-        if (Array.isArray(domainData.record.TXT)) {
-            for (var txt in domainData.record.TXT) {
-                records.push(TXT(subdomainName, domainData.record.TXT[txt].length <= 255 ? "\"" + domainData.record.TXT[txt] + "\"" : domainData.record.TXT[txt]));
+    if (records.TXT) {
+        if (Array.isArray(records.TXT)) {
+            for (var txt in records.TXT) {
+                zone.push(TXT(subdomainName, records.TXT[txt].length <= 255 ? "\"" + records.TXT[txt] + "\"" : records.TXT[txt]));
             }
         } else {
-            records.push(TXT(subdomainName, domainData.record.TXT.length <= 255 ? "\"" + domainData.record.TXT + "\"" : domainData.record.TXT));
+            zone.push(TXT(subdomainName, records.TXT.length <= 255 ? "\"" + records.TXT + "\"" : records.TXT));
         }
     }
 
     // Handle URL records
-    if (domainData.record.URL) {
-        records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
+    if (records.URL) {
+        zone.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
     }
 }
 
@@ -149,7 +150,7 @@ for (var i = 0; i < reserved.length; i++) {
         subdomainName !== "ns4" &&
         subdomainName !== "www"
     ) {
-        records.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
+        zone.push(A(subdomainName, IP("192.0.2.1"), CF_PROXY_ON));
     }
 }
 
@@ -176,6 +177,6 @@ var ignored = [
 ];
 
 // Push TXT record of when the zone was last updated
-records.push(TXT("_zone-updated", "\"" + Date.now().toString() + "\""));
+zone.push(TXT("_zone-updated", "\"" + Date.now().toString() + "\""));
 
 D(domainName, registrar, dnsProvider, options, ignored, records);

domains/0.json

@@ -3,7 +3,7 @@
     "username": "S4IL21",
     "email": "[email protected]"
   },
-  "record": {
+  "records": {
     "CNAME": "s4il21.github.io"
   }
 }

domains/00.json

@@ -3,7 +3,7 @@
     "username": "Rayrsn",
     "email": "[email protected]"
   },
-  "record": {
+  "records": {
     "URL": "https://rayrsn.me/"
   }
 }

domains/00001.json

@@ -5,7 +5,7 @@
     "username": "SatyamV7",
     "email": "[email protected]"
   },
-  "record": {
+  "records": {
     "CNAME": "satyamv7.github.io"
   }
 }

domains/01.json

@@ -3,7 +3,7 @@
     "username": "Rayrsn",
     "email": "[email protected]"
   },
-  "record": {
+  "records": {
     "URL": "https://rayrsn.me/"
   }
 }

domains/011.json

@@ -3,7 +3,7 @@
     "username": "iamxani",
     "email": "[email protected]"
   },
-  "record": {
+  "records": {
     "CNAME": "iamxani.github.io"
   }
 }

domains/026.json

@@ -3,7 +3,7 @@
     "username": "conaitus",
     "discord": "772867638920609823"
   },
-  "record": {
+  "records": {
     "A": ["77.175.38.88"]
   }
 }

domains/0ad.json

@@ -5,7 +5,7 @@
     "email": "[email protected]",
     "discord": "[AoG+] Broduer#0331"
   },
-  "record": {
+  "records": {
     "URL": "https://play0ad.com"
   }
 }

domains/0l1v3r.json

@@ -3,7 +3,7 @@
     "username": "chuckchicken100",
     "discord": "815256243786350594"
   },
-  "record": {
+  "records": {
     "A": ["103.97.126.29"]
   }
 }