StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-09-20 12:04:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

get-zones now outputs END); notation and prettier whitespace (#2849)

Browse source
This commit is contained in:
Tom Limoncelli 2024-02-27 15:11:13 -05:00 • committed by GitHub
parent 11d8e08ca0
commit 544d731dec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
commands/getZones.go
View file

@ -220,7 +220,7 @@ func GetZone(args GetZoneArgs) error {
fmt.Fprintf(w, `var %s = NewDnsProvider("%s", "%s");`+"\n", fmt.Fprintf(w, `var %s = NewDnsProvider("%s", "%s");`+"\n",
dspVariableName, args.CredName, args.ProviderName) 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 // 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.",
"// 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 { } else {
out = out + ","
out = strings.ReplaceAll(out, out = strings.ReplaceAll(out,
"// NOTE: CNAME at apex may require manual editing.,", "// NOTE: CNAME at apex may require manual editing.,",
"// 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": case "tsv":
for _, rec := range recs { for _, rec := range recs {

2
commands/test_data/apex.com.zone.djs
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("apex.com", REG_CHANGEME D("apex.com", REG_CHANGEME
, DnsProvider(DSP_BIND) , DnsProvider(DSP_BIND)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) //, 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("@", "cnametest1.example.com.")
, CNAME("www", "cnametest2.example.com.") , CNAME("www", "cnametest2.example.com.")
) )

6
commands/test_data/apex.com.zone.js
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("apex.com", REG_CHANGEME, D("apex.com", REG_CHANGEME,
DnsProvider(DSP_BIND), DnsProvider(DSP_BIND),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), //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."), //NAMESERVER("ns-cloud-c2.googledomains.com."),
// NOTE: CNAME at apex may require manual editing. // NOTE: CNAME at apex may require manual editing.
CNAME("@", "cnametest1.example.com."), CNAME("@", "cnametest1.example.com."),
CNAME("www", "cnametest2.example.com.") CNAME("www", "cnametest2.example.com."),
) END);

2
commands/test_data/ds.com.zone.djs
View file

@ -1,7 +1,9 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("ds.com", REG_CHANGEME D("ds.com", REG_CHANGEME
, DnsProvider(DSP_BIND) , DnsProvider(DSP_BIND)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) //, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440)
, DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B") , DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B")
) )

6
commands/test_data/ds.com.zone.js
View file

@ -1,7 +1,9 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("ds.com", REG_CHANGEME, D("ds.com", REG_CHANGEME,
DnsProvider(DSP_BIND), DnsProvider(DSP_BIND),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), //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);

2
commands/test_data/example.org.zone.djs
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("example.org", REG_CHANGEME D("example.org", REG_CHANGEME
, DnsProvider(DSP_BIND) , DnsProvider(DSP_BIND)
, DefaultTTL(7200) , DefaultTTL(7200)
@ -353,3 +354,4 @@ D("example.org", REG_CHANGEME
, CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com.") , CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com.")
, CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com.") , CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com.")
) )

6
commands/test_data/example.org.zone.js
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("example.org", REG_CHANGEME, D("example.org", REG_CHANGEME,
DnsProvider(DSP_BIND), DnsProvider(DSP_BIND),
DefaultTTL(7200), DefaultTTL(7200),
@ -351,5 +352,6 @@ D("example.org", REG_CHANGEME,
CNAME("_fedcba9876543210fedcba9876543210.go", "_45678901234abcdef45678901234abcd.ggedgsdned.acm-validations.aws."), CNAME("_fedcba9876543210fedcba9876543210.go", "_45678901234abcdef45678901234abcd.ggedgsdned.acm-validations.aws."),
CNAME("opqrstuvwxyz", "gv-abcdefghijklmn.dv.googlehosted.com."), CNAME("opqrstuvwxyz", "gv-abcdefghijklmn.dv.googlehosted.com."),
CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com."), CNAME("zyxwvutsrqpo", "gv-nmlkjihgfedcba.dv.googlehosted.com."),
CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com.") CNAME("0123456789abcdef0123456789abcdef", "verify.bing.com."),
) END);

2
commands/test_data/simple.com.zone.djs
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("simple.com", REG_CHANGEME D("simple.com", REG_CHANGEME
, DnsProvider(DSP_BIND) , DnsProvider(DSP_BIND)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440) //, 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.") , CNAME("info", "stackoverflow.mktoweb.com.")
, SRV("_sip._tcp", 10, 60, 5060, "bigbox.example.com.") , SRV("_sip._tcp", 10, 60, 5060, "bigbox.example.com.")
) )

6
commands/test_data/simple.com.zone.js
View file

@ -1,5 +1,6 @@
var DSP_BIND = NewDnsProvider("bind", "BIND"); var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none"); var REG_CHANGEME = NewRegistrar("none");
D("simple.com", REG_CHANGEME, D("simple.com", REG_CHANGEME,
DnsProvider(DSP_BIND), DnsProvider(DSP_BIND),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 2020022300, 3600, 600, 604800, 1440), //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"), TXT("m1._domainkey.dev-email", "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCIBezZ2Gc+/3PghWk+YOE6T9HdwgUTMTR0Fne2i51MNN9Qs7AqDitVdG/949iDbI2fPNZSnKtOcnlLYwvve9MhMAMI1nZ26ILhgaBJi2BMZQpGFlO4ucuo/Uj4DPZ5Ge/NZHCX0CRhAhR5sRmL2OffNcFXFrymzUuz4KzI/NyUiwIDAQAB"),
CNAME("email", "mkto-sj280138.com."), CNAME("email", "mkto-sj280138.com."),
CNAME("info", "stackoverflow.mktoweb.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);