mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

Fixing tests

Browse Source
This commit is contained in:
Tom Limoncelli
2023-06-24 16:29:13 -06:00
parent 6c8ad84f10
commit d16bbf5f22
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commands/test_data/simple.com.zone.djs
View File

@ -12,12 +12,12 @@ D("simple.com", REG_CHANGEME
, MX('@', 5, 'alt2.aspmx.l.google.com.') , MX('@', 5, 'alt2.aspmx.l.google.com.')
, MX('@', 10, 'alt3.aspmx.l.google.com.') , MX('@', 10, 'alt3.aspmx.l.google.com.')
, MX('@', 10, 'alt4.aspmx.l.google.com.') , MX('@', 10, 'alt4.aspmx.l.google.com.')
, TXT('@', 'google-site-verification=O54a_pYHGr4EB8iLoGFgX8OTZ1DkP1KWnOLpx0YCazI') , TXT('@', "google-site-verification=O54a_pYHGr4EB8iLoGFgX8OTZ1DkP1KWnOLpx0YCazI")
, TXT('@', 'v=spf1 mx include:mktomail.com ~all') , TXT('@', "v=spf1 mx include:mktomail.com ~all")
, TXT('m1._domainkey', 'v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZfEV2C82eJ4OA3Mslz4C6msjYYalg1eUcHeJQ//QM1hOZSvn4qz+hSKGi7jwNDqsZNzM8vCt2+XzdDYL3JddwUEhoDsIsZsJW0qzIVVLLWCg6TLNS3FpVyjc171o94dpoHFekfswWDoEwFQ03Woq2jchYWBrbUf7MMcdEj/EQqwIDAQAB') , TXT('m1._domainkey', "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZfEV2C82eJ4OA3Mslz4C6msjYYalg1eUcHeJQ//QM1hOZSvn4qz+hSKGi7jwNDqsZNzM8vCt2+XzdDYL3JddwUEhoDsIsZsJW0qzIVVLLWCg6TLNS3FpVyjc171o94dpoHFekfswWDoEwFQ03Woq2jchYWBrbUf7MMcdEj/EQqwIDAQAB")
, CNAME('dev', 'stackoverflowsandbox2.mktoweb.com.') , CNAME('dev', 'stackoverflowsandbox2.mktoweb.com.')
, CNAME('dev-email', 'mkto-sj310056.com.') , CNAME('dev-email', 'mkto-sj310056.com.')
, 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.')

8
commands/test_data/simple.com.zone.js
View File

@ -12,12 +12,12 @@ D("simple.com", REG_CHANGEME,
MX('@', 5, 'alt2.aspmx.l.google.com.'), MX('@', 5, 'alt2.aspmx.l.google.com.'),
MX('@', 10, 'alt3.aspmx.l.google.com.'), MX('@', 10, 'alt3.aspmx.l.google.com.'),
MX('@', 10, 'alt4.aspmx.l.google.com.'), MX('@', 10, 'alt4.aspmx.l.google.com.'),
TXT('@', 'google-site-verification=O54a_pYHGr4EB8iLoGFgX8OTZ1DkP1KWnOLpx0YCazI'), TXT('@', "google-site-verification=O54a_pYHGr4EB8iLoGFgX8OTZ1DkP1KWnOLpx0YCazI"),
TXT('@', 'v=spf1 mx include:mktomail.com ~all'), TXT('@', "v=spf1 mx include:mktomail.com ~all"),
TXT('m1._domainkey', 'v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZfEV2C82eJ4OA3Mslz4C6msjYYalg1eUcHeJQ//QM1hOZSvn4qz+hSKGi7jwNDqsZNzM8vCt2+XzdDYL3JddwUEhoDsIsZsJW0qzIVVLLWCg6TLNS3FpVyjc171o94dpoHFekfswWDoEwFQ03Woq2jchYWBrbUf7MMcdEj/EQqwIDAQAB'), TXT('m1._domainkey', "v=DKIM1;k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZfEV2C82eJ4OA3Mslz4C6msjYYalg1eUcHeJQ//QM1hOZSvn4qz+hSKGi7jwNDqsZNzM8vCt2+XzdDYL3JddwUEhoDsIsZsJW0qzIVVLLWCg6TLNS3FpVyjc171o94dpoHFekfswWDoEwFQ03Woq2jchYWBrbUf7MMcdEj/EQqwIDAQAB"),
CNAME('dev', 'stackoverflowsandbox2.mktoweb.com.'), CNAME('dev', 'stackoverflowsandbox2.mktoweb.com.'),
CNAME('dev-email', 'mkto-sj310056.com.'), CNAME('dev-email', 'mkto-sj310056.com.'),
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.')

2
providers/powerdns/convert.go
View File

@ -22,7 +22,7 @@ func toRecordConfig(domain string, r zones.Record, ttl int, name string, rtype s
switch rtype { switch rtype {
case "TXT": case "TXT":
// PowerDNS API accepts long TXTs without requiring to split them // PowerDNS API accepts long TXTs without requiring to split them.
// The API then returns them as they initially came in, e.g. "averylooooooo[...]oooooongstring" or "string" "string" // The API then returns them as they initially came in, e.g. "averylooooooo[...]oooooongstring" or "string" "string"
// So we need to strip away " and split into multiple string // So we need to strip away " and split into multiple string
// We can't use SetTargetRFC1035Quoted, it would split the long strings into multiple parts // We can't use SetTargetRFC1035Quoted, it would split the long strings into multiple parts

3
providers/powerdns/convert_test.go
View File

@ -26,10 +26,11 @@ func TestToRecordConfig(t *testing.T) {
Content: largeContent, Content: largeContent,
} }
recordConfig, err = toRecordConfig("example.com", largeRecord, 5, "large", "TXT") recordConfig, err = toRecordConfig("example.com", largeRecord, 5, "large", "TXT")
largeJoined := `"` + strings.Repeat("A", 300) + strings.Repeat("B", 300) + `"`
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, "large.example.com", recordConfig.NameFQDN) assert.Equal(t, "large.example.com", recordConfig.NameFQDN)
assert.Equal(t, largeContent, recordConfig.String()) assert.Equal(t, largeJoined, recordConfig.String())
assert.Equal(t, uint32(5), recordConfig.TTL) assert.Equal(t, uint32(5), recordConfig.TTL)
assert.Equal(t, "TXT", recordConfig.Type) assert.Equal(t, "TXT", recordConfig.Type)
} }