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

BUG: get-zones not generating SOA() statements properly (#3464)

Browse source
This commit is contained in:
Tom Limoncelli 2025-02-25 12:29:13 -05:00 • committed by GitHub
parent 48c99f7065
commit b0bc29c402
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands/getZones.go
View file

@ -212,6 +212,8 @@ func GetZone(args GetZoneArgs) error {
dspVariableName := "DSP_" + strings.ToUpper(args.CredName)
if args.OutputFormat == "js" || args.OutputFormat == "djs" {
fmt.Fprintf(w, "// generated by get-zones. This is 'a decent first draft' and requires editing.\n")
fmt.Fprintf(w, "\n")
if args.ProviderName == "-" {
fmt.Fprintf(w, `var %s = NewDnsProvider("%s");`+"\n",
dspVariableName, args.CredName)
@ -240,6 +242,7 @@ func GetZone(args GetZoneArgs) error {
if args.OutputFormat == "djs" {
sep = "\n\t, " // Funky comma mode
}
fmt.Fprintf(w, `D("%s", REG_CHANGEME%s`, zoneName, sep)
var o []string
o = append(o, fmt.Sprintf("DnsProvider(%s)", dspVariableName))
@ -352,7 +355,7 @@ func formatDsl(rec *models.RecordConfig, defaultTTL uint32) string {
target = fmt.Sprintf(`%d, %d, "%s"`, rec.SshfpAlgorithm, rec.SshfpFingerprint, rec.GetTargetField())
case "SOA":
rec.Type = "//SOA"
target = fmt.Sprintf(`"%s", "%s", %d, %d, %d, %d, %d`, rec.GetTargetField(), rec.SoaMbox, rec.SoaSerial, rec.SoaRefresh, rec.SoaRetry, rec.SoaExpire, rec.SoaMinttl)
target = fmt.Sprintf(`"%s", "%s", %d, %d, %d, %d`, rec.GetTargetField(), rec.SoaMbox, rec.SoaRefresh, rec.SoaRetry, rec.SoaExpire, rec.SoaMinttl)
case "SRV":
target = fmt.Sprintf(`%d, %d, %d, "%s"`, rec.SrvPriority, rec.SrvWeight, rec.SrvPort, rec.GetTargetField())
case "SVCB", "HTTPS":

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440)
//, NAMESERVER("ns-1313.awsdns-36.org.")
//, NAMESERVER("ns-736.awsdns-28.net.")
//, NAMESERVER("ns-cloud-c1.googledomains.com.")

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440),
//NAMESERVER("ns-1313.awsdns-36.org."),
//NAMESERVER("ns-736.awsdns-28.net."),
//NAMESERVER("ns-cloud-c1.googledomains.com."),

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440)
, DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B")
)

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440),
DS("geo", 14480, 13, 2, "BB1C4B615CDED2B34347CF23710471934D972F1E34F53B54ED8D5F786202C73B"),
);

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

@ -1,10 +1,12 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none");
D("example.org", REG_CHANGEME
, DnsProvider(DSP_BIND)
, DefaultTTL(7200)
//, SOA("@", "ns1.example.org.", "hostmaster.example.org.", 2020030700, 7200, 3600, 864000, 7200, TTL(43200))
//, SOA("@", "ns1.example.org.", "hostmaster.example.org.", 7200, 3600, 864000, 7200, TTL(43200))
//, NAMESERVER("ns1.example.org.")
//, NAMESERVER("ns2.example.org.")
//, NAMESERVER("ns-a.example.net.")

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

@ -1,10 +1,12 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
var DSP_BIND = NewDnsProvider("bind", "BIND");
var REG_CHANGEME = NewRegistrar("none");
D("example.org", REG_CHANGEME,
DnsProvider(DSP_BIND),
DefaultTTL(7200),
//SOA("@", "ns1.example.org.", "hostmaster.example.org.", 2020030700, 7200, 3600, 864000, 7200, TTL(43200)),
//SOA("@", "ns1.example.org.", "hostmaster.example.org.", 7200, 3600, 864000, 7200, TTL(43200)),
//NAMESERVER("ns1.example.org."),
//NAMESERVER("ns2.example.org."),
//NAMESERVER("ns-a.example.net."),

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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)
//, SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440)
//, NAMESERVER("ns-1313.awsdns-36.org.")
//, NAMESERVER("ns-736.awsdns-28.net.")
//, NAMESERVER("ns-cloud-c1.googledomains.com.")

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

@ -1,9 +1,11 @@
// generated by get-zones. This is 'a decent first draft' and requires editing.
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),
//SOA("@", "ns3.serverfault.com.", "sysadmin.stackoverflow.com.", 3600, 600, 604800, 1440),
//NAMESERVER("ns-1313.awsdns-36.org."),
//NAMESERVER("ns-736.awsdns-28.net."),
//NAMESERVER("ns-cloud-c1.googledomains.com."),