From d59cfabffcea97c8dfcbb56ace7250797cf34ec1 Mon Sep 17 00:00:00 2001 From: Tom Limoncelli <6293917+tlimoncelli@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:53:02 -0500 Subject: [PATCH] CHORE: fmt (#3882) --- commands/types/dnscontrol.d.ts | 7 ++++ models/domain.go | 4 +- package-lock.json | 11 ++--- package.json | 2 +- pkg/diff2/handsoff_test.go | 14 +++---- pkg/js/helpers.js | 12 +++--- .../parse_tests/058-ignore-external-dns.json | 40 +++++++++---------- 7 files changed, 49 insertions(+), 41 deletions(-) diff --git a/commands/types/dnscontrol.d.ts b/commands/types/dnscontrol.d.ts index ae3ab5ac1..65d694af9 100644 --- a/commands/types/dnscontrol.d.ts +++ b/commands/types/dnscontrol.d.ts @@ -1773,6 +1773,13 @@ declare function IGNORE(labelSpec: string, typeSpec?: string, targetSpec?: strin * * ## Caveats * + * ### One per domain + * + * Only one `IGNORE_EXTERNAL_DNS()` should be used per domain. If you call it multiple + * times, the last prefix wins. If you have multiple external-dns instances with + * different prefixes managing the same zone, use `IGNORE()` patterns for additional + * prefixes. + * * ### TXT Registry Format * * This feature relies on external-dns's [TXT registry](https://github.com/kubernetes-sigs/external-dns/blob/master/docs/registry/txt.md), diff --git a/models/domain.go b/models/domain.go index fa8bd9ba6..e45b1fbb8 100644 --- a/models/domain.go +++ b/models/domain.go @@ -40,8 +40,8 @@ type DomainConfig struct { Unmanaged []*UnmanagedConfig `json:"unmanaged,omitempty"` // IGNORE() UnmanagedUnsafe bool `json:"unmanaged_disable_safety_check,omitempty"` // DISABLE_IGNORE_SAFETY_CHECK - IgnoreExternalDNS bool `json:"ignore_external_dns,omitempty"` // IGNORE_EXTERNAL_DNS - ExternalDNSPrefix string `json:"external_dns_prefix,omitempty"` // IGNORE_EXTERNAL_DNS prefix + IgnoreExternalDNS bool `json:"ignore_external_dns,omitempty"` // IGNORE_EXTERNAL_DNS + ExternalDNSPrefix string `json:"external_dns_prefix,omitempty"` // IGNORE_EXTERNAL_DNS prefix AutoDNSSEC string `json:"auto_dnssec,omitempty"` // "", "on", "off" // DNSSEC bool `json:"dnssec,omitempty"` diff --git a/package-lock.json b/package-lock.json index 4fa5d2c5a..8a58e55a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "dependencies": { "@umbrelladocs/linkspector": "^0.3.13", - "prettier": "^3.6.2" + "prettier": "^3.7.4" } }, "node_modules/@babel/code-frame": { @@ -715,7 +715,8 @@ "version": "0.0.1367902", "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1367902.tgz", "integrity": "sha512-XxtPuC3PGakY6PD7dG66/o8KwJ/LkH2/EKe19Dcw58w53dv4/vSQEkn/SzuyhHE2q4zPgCkxQBxus3VV4ql+Pg==", - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/eastasianwidth": { "version": "0.2.0", @@ -2221,9 +2222,9 @@ "license": "ISC" }, "node_modules/prettier": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", - "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.4.tgz", + "integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==", "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" diff --git a/package.json b/package.json index ea57754e9..251b962a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "dependencies": { "@umbrelladocs/linkspector": "^0.3.13", - "prettier": "^3.6.2" + "prettier": "^3.7.4" } } diff --git a/pkg/diff2/handsoff_test.go b/pkg/diff2/handsoff_test.go index ebf2b55c4..b0345d1f7 100644 --- a/pkg/diff2/handsoff_test.go +++ b/pkg/diff2/handsoff_test.go @@ -266,8 +266,8 @@ func Test_ignore_external_dns(t *testing.T) { domain, existing, desired, - nil, // absences - nil, // unmanagedConfigs + nil, // absences + nil, // unmanagedConfigs false, // unmanagedSafely false, // noPurge true, // ignoreExternalDNS @@ -352,11 +352,11 @@ func Test_ignore_external_dns_custom_prefix(t *testing.T) { domain, existing, desired, - nil, // absences - nil, // unmanagedConfigs - false, // unmanagedSafely - false, // noPurge - true, // ignoreExternalDNS + nil, // absences + nil, // unmanagedConfigs + false, // unmanagedSafely + false, // noPurge + true, // ignoreExternalDNS "extdns-", // externalDNSPrefix ) if err != nil { diff --git a/pkg/js/helpers.js b/pkg/js/helpers.js index 46260624f..f46f1e20d 100644 --- a/pkg/js/helpers.js +++ b/pkg/js/helpers.js @@ -866,15 +866,15 @@ function locStringBuilder(record, args) { (args.alt < -100000 ? -100000 : args.alt > 42849672.95 - ? 42849672.95 - : args.alt.toString()) + 'm'; + ? 42849672.95 + : args.alt.toString()) + 'm'; precisionbuffer += ' ' + (args.siz > 90000000 ? 90000000 : args.siz < 0 - ? 0 - : args.siz.toString()) + + ? 0 + : args.siz.toString()) + 'm'; precisionbuffer += ' ' + @@ -914,8 +914,8 @@ function locDMSBuilder(record, args) { record.localtitude > 4294967295 ? 4294967295 : record.localtitude < 0 - ? 0 - : record.localtitude; + ? 0 + : record.localtitude; // Size record.locsize = getENotationInt(args.siz); // Horizontal Precision diff --git a/pkg/js/parse_tests/058-ignore-external-dns.json b/pkg/js/parse_tests/058-ignore-external-dns.json index 7bd32d3a0..0a4f1306d 100644 --- a/pkg/js/parse_tests/058-ignore-external-dns.json +++ b/pkg/js/parse_tests/058-ignore-external-dns.json @@ -1,52 +1,52 @@ { - "registrars": [], "dns_providers": [], "domains": [ { - "name": "extdns-default.com", - "registrar": "none", "dnsProviders": {}, + "ignore_external_dns": true, "meta": { "dnscontrol_uniquename": "extdns-default.com" }, + "name": "extdns-default.com", "records": [], - "ignore_external_dns": true + "registrar": "none" }, { - "name": "extdns-custom.com", - "registrar": "none", "dnsProviders": {}, + "external_dns_prefix": "extdns-", + "ignore_external_dns": true, "meta": { "dnscontrol_uniquename": "extdns-custom.com" }, + "name": "extdns-custom.com", "records": [], - "ignore_external_dns": true, - "external_dns_prefix": "extdns-" + "registrar": "none" }, { - "name": "extdns-combined.com", - "registrar": "none", "dnsProviders": {}, + "ignore_external_dns": true, "meta": { "dnscontrol_uniquename": "extdns-combined.com" }, + "name": "extdns-combined.com", "records": [ { - "type": "CNAME", - "name": "api", - "ttl": 300, "filepos": "[line:12:5]", - "target": "www.extdns-combined.com." + "name": "api", + "target": "www.extdns-combined.com.", + "ttl": 300, + "type": "CNAME" }, { - "type": "A", - "name": "www", - "ttl": 300, "filepos": "[line:11:5]", - "target": "1.2.3.4" + "name": "www", + "target": "1.2.3.4", + "ttl": 300, + "type": "A" } ], - "ignore_external_dns": true + "registrar": "none" } - ] + ], + "registrars": [] }