sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-25 13:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

[management] Restore the drift-guard fixture to the repo's 2-space indent

Browse Source 
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.
This commit is contained in:
riccardom
2026-10-09 13:23:32 +02:00
parent 042c1839f5
commit de1f09417e
3 changed files with 225 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-a.json
Vendored
+112 -112
View File
@@ -1,116 +1,116 @@
{ {
"Serial": "8", "Serial": "8",
"peerConfig": { "peerConfig": {
"address": "100.64.0.1/10", "address": "100.64.0.1/10",
"sshConfig": {}, "sshConfig": {},
"fqdn": "peer-a.netbird.test", "fqdn": "peer-a.netbird.test",
"RoutingPeerDnsResolutionEnabled": true, "RoutingPeerDnsResolutionEnabled": true,
"autoUpdate": {}, "autoUpdate": {},
"debugBundleUploadUrl": "https://upload.example.com/upload-url" "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="
}, },
{ "remotePeers": [
"PeerIP": "100.64.0.2", {
"Direction": "OUT", "wgPubKey": "AvldyrZ12Pf90jzf3AXmhPwg3UcI+jtJHfbpBlupvko=",
"Protocol": "ALL", "allowedIps": [
"PolicyID": "cG9sLW1lc2g=" "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"
}
} }
management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/golden/peer-c.json
Vendored
+46 -46
View File
@@ -1,48 +1,48 @@
{ {
"Serial": "8", "Serial": "8",
"peerConfig": { "peerConfig": {
"address": "100.64.0.3/10", "address": "100.64.0.3/10",
"sshConfig": {}, "sshConfig": {},
"fqdn": "peer-c.netbird.test", "fqdn": "peer-c.netbird.test",
"RoutingPeerDnsResolutionEnabled": true, "RoutingPeerDnsResolutionEnabled": true,
"autoUpdate": {}, "autoUpdate": {},
"debugBundleUploadUrl": "https://upload.example.com/upload-url" "debugBundleUploadUrl": "https://upload.example.com/upload-url"
}, },
"remotePeersIsEmpty": true, "remotePeersIsEmpty": true,
"DNSConfig": { "DNSConfig": {
"ServiceEnable": true, "ServiceEnable": true,
"CustomZones": [ "CustomZones": [
{ {
"Domain": "netbird.test.", "Domain": "netbird.test.",
"Records": [ "Records": [
{ {
"Name": "peer-c.netbird.test", "Name": "peer-c.netbird.test",
"Type": "1", "Type": "1",
"Class": "IN", "Class": "IN",
"TTL": "300", "TTL": "300",
"RData": "100.64.0.3" "RData": "100.64.0.3"
} }
] ]
}, },
{ {
"Domain": "ops-only.internal.", "Domain": "ops-only.internal.",
"NonAuthoritative": true, "NonAuthoritative": true,
"Records": [ "Records": [
{ {
"Name": "tool.ops-only.internal.", "Name": "tool.ops-only.internal.",
"Type": "1", "Type": "1",
"Class": "IN", "Class": "IN",
"TTL": "300", "TTL": "300",
"RData": "10.10.0.7" "RData": "10.10.0.7"
} }
] ]
} }
], ],
"ForwarderPort": "22054" "ForwarderPort": "22054"
}, },
"firewallRulesIsEmpty": true, "firewallRulesIsEmpty": true,
"routesFirewallRulesIsEmpty": true, "routesFirewallRulesIsEmpty": true,
"sshAuth": { "sshAuth": {
"UserIDClaim": "sub" "UserIDClaim": "sub"
} }
} }
management/internals/controllers/network_map/nmaptest/testdata/cases/dns-config/nmdata.json
Vendored
+67 -140
View File
@@ -1,147 +1,74 @@
{ {
"Network": { "Network": {"Serial": 8},
"Serial": 8 "AccountSettings": {"RoutingPeerDNSResolutionEnabled": true, "DebugBundleUploadURL": "https://upload.example.com/upload-url"},
}, "Peers": {
"AccountSettings": { "peer-a": {"IP": "100.64.0.1", "ExtraDNSLabels": ["www"], "Meta": {"WtVersion": "0.60.0"}},
"RoutingPeerDNSResolutionEnabled": true, "peer-b": {"IP": "100.64.0.2", "Meta": {"WtVersion": "0.60.0"}},
"DebugBundleUploadURL": "https://upload.example.com/upload-url" "peer-c": {"IP": "100.64.0.3", "Meta": {"WtVersion": "0.60.0"}}
},
"Peers": {
"peer-a": {
"IP": "100.64.0.1",
"ExtraDNSLabels": [
"www"
],
"Meta": {
"WtVersion": "0.60.0"
}
}, },
"peer-b": { "Groups": {
"IP": "100.64.0.2", "grp-dev": {"Peers": ["peer-a", "peer-b"]},
"Meta": { "grp-ops": {"Peers": ["peer-c"]}
"WtVersion": "0.60.0"
}
}, },
"peer-c": { "Policies": [
"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": [
{ {
"Enabled": true, "ID": "pol-mesh",
"Action": "accept", "PublicID": "pol-mesh-pub",
"Protocol": "all", "Enabled": true,
"Bidirectional": true, "Rules": [
"Sources": [ {
"grp-dev" "Enabled": true,
], "Action": "accept",
"Destinations": [ "Protocol": "all",
"grp-dev" "Bidirectional": true,
] "Sources": ["grp-dev"],
"Destinations": ["grp-dev"]
}
]
} }
] ],
} "NameServerGroups": [
],
"NameServerGroups": [
{
"ID": "nsg-1",
"Name": "dns-primary",
"NameServers": [
{ {
"IP": "8.8.8.8", "ID": "nsg-1",
"Port": 53 "Name": "dns-primary",
"NameServers": [{"IP": "8.8.8.8", "Port": 53}],
"Groups": ["grp-dev"],
"Primary": true,
"Enabled": true
} }
], ],
"Groups": [ "AppliedZoneCandidates": [
"grp-dev" {
], "DistributionGroups": ["grp-dev"],
"Primary": true, "Zone": {
"Enabled": true "Domain": "corp.internal.",
} "NonAuthoritative": true,
], "Records": [
"AppliedZoneCandidates": [ {"Name": "db.corp.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.5"}
{ ]
"DistributionGroups": [ }
"grp-dev" },
], {
"Zone": { "DistributionGroups": ["grp-dev"],
"Domain": "corp.internal.", "Zone": {
"NonAuthoritative": true, "Domain": "search-off.internal.",
"Records": [ "NonAuthoritative": true,
{ "SearchDomainDisabled": true,
"Name": "db.corp.internal.", "Records": [
"Type": 1, {"Name": "app.search-off.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.6"},
"Class": "IN", {"Name": "alias.search-off.internal.", "Type": 5, "Class": "IN", "TTL": 300, "RData": "app.search-off.internal."}
"TTL": 300, ]
"RData": "10.10.0.5" }
} },
] {
} "DistributionGroups": ["grp-ops"],
}, "Zone": {
{ "Domain": "ops-only.internal.",
"DistributionGroups": [ "NonAuthoritative": true,
"grp-dev" "Records": [
], {"Name": "tool.ops-only.internal.", "Type": 1, "Class": "IN", "TTL": 300, "RData": "10.10.0.7"}
"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"
}
]
}
}
]
}