From 5c24f6ce39db6c4337885a23aef05cbc48181a90 Mon Sep 17 00:00:00 2001 From: Craig Peterson Date: Mon, 6 May 2019 11:12:42 -0400 Subject: [PATCH] fix some tests --- models/domain.go | 1 + pkg/js/parse_tests/022-sshfp.json | 113 +++++++++++++++--------------- pkg/js/parse_tests/023-naptr.js | 4 +- pkg/js/parse_tests/023-naptr.json | 26 +++---- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/models/domain.go b/models/domain.go index ad20b23f0..633e7e47e 100644 --- a/models/domain.go +++ b/models/domain.go @@ -17,6 +17,7 @@ type DomainConfig struct { Nameservers []*Nameserver `json:"nameservers,omitempty"` KeepUnknown bool `json:"keepunknown,omitempty"` IgnoredLabels []string `json:"ignored_labels,omitempty"` + //DNSSEC bool `json:"dnssec,omitempty"` // These fields contain instantiated provider instances once everything is linked up. // This linking is in two phases: diff --git a/pkg/js/parse_tests/022-sshfp.json b/pkg/js/parse_tests/022-sshfp.json index 43c876540..40a79defe 100644 --- a/pkg/js/parse_tests/022-sshfp.json +++ b/pkg/js/parse_tests/022-sshfp.json @@ -1,61 +1,58 @@ { "registrars": [], "dns_providers": [], - "domains": [ - { - "name": "foo.com", - "registrar": "none", - "dnsProviders": {}, - "records": [ - { - "type": "SSHFP", - "algorithm": 1, - "fingerprint": 1, - "value": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c" - }, - { - "type": "SSHFP", - "algorithm": 1, - "fingerprint": 2, - "value": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc" - }, - { - "type": "SSHFP", - "algorithm": 2, - "fingerprint": 1, - "value": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c" - }, - { - "type": "SSHFP", - "algorithm": 2, - "fingerprint": 2, - "value": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc" - }, - { - "type": "SSHFP", - "algorithm": 3, - "fingerprint": 1, - "value": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c" - }, - { - "type": "SSHFP", - "algorithm": 3, - "fingerprint": 2, - "value": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc" - }, - { - "type": "SSHFP", - "algorithm": 4, - "fingerprint": 1, - "value": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c" - }, - { - "type": "SSHFP", - "algorithm": 4, - "fingerprint": 2, - "value": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc" - } - ] - } - ] -} + "domains": [{ + "name": "foo.com", + "registrar": "none", + "dnsProviders": {}, + "records": [{ + "type": "SSHFP", + "name": "@", + "target": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c", + "sshfpalgorithm": 1, + "sshfpfingerprint": 1 + }, { + "type": "SSHFP", + "name": "@", + "target": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc", + "sshfpalgorithm": 1, + "sshfpfingerprint": 2 + }, { + "type": "SSHFP", + "name": "@", + "target": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c", + "sshfpalgorithm": 2, + "sshfpfingerprint": 1 + }, { + "type": "SSHFP", + "name": "@", + "target": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc", + "sshfpalgorithm": 2, + "sshfpfingerprint": 2 + }, { + "type": "SSHFP", + "name": "@", + "target": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c", + "sshfpalgorithm": 3, + "sshfpfingerprint": 1 + }, { + "type": "SSHFP", + "name": "@", + "target": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc", + "sshfpalgorithm": 3, + "sshfpfingerprint": 2 + }, { + "type": "SSHFP", + "name": "@", + "target": "66c7d5540b7d75a1fb4c84febfa178ad99bdd67c", + "sshfpalgorithm": 4, + "sshfpfingerprint": 1 + }, { + "type": "SSHFP", + "name": "@", + "target": "745a635bc46a397a5c4f21d437483005bcc40d7511ff15fbfafe913a081559bc", + "sshfpalgorithm": 4, + "sshfpfingerprint": 2 + }] + }] +} \ No newline at end of file diff --git a/pkg/js/parse_tests/023-naptr.js b/pkg/js/parse_tests/023-naptr.js index fa2a8828d..6a7299670 100644 --- a/pkg/js/parse_tests/023-naptr.js +++ b/pkg/js/parse_tests/023-naptr.js @@ -1,4 +1,4 @@ D("foo.com","none", - NAPTR("foo.com",100,10,"U","E2U+sip","!^.*$!sip:customer-service@example.com!","example"), - NAPTR("foo.com",102,10,"U","E2U+email","!^.*$!mailto:information@example.com!","example") + NAPTR("@",100,10,"U","E2U+sip","!^.*$!sip:customer-service@example.com!","example"), + NAPTR("@",102,10,"U","E2U+email","!^.*$!mailto:information@example.com!","example") ); diff --git a/pkg/js/parse_tests/023-naptr.json b/pkg/js/parse_tests/023-naptr.json index 6dd26e833..87736f352 100644 --- a/pkg/js/parse_tests/023-naptr.json +++ b/pkg/js/parse_tests/023-naptr.json @@ -9,21 +9,23 @@ "records": [ { "type": "NAPTR", - "order": 100, - "preference": 10, - "flags": "U", - "service": "E2U+sip", - "regexp": "!^.*$!sip:customer-service@example.com!", - "target": "example" + "name": "@", + "target": "example", + "naptrorder": 100, + "naptrpreference": 10, + "naptrflags": "U", + "naptrservice": "E2U+sip", + "naptrregexp": "!^.*$!sip:customer-service@example.com!" }, { "type": "NAPTR", - "order": 102, - "preference": 10, - "flags": "U", - "service": "E2U+email", - "regexp": "!^.*$!mailto:information@example.com!", - "target": "example" + "name": "@", + "target": "example", + "naptrorder": 102, + "naptrpreference": 10, + "naptrflags": "U", + "naptrservice": "E2U+email", + "naptrregexp": "!^.*$!mailto:information@example.com!" } ] }