From de1f09417e93adfc52e877c754b4306ee7adc03b Mon Sep 17 00:00:00 2001 From: riccardom Date: Fri, 9 Oct 2026 13:23:32 +0200 Subject: [PATCH] [management] Restore the drift-guard fixture to the repo's 2-space indent The previous commit edited these three files through a JSON round-trip that reindented them to one space, which made dns-config the only case formatted differently and buried a three-line change in 220 lines of whitespace. The comparison unmarshals before diffing, so the layout was never load-bearing; this is purely about the diff a reviewer has to read. Same content, edited in place this time. --- .../cases/dns-config/golden/peer-a.json | 224 +++++++++--------- .../cases/dns-config/golden/peer-c.json | 92 +++---- .../testdata/cases/dns-config/nmdata.json | 207 ++++++---------- 3 files changed, 225 insertions(+), 298 deletions(-) diff --git a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-a.json b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-a.json index b83928a1d..734c33485 100644 --- a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-a.json +++ b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-a.json @@ -1,116 +1,116 @@ { - "Serial": "8", - "peerConfig": { - "address": "100.64.0.1/10", - "sshConfig": {}, - "fqdn": "peer-a.netbird.test", - "RoutingPeerDnsResolutionEnabled": true, - "autoUpdate": {}, - "debugBundleUploadUrl": "https://upload.example.com/upload-url" - }, - "remotePeers": [ - { - "wgPubKey": "AvldyrZ12Pf90jzf3AXmhPwg3UcI+jtJHfbpBlupvko=", - "allowedIps": [ - "100.64.0.2/32" - ], - "sshConfig": {}, - "fqdn": "peer-b.netbird.test", - "agentVersion": "0.60.0" - } - ], - "DNSConfig": { - "ServiceEnable": true, - "NameServerGroups": [ - { - "NameServers": [ - { - "IP": "8.8.8.8", - "Port": "53" - } - ], - "Primary": true - } - ], - "CustomZones": [ - { - "Domain": "corp.internal.", - "NonAuthoritative": true, - "Records": [ - { - "Name": "db.corp.internal.", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "10.10.0.5" - } - ] - }, - { - "Domain": "search-off.internal.", - "SearchDomainDisabled": true, - "NonAuthoritative": true, - "Records": [ - { - "Name": "alias.search-off.internal.", - "Type": "5", - "Class": "IN", - "TTL": "300", - "RData": "app.search-off.internal." - }, - { - "Name": "app.search-off.internal.", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "10.10.0.6" - } - ] - }, - { - "Domain": "netbird.test.", - "Records": [ - { - "Name": "peer-a.netbird.test", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "100.64.0.1" - }, - { - "Name": "peer-b.netbird.test", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "100.64.0.2" - }, - { - "Name": "www.netbird.test", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "100.64.0.1" - } - ] - } - ], - "ForwarderPort": "22054" - }, - "FirewallRules": [ - { - "PeerIP": "100.64.0.2", - "Protocol": "ALL", - "PolicyID": "cG9sLW1lc2g=" + "Serial": "8", + "peerConfig": { + "address": "100.64.0.1/10", + "sshConfig": {}, + "fqdn": "peer-a.netbird.test", + "RoutingPeerDnsResolutionEnabled": true, + "autoUpdate": {}, + "debugBundleUploadUrl": "https://upload.example.com/upload-url" }, - { - "PeerIP": "100.64.0.2", - "Direction": "OUT", - "Protocol": "ALL", - "PolicyID": "cG9sLW1lc2g=" + "remotePeers": [ + { + "wgPubKey": "AvldyrZ12Pf90jzf3AXmhPwg3UcI+jtJHfbpBlupvko=", + "allowedIps": [ + "100.64.0.2/32" + ], + "sshConfig": {}, + "fqdn": "peer-b.netbird.test", + "agentVersion": "0.60.0" + } + ], + "DNSConfig": { + "ServiceEnable": true, + "NameServerGroups": [ + { + "NameServers": [ + { + "IP": "8.8.8.8", + "Port": "53" + } + ], + "Primary": true + } + ], + "CustomZones": [ + { + "Domain": "corp.internal.", + "NonAuthoritative": true, + "Records": [ + { + "Name": "db.corp.internal.", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "10.10.0.5" + } + ] + }, + { + "Domain": "search-off.internal.", + "SearchDomainDisabled": true, + "NonAuthoritative": true, + "Records": [ + { + "Name": "alias.search-off.internal.", + "Type": "5", + "Class": "IN", + "TTL": "300", + "RData": "app.search-off.internal." + }, + { + "Name": "app.search-off.internal.", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "10.10.0.6" + } + ] + }, + { + "Domain": "netbird.test.", + "Records": [ + { + "Name": "peer-a.netbird.test", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "100.64.0.1" + }, + { + "Name": "peer-b.netbird.test", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "100.64.0.2" + }, + { + "Name": "www.netbird.test", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "100.64.0.1" + } + ] + } + ], + "ForwarderPort": "22054" + }, + "FirewallRules": [ + { + "PeerIP": "100.64.0.2", + "Protocol": "ALL", + "PolicyID": "cG9sLW1lc2g=" + }, + { + "PeerIP": "100.64.0.2", + "Direction": "OUT", + "Protocol": "ALL", + "PolicyID": "cG9sLW1lc2g=" + } + ], + "routesFirewallRulesIsEmpty": true, + "sshAuth": { + "UserIDClaim": "sub" } - ], - "routesFirewallRulesIsEmpty": true, - "sshAuth": { - "UserIDClaim": "sub" - } } diff --git a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-c.json b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-c.json index e4bd074a7..277a2751d 100644 --- a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-c.json +++ b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-c.json @@ -1,48 +1,48 @@ { - "Serial": "8", - "peerConfig": { - "address": "100.64.0.3/10", - "sshConfig": {}, - "fqdn": "peer-c.netbird.test", - "RoutingPeerDnsResolutionEnabled": true, - "autoUpdate": {}, - "debugBundleUploadUrl": "https://upload.example.com/upload-url" - }, - "remotePeersIsEmpty": true, - "DNSConfig": { - "ServiceEnable": true, - "CustomZones": [ - { - "Domain": "netbird.test.", - "Records": [ - { - "Name": "peer-c.netbird.test", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "100.64.0.3" - } - ] - }, - { - "Domain": "ops-only.internal.", - "NonAuthoritative": true, - "Records": [ - { - "Name": "tool.ops-only.internal.", - "Type": "1", - "Class": "IN", - "TTL": "300", - "RData": "10.10.0.7" - } - ] - } - ], - "ForwarderPort": "22054" - }, - "firewallRulesIsEmpty": true, - "routesFirewallRulesIsEmpty": true, - "sshAuth": { - "UserIDClaim": "sub" - } + "Serial": "8", + "peerConfig": { + "address": "100.64.0.3/10", + "sshConfig": {}, + "fqdn": "peer-c.netbird.test", + "RoutingPeerDnsResolutionEnabled": true, + "autoUpdate": {}, + "debugBundleUploadUrl": "https://upload.example.com/upload-url" + }, + "remotePeersIsEmpty": true, + "DNSConfig": { + "ServiceEnable": true, + "CustomZones": [ + { + "Domain": "netbird.test.", + "Records": [ + { + "Name": "peer-c.netbird.test", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "100.64.0.3" + } + ] + }, + { + "Domain": "ops-only.internal.", + "NonAuthoritative": true, + "Records": [ + { + "Name": "tool.ops-only.internal.", + "Type": "1", + "Class": "IN", + "TTL": "300", + "RData": "10.10.0.7" + } + ] + } + ], + "ForwarderPort": "22054" + }, + "firewallRulesIsEmpty": true, + "routesFirewallRulesIsEmpty": true, + "sshAuth": { + "UserIDClaim": "sub" + } } diff --git a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/nmdata.json b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/nmdata.json index 14777d392..23bea3739 100644 --- a/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/nmdata.json +++ b/management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/nmdata.json @@ -1,147 +1,74 @@ { - "Network": { - "Serial": 8 - }, - "AccountSettings": { - "RoutingPeerDNSResolutionEnabled": true, - "DebugBundleUploadURL": "https://upload.example.com/upload-url" - }, - "Peers": { - "peer-a": { - "IP": "100.64.0.1", - "ExtraDNSLabels": [ - "www" - ], - "Meta": { - "WtVersion": "0.60.0" - } + "Network": {"Serial": 8}, + "AccountSettings": {"RoutingPeerDNSResolutionEnabled": true, "DebugBundleUploadURL": "https://upload.example.com/upload-url"}, + "Peers": { + "peer-a": {"IP": "100.64.0.1", "ExtraDNSLabels": ["www"], "Meta": {"WtVersion": "0.60.0"}}, + "peer-b": {"IP": "100.64.0.2", "Meta": {"WtVersion": "0.60.0"}}, + "peer-c": {"IP": "100.64.0.3", "Meta": {"WtVersion": "0.60.0"}} }, - "peer-b": { - "IP": "100.64.0.2", - "Meta": { - "WtVersion": "0.60.0" - } + "Groups": { + "grp-dev": {"Peers": ["peer-a", "peer-b"]}, + "grp-ops": {"Peers": ["peer-c"]} }, - "peer-c": { - "IP": "100.64.0.3", - "Meta": { - "WtVersion": "0.60.0" - } - } - }, - "Groups": { - "grp-dev": { - "Peers": [ - "peer-a", - "peer-b" - ] - }, - "grp-ops": { - "Peers": [ - "peer-c" - ] - } - }, - "Policies": [ - { - "ID": "pol-mesh", - "PublicID": "pol-mesh-pub", - "Enabled": true, - "Rules": [ + "Policies": [ { - "Enabled": true, - "Action": "accept", - "Protocol": "all", - "Bidirectional": true, - "Sources": [ - "grp-dev" - ], - "Destinations": [ - "grp-dev" - ] + "ID": "pol-mesh", + "PublicID": "pol-mesh-pub", + "Enabled": true, + "Rules": [ + { + "Enabled": true, + "Action": "accept", + "Protocol": "all", + "Bidirectional": true, + "Sources": ["grp-dev"], + "Destinations": ["grp-dev"] + } + ] } - ] - } - ], - "NameServerGroups": [ - { - "ID": "nsg-1", - "Name": "dns-primary", - "NameServers": [ + ], + "NameServerGroups": [ { - "IP": "8.8.8.8", - "Port": 53 + "ID": "nsg-1", + "Name": "dns-primary", + "NameServers": [{"IP": "8.8.8.8", "Port": 53}], + "Groups": ["grp-dev"], + "Primary": true, + "Enabled": true } - ], - "Groups": [ - "grp-dev" - ], - "Primary": true, - "Enabled": true - } - ], - "AppliedZoneCandidates": [ - { - "DistributionGroups": [ - "grp-dev" - ], - "Zone": { - "Domain": "corp.internal.", - "NonAuthoritative": true, - "Records": [ - { - "Name": "db.corp.internal.", - "Type": 1, - "Class": "IN", - "TTL": 300, - "RData": "10.10.0.5" - } - ] - } - }, - { - "DistributionGroups": [ - "grp-dev" - ], - "Zone": { - "Domain": "search-off.internal.", - "NonAuthoritative": true, - "SearchDomainDisabled": true, - "Records": [ - { - "Name": "app.search-off.internal.", - "Type": 1, - "Class": "IN", - "TTL": 300, - "RData": "10.10.0.6" - }, - { - "Name": "alias.search-off.internal.", - "Type": 5, - "Class": "IN", - "TTL": 300, - "RData": "app.search-off.internal." - } - ] - } - }, - { - "DistributionGroups": [ - "grp-ops" - ], - "Zone": { - "Domain": "ops-only.internal.", - "NonAuthoritative": true, - "Records": [ - { - "Name": "tool.ops-only.internal.", - "Type": 1, - "Class": "IN", - "TTL": 300, - "RData": "10.10.0.7" - } - ] - } - } - ] -} + ], + "AppliedZoneCandidates": [ + { + "DistributionGroups": ["grp-dev"], + "Zone": { + "Domain": "corp.internal.", + "NonAuthoritative": true, + "Records": [ + {"Name": "db.corp.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.5"} + ] + } + }, + { + "DistributionGroups": ["grp-dev"], + "Zone": { + "Domain": "search-off.internal.", + "NonAuthoritative": true, + "SearchDomainDisabled": true, + "Records": [ + {"Name": "app.search-off.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.6"}, + {"Name": "alias.search-off.internal.", "Type": 5, "Class": "IN", "TTL": 300, "RData": "app.search-off.internal."} + ] + } + }, + { + "DistributionGroups": ["grp-ops"], + "Zone": { + "Domain": "ops-only.internal.", + "NonAuthoritative": true, + "Records": [ + {"Name": "tool.ops-only.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.7"} + ] + } + } + ] +} \ No newline at end of file