From 544d731decfb2c4e10a8d3550648d8a0f2dd3414 Mon Sep 17 00:00:00 2001 From: Tom Limoncelli Date: Tue, 27 Feb 2024 15:11:13 -0500 Subject: [PATCH] get-zones now outputs `END);` notation and prettier whitespace (#2849) --- commands/getZones.go | 9 ++++++--- commands/test_data/apex.com.zone.djs | 2 ++ commands/test_data/apex.com.zone.js | 6 ++++-- commands/test_data/ds.com.zone.djs | 2 ++ commands/test_data/ds.com.zone.js | 6 ++++-- commands/test_data/example.org.zone.djs | 2 ++ commands/test_data/example.org.zone.js | 6 ++++-- commands/test_data/simple.com.zone.djs | 2 ++ commands/test_data/simple.com.zone.js | 6 ++++-- 9 files changed, 30 insertions(+), 11 deletions(-) diff --git a/commands/getZones.go b/commands/getZones.go index aad439414..a9b726f85 100644 --- a/commands/getZones.go +++ b/commands/getZones.go @@ -220,7 +220,7 @@ func GetZone(args GetZoneArgs) error { fmt.Fprintf(w, `var %s = NewDnsProvider("%s", "%s");`+"\n", dspVariableName, args.CredName, args.ProviderName) } - fmt.Fprintf(w, `var REG_CHANGEME = NewRegistrar("none");`+"\n") + fmt.Fprintf(w, `var REG_CHANGEME = NewRegistrar("none");`+"\n\n") } // print each zone @@ -267,14 +267,17 @@ func GetZone(args GetZoneArgs) error { "//, NOTE: CNAME at apex may require manual editing.", "// NOTE: CNAME at apex may require manual editing.", ) + fmt.Fprint(w, out) + fmt.Fprint(w, "\n)\n\n") } else { + out = out + "," out = strings.ReplaceAll(out, "// NOTE: CNAME at apex may require manual editing.,", "// NOTE: CNAME at apex may require manual editing.", ) + fmt.Fprint(w, out) + fmt.Fprint(w, "\nEND);\n\n") } - fmt.Fprint(w, out) - fmt.Fprint(w, "\n)\n") case "tsv": for _, rec := range recs { diff --git a/commands/test_data/apex.com.zone.djs b/commands/test_data/apex.com.zone.djs index 24fe6ccd3..a24b5c718 100644 --- a/commands/test_data/apex.com.zone.djs +++ b/commands/test_data/apex.com.zone.djs @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("apex.com", REG_CHANGEME , DnsProvider(DSP_BIND) //, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) @@ -11,3 +12,4 @@ D("apex.com", REG_CHANGEME , CNAME("@", "cnametest1.example.com.") , CNAME("www", "cnametest2.example.com.") ) + diff --git a/commands/test_data/apex.com.zone.js b/commands/test_data/apex.com.zone.js index 2e19a309d..30e360478 100644 --- a/commands/test_data/apex.com.zone.js +++ b/commands/test_data/apex.com.zone.js @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("apex.com", REG_CHANGEME, DnsProvider(DSP_BIND), //SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), @@ -9,5 +10,6 @@ D("apex.com", REG_CHANGEME, //NAMESERVER("ns-cloud-c2.googledomains.com."), // NOTE: CNAME at apex may require manual editing. CNAME("@", "cnametest1.example.com."), - CNAME("www", "cnametest2.example.com.") -) + CNAME("www", "cnametest2.example.com."), +END); + diff --git a/commands/test_data/ds.com.zone.djs b/commands/test_data/ds.com.zone.djs index a6fd23a01..9283527e4 100644 --- a/commands/test_data/ds.com.zone.djs +++ b/commands/test_data/ds.com.zone.djs @@ -1,7 +1,9 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("ds.com", REG_CHANGEME , DnsProvider(DSP_BIND) //, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) , DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B") ) + diff --git a/commands/test_data/ds.com.zone.js b/commands/test_data/ds.com.zone.js index 2a1b01081..91a93a22c 100644 --- a/commands/test_data/ds.com.zone.js +++ b/commands/test_data/ds.com.zone.js @@ -1,7 +1,9 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("ds.com", REG_CHANGEME, DnsProvider(DSP_BIND), //SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), - DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B") -) + DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B"), +END); + diff --git a/commands/test_data/example.org.zone.djs b/commands/test_data/example.org.zone.djs index 1464580fa..c4ef92e60 100644 --- a/commands/test_data/example.org.zone.djs +++ b/commands/test_data/example.org.zone.djs @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("example.org", REG_CHANGEME , DnsProvider(DSP_BIND) , DefaultTTL(7200) @@ -353,3 +354,4 @@ D("example.org", REG_CHANGEME , CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com.") , CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com.") ) + diff --git a/commands/test_data/example.org.zone.js b/commands/test_data/example.org.zone.js index 95f7d4a46..6972c95bb 100644 --- a/commands/test_data/example.org.zone.js +++ b/commands/test_data/example.org.zone.js @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("example.org", REG_CHANGEME, DnsProvider(DSP_BIND), DefaultTTL(7200), @@ -351,5 +352,6 @@ D("example.org", REG_CHANGEME, CNAME("_fedcba9876543210fedcba9876543210.go", "_45678901234abcdef45678901234abcd.ggedgsdned.acm-validations.aws."), CNAME("opqrstuvwxyz", "gv-abcdefghijklmn.dv.googlehosted.com."), CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com."), - CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com.") -) + CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com."), +END); + diff --git a/commands/test_data/simple.com.zone.djs b/commands/test_data/simple.com.zone.djs index f230f45ab..ada1d4f7c 100644 --- a/commands/test_data/simple.com.zone.djs +++ b/commands/test_data/simple.com.zone.djs @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("simple.com", REG_CHANGEME , DnsProvider(DSP_BIND) //, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) @@ -22,3 +23,4 @@ D("simple.com", REG_CHANGEME , CNAME("info", "stackoverflow.mktoweb.com.") , SRV("_sip._tcp", 10, 60, 5060, "bigbox.example.com.") ) + diff --git a/commands/test_data/simple.com.zone.js b/commands/test_data/simple.com.zone.js index 9f17b4545..51d3d23d1 100644 --- a/commands/test_data/simple.com.zone.js +++ b/commands/test_data/simple.com.zone.js @@ -1,5 +1,6 @@ var DSP_BIND = NewDnsProvider("bind", "BIND"); var REG_CHANGEME = NewRegistrar("none"); + D("simple.com", REG_CHANGEME, DnsProvider(DSP_BIND), //SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), @@ -20,5 +21,6 @@ D("simple.com", REG_CHANGEME, TXT("m1._domainkey.dev-email", "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCIBezZ2Gc+/3PghWk+YOE6T9HdwgUTMTR0Fne2i51MNN9Qs7AqDitVdG/949iDbI2fPNZSnKtOcnlLYwvve9MhMAMI1nZ26ILhgaBJi2BMZQpGFlO4ucuo/Uj4DPZ5Ge/NZHCX0CRhAhR5sRmL2OffNcFXFrymzUuz4KzI/NyUiwIDAQAB"), CNAME("email", "mkto-sj280138.com."), CNAME("info", "stackoverflow.mktoweb.com."), - SRV("_sip._tcp", 10, 60, 5060, "bigbox.example.com.") -) + SRV("_sip._tcp", 10, 60, 5060, "bigbox.example.com."), +END); +