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

Codestyle: Fix formatting on parse_test JSON (#427)

Browse Source 
* Fix failing parse_test 021
* Fix JSON formatting in parse_test directory
* js_test.go now reports json content length
This commit is contained in:
Tom Limoncelli
2018-12-13 11:46:43 -05:00
committed by GitHub
parent a930802a8f
commit ff3d446681
21 changed files with 464 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/js/js_test.go
View File

@ -60,10 +60,12 @@ func TestParsedFiles(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if string(expectedJSON) != string(actualJSON) {
t.Error("Expected and actual json don't match")
t.Log("Expected:", string(expectedJSON))
t.Log("Actual :", string(actualJSON))
es := string(expectedJSON)
as := string(actualJSON)
if es != as {
t.Errorf("Expected and actual json don't match: %s", f.Name())
t.Logf("Expected(%v): %s", len(es), es)
t.Logf("Actual (%v): %s", len(as), as)
}
})
}

58
pkg/js/parse_tests/001-basic.json
View File

@ -1,30 +1,30 @@
{
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
],
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"name": "foo.com",
"registrar": "Third-Party",
"dnsProviders": {
"Cloudflare":-1
},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4"
}
]
}
]
}
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"dnsProviders": {
"Cloudflare": -1
},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "1.2.3.4",
"type": "A"
}
],
"registrar": "Third-Party"
}
],
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
]
}

60
pkg/js/parse_tests/002-ttl.json
View File

@ -1,31 +1,31 @@
{
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
],
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"name": "foo.com",
"registrar": "Third-Party",
"dnsProviders": {
"Cloudflare":-1
},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl": 42
}
]
}
]
}
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"dnsProviders": {
"Cloudflare": -1
},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "1.2.3.4",
"ttl": 42,
"type": "A"
}
],
"registrar": "Third-Party"
}
],
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
]
}

50
pkg/js/parse_tests/003-meta.json
View File

@ -1,26 +1,26 @@
{
"registrars": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "Cloudflare",
"dnsProviders": {},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"meta": {
"cloudflare_proxy": "ON"
}
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"meta": {
"cloudflare_proxy": "ON"
},
"name": "@",
"target": "1.2.3.4",
"type": "A"
}
],
"registrar": "Cloudflare"
}
],
"registrars": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
]
}

66
pkg/js/parse_tests/004-ips.json
View File

@ -1,28 +1,40 @@
{
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
],
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"name": "foo.com",
"registrar": "Third-Party",
"dnsProviders": {
"Cloudflare":0
},
"records": [
{ "type": "A","name": "@","target": "1.2.3.4"},
{ "type": "A","name": "p1","target": "1.2.3.5"},
{ "type": "A","name": "p255","target": "1.2.4.3"}
]
}
]
}
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"dnsProviders": {
"Cloudflare": 0
},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "1.2.3.4",
"type": "A"
},
{
"name": "p1",
"target": "1.2.3.5",
"type": "A"
},
{
"name": "p255",
"target": "1.2.4.3",
"type": "A"
}
],
"registrar": "Third-Party"
}
],
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
]
}

64
pkg/js/parse_tests/006-transforms.json
View File

@ -1,33 +1,33 @@
{
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
],
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"name": "foo.com",
"registrar": "Third-Party",
"dnsProviders": {
"Cloudflare":-1
},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"meta": {
"transform": "0.0.0.0 ~ 1.1.1.1 ~ 2.2.2.2 ~ ; 1.1.1.1 ~ 2.2.2.2 ~ 3.3.3.3,4.4.4.4,5.5.5.5 ~ ; 1.1.1.1 ~ 2.2.2.2 ~ ~ 3.3.3.3,4.4.4.4,5.5.5.5"
}
}
]
}
]
}
"dns_providers": [
{
"name": "Cloudflare",
"type": "CLOUDFLAREAPI"
}
],
"domains": [
{
"dnsProviders": {
"Cloudflare": -1
},
"name": "foo.com",
"records": [
{
"meta": {
"transform": "0.0.0.0 ~ 1.1.1.1 ~ 2.2.2.2 ~ ; 1.1.1.1 ~ 2.2.2.2 ~ 3.3.3.3,4.4.4.4,5.5.5.5 ~ ; 1.1.1.1 ~ 2.2.2.2 ~ ~ 3.3.3.3,4.4.4.4,5.5.5.5"
},
"name": "@",
"target": "1.2.3.4",
"type": "A"
}
],
"registrar": "Third-Party"
}
],
"registrars": [
{
"name": "Third-Party",
"type": "NONE"
}
]
}

42
pkg/js/parse_tests/007-importTransformTTL.json
View File

@ -1,22 +1,22 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "reg",
"dnsProviders": {},
"records": [
{
"type": "IMPORT_TRANSFORM",
"name": "@",
"target": "foo2.com",
"ttl": 60,
"meta": {
"transform_table": "0.0.0.0 ~ 1.1.1.1 ~ 2.2.2.2 ~ "
}
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"meta": {
"transform_table": "0.0.0.0 ~ 1.1.1.1 ~ 2.2.2.2 ~ "
},
"name": "@",
"target": "foo2.com",
"ttl": 60,
"type": "IMPORT_TRANSFORM"
}
],
"registrar": "reg"
}
],
"registrars": []
}

34
pkg/js/parse_tests/008-import.json
View File

@ -1,18 +1,18 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4"
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "1.2.3.4",
"type": "A"
}
],
"registrar": "none"
}
],
"registrars": []
}

22
pkg/js/parse_tests/009-reverse.json
View File

@ -1,12 +1,12 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "2.1.in-addr.arpa",
"registrar": "none",
"dnsProviders": {},
"records": []
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "2.1.in-addr.arpa",
"records": [],
"registrar": "none"
}
],
"registrars": []
}

34
pkg/js/parse_tests/010-alias.json
View File

@ -1,18 +1,18 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "ALIAS",
"name": "@",
"target": "foo.com."
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "foo.com.",
"type": "ALIAS"
}
],
"registrar": "none"
}
],
"registrars": []
}

44
pkg/js/parse_tests/011-cfRedirect.json
View File

@ -1,23 +1,23 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "CF_REDIRECT",
"name": "@",
"target": "test.foo.com,https://goo.com/$1"
},
{
"type": "CF_TEMP_REDIRECT",
"name": "@",
"target": "test.foo.com,https://goo.com/$1"
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "test.foo.com,https://goo.com/$1",
"type": "CF_REDIRECT"
},
{
"name": "@",
"target": "test.foo.com,https://goo.com/$1",
"type": "CF_TEMP_REDIRECT"
}
],
"registrar": "none"
}
],
"registrars": []
}

84
pkg/js/parse_tests/012-duration.json
View File

@ -1,43 +1,43 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl":300
},
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl":300
},
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl":180
},
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl":10800
},
{
"type": "A",
"name": "@",
"target": "1.2.3.4",
"ttl":259200
}
]
}
]
}
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"name": "@",
"target": "1.2.3.4",
"ttl": 300,
"type": "A"
},
{
"name": "@",
"target": "1.2.3.4",
"ttl": 300,
"type": "A"
},
{
"name": "@",
"target": "1.2.3.4",
"ttl": 180,
"type": "A"
},
{
"name": "@",
"target": "1.2.3.4",
"ttl": 10800,
"type": "A"
},
{
"name": "@",
"target": "1.2.3.4",
"ttl": 259200,
"type": "A"
}
],
"registrar": "none"
}
],
"registrars": []
}

38
pkg/js/parse_tests/013-mx.json
View File

@ -1,19 +1,19 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "MX",
"name": "@",
"target": "foo.com.",
"mxpreference": 15
}
]
}
]
}
{
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"mxpreference": 15,
"name": "@",
"target": "foo.com.",
"type": "MX"
}
],
"registrar": "none"
}
],
"registrars": []
}

62
pkg/js/parse_tests/014-caa.json
View File

@ -1,45 +1,45 @@
{
"registrars":[],
"dns_providers":[],
"domains":[
"dns_providers": [],
"domains": [
{
"name":"foo.com",
"registrar":"none",
"dnsProviders":{},
"records":[
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"type":"CAA",
"name":"@",
"target":"letsencrypt.org",
"caatag":"issue"
"caatag": "issue",
"name": "@",
"target": "letsencrypt.org",
"type": "CAA"
},
{
"type":"CAA",
"name":"@",
"target":";",
"caatag":"issuewild"
"caatag": "issuewild",
"name": "@",
"target": ";",
"type": "CAA"
},
{
"type":"CAA",
"name":"@",
"target":"mailto:test@example.com",
"caatag":"iodef",
"caaflag":128
"caaflag": 128,
"caatag": "iodef",
"name": "@",
"target": "mailto:test@example.com",
"type": "CAA"
},
{
"type":"CAA",
"name":"@",
"target":"http://example.com",
"caatag":"iodef"
"caatag": "iodef",
"name": "@",
"target": "http://example.com",
"type": "CAA"
},
{
"type":"CAA",
"name":"@",
"target":"https://example.com",
"caatag":"iodef",
"caaflag":128
"caaflag": 128,
"caatag": "iodef",
"name": "@",
"target": "https://example.com",
"type": "CAA"
}
]
],
"registrar": "none"
}
]
],
"registrars": []
}

31
pkg/js/parse_tests/015-tlsa.json
View File

@ -1,22 +1,21 @@
{
"registrars":[],
"dns_providers":[],
"domains":[
"dns_providers": [],
"domains": [
{
"name":"foo.com",
"registrar":"none",
"dnsProviders":{},
"records":[
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"type":"TLSA",
"name":"_443._tcp",
"target":"MDFiYTQ3MTljODBiNmZlOTExYjA5MWE3YzA1MTI0YjY0ZWVlY2U5NjRlMDljMDU4ZWY4Zjk4MDVkYWNhNTQ2YiAgLQo=",
"tlsausage":3,
"tlsaselector":1,
"tlsamatchingtype":1
"name": "_443._tcp",
"target": "MDFiYTQ3MTljODBiNmZlOTExYjA5MWE3YzA1MTI0YjY0ZWVlY2U5NjRlMDljMDU4ZWY4Zjk4MDVkYWNhNTQ2YiAgLQo=",
"tlsamatchingtype": 1,
"tlsaselector": 1,
"tlsausage": 3,
"type": "TLSA"
}
]
],
"registrar": "none"
}
]
],
"registrars": []
}

34
pkg/js/parse_tests/016-backslash.json
View File

@ -1,20 +1,22 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
"dns_providers": [],
"domains": [
{
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
{
"type": "TXT",
"name": "_dmarc",
"target": "v=DMARC1\\; p=reject\\; sp=reject\\; pct=100\\; rua=mailto:xx...@yyyy.com\\; ruf=mailto:xx...@yyyy.com\\; fo=1",
"ttl": 300,
"txtstrings":["v=DMARC1\\; p=reject\\; sp=reject\\; pct=100\\; rua=mailto:xx...@yyyy.com\\; ruf=mailto:xx...@yyyy.com\\; fo=1"]
}
]
"name": "_dmarc",
"target": "v=DMARC1\\; p=reject\\; sp=reject\\; pct=100\\; rua=mailto:xx...@yyyy.com\\; ruf=mailto:xx...@yyyy.com\\; fo=1",
"ttl": 300,
"txtstrings": [
"v=DMARC1\\; p=reject\\; sp=reject\\; pct=100\\; rua=mailto:xx...@yyyy.com\\; ruf=mailto:xx...@yyyy.com\\; fo=1"
],
"type": "TXT"
}
]
],
"registrar": "none"
}
],
"registrars": []
}

37
pkg/js/parse_tests/017-txt.json
View File

@ -1,37 +1,48 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"type": "TXT",
"name": "@",
"target": "simple",
"txtstrings": [ "simple" ]
"txtstrings": [
"simple"
],
"type": "TXT"
},
{
"type": "TXT",
"name": "@",
"target": "one",
"txtstrings": [ "one" ]
"txtstrings": [
"one"
],
"type": "TXT"
},
{
"type": "TXT",
"name": "@",
"target": "bonie",
"txtstrings": [ "bonie", "clyde" ]
"txtstrings": [
"bonie",
"clyde"
],
"type": "TXT"
},
{
"type": "TXT",
"name": "@",
"target": "straw",
"txtstrings": [ "straw", "wood", "brick" ]
"txtstrings": [
"straw",
"wood",
"brick"
],
"type": "TXT"
}
]
],
"registrar": "none"
}
]
],
"registrars": []
}

17
pkg/js/parse_tests/018-dkim.json
View File

@ -1,21 +1,22 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"type": "TXT",
"name": "dkimtest2",
"target": "this string is 255 bytes long.hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnKZogtjOlHoeY8iZ5o5brlPOsj/a2Q9Bopu1kHxlxrdw7tZVL9FzUMngiIYGrl8dbP7Rvk7TLMoxHxVkRZPBtIpsKIab/gOUoPLQVYbrAmzyguHYBwAApi3H/pvjUsK8+XF0dKY17AR96lokAPqvfBaUb+DSx8zNw2hrYWYVqvCtnxHUGEUhT1bTlEZBptH3j",
"txtstrings": ["this string is 255 bytes long.hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnKZogtjOlHoeY8iZ5o5brlPOsj/a2Q9Bopu1kHxlxrdw7tZVL9FzUMngiIYGrl8dbP7Rvk7TLMoxHxVkRZPBtIpsKIab/gOUoPLQVYbrAmzyguHYBwAApi3H/pvjUsK8+XF0dKY17AR96lokAPqvfBaUb+DSx8zNw2hrYWYVqvCtnxHUGEUhT1bTlEZBptH3j",
"txtstrings": [
"this string is 255 bytes long.hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnKZogtjOlHoeY8iZ5o5brlPOsj/a2Q9Bopu1kHxlxrdw7tZVL9FzUMngiIYGrl8dbP7Rvk7TLMoxHxVkRZPBtIpsKIab/gOUoPLQVYbrAmzyguHYBwAApi3H/pvjUsK8+XF0dKY17AR96lokAPqvfBaUb+DSx8zNw2hrYWYVqvCtnxHUGEUhT1bTlEZBptH3j",
"this is the remainder. it is 156 bytes long.mOhl2JmbsFKy+RoMTwbkk0/meRvcEFWLHkr4MSgbnie6OpQvM4Y51+kO6DUVr3rwjrdVO9wpFt+n/hdQ92TNif17RMJtE5AGaQ6BN3yJQIDAQAB;"
]
],
"type": "TXT"
}
]
],
"registrar": "none"
}
]
],
"registrars": []
}

15
pkg/js/parse_tests/019-ignored-records.json
View File

@ -1,16 +1,15 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"records": [
],
"ignored_labels": [
"testignore"
]
],
"name": "foo.com",
"records": [],
"registrar": "none"
}
]
}
],
"registrars": []
}

84
pkg/js/parse_tests/019-r53-alias.json
View File

@ -1,111 +1,111 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"name": "foo.com",
"records": [
{
"type": "R53_ALIAS",
"name": "mxtest",
"target": "foo.com.",
"r53_alias": {
"type": "MX"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "atest",
"target": "foo.com.",
"r53_alias": {
"type": "A"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "atest",
"target": "foo.com.",
"r53_alias": {
"type": "A",
"zone_id": "Z2FTEDLFRTF"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "aaaatest",
"target": "foo.com.",
"r53_alias": {
"type": "AAAA"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "aaaatest",
"target": "foo.com.",
"r53_alias": {
"type": "AAAA",
"zone_id": "ERERTFGFGF"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "cnametest",
"target": "foo.com.",
"r53_alias": {
"type": "CNAME"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "ptrtest",
"target": "foo.com.",
"r53_alias": {
"type": "PTR"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "txttest",
"target": "foo.com.",
"r53_alias": {
"type": "TXT"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "srvtest",
"target": "foo.com.",
"r53_alias": {
"type": "SRV"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "spftest",
"target": "foo.com.",
"r53_alias": {
"type": "SPF"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "caatest",
"target": "foo.com.",
"r53_alias": {
"type": "CAA"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
},
{
"type": "R53_ALIAS",
"name": "naptrtest",
"target": "foo.com.",
"r53_alias": {
"type": "NAPTR"
}
},
"target": "foo.com.",
"type": "R53_ALIAS"
}
]
],
"registrar": "none"
}
]
}
],
"registrars": []
}

16
pkg/js/parse_tests/020-nameserver-ttl.json
View File

@ -1,24 +1,24 @@
{
"registrars": [],
"dns_providers": [],
"domains": [
{
"name": "foo.com",
"registrar": "none",
"dnsProviders": {},
"meta": {
"ns_ttl": "86400"
},
"records": []
"name": "foo.com",
"records": [],
"registrar": "none"
},
{
"name": "bar.com",
"registrar": "none",
"dnsProviders": {},
"meta": {
"ns_ttl": "300"
},
"records": []
"name": "bar.com",
"records": [],
"registrar": "none"
}
]
],
"registrars": []
}