mirror of
https://github.com/tailscale/tailscale.git
synced 2025-08-13 22:47:30 +00:00
better docstrings, try to appease linter in test file
Signed-off-by: Michael Ben-Ami <mzb@tailscale.com>
This commit is contained in:
@@ -2122,7 +2122,6 @@ func TestDNSConfigForNetmapForExitNodeConfigs(t *testing.T) {
|
||||
"empty.example.com.": []*dnstype.Resolver{},
|
||||
"route.example.com.": {{Addr: "route.example.com"}},
|
||||
}
|
||||
_ = containsEmptyRoutes
|
||||
containsFlaggedRoutes := map[dnsname.FQDN][]*dnstype.Resolver{
|
||||
"route.example.com.": {{Addr: "route.example.com"}},
|
||||
"withexit.example.com.": {{Addr: tsUseWithExitNodeResolverAddr}},
|
||||
@@ -2132,7 +2131,6 @@ func TestDNSConfigForNetmapForExitNodeConfigs(t *testing.T) {
|
||||
"route.example.com.": {{Addr: "route.example.com"}},
|
||||
"withexit.example.com.": {{Addr: tsUseWithExitNodeResolverAddr}},
|
||||
}
|
||||
_ = containsFlaggedAndEmptyRoutes
|
||||
flaggedRoutes := map[dnsname.FQDN][]*dnstype.Resolver{
|
||||
"withexit.example.com.": {{Addr: tsUseWithExitNodeResolverAddr}},
|
||||
}
|
||||
@@ -2143,7 +2141,6 @@ func TestDNSConfigForNetmapForExitNodeConfigs(t *testing.T) {
|
||||
"empty.example.com.": []*dnstype.Resolver{},
|
||||
"withexit.example.com.": {{Addr: tsUseWithExitNodeResolverAddr}},
|
||||
}
|
||||
_ = flaggedAndEmptyRoutes
|
||||
|
||||
stringifyRoutes := func(routes map[dnsname.FQDN][]*dnstype.Resolver) map[string][]*tailcfg.DNSResolver {
|
||||
if routes == nil {
|
||||
|
@@ -1699,11 +1699,16 @@ var FilterAllowAll = []FilterRule{
|
||||
},
|
||||
}
|
||||
|
||||
// DNSResolver embeds dnstype.Resolver and stores
|
||||
// additional configuration.
|
||||
// DNSResolver describes a single DNS resolver and any special handling needed when
|
||||
// using that resolver.
|
||||
type DNSResolver struct {
|
||||
dnstype.Resolver `json:",omitempty"`
|
||||
UseWithExitNode bool `json:",omitempty"`
|
||||
|
||||
// UseWithExitNode designates that this resolver should continue to be used when an
|
||||
// exit node is in use. Normally, DNS resolution is delegated to the exit node but
|
||||
// there are situations where it is preferable to still use a Split DNS server and/or
|
||||
// global DNS server instead of the exit node.
|
||||
UseWithExitNode bool `json:",omitempty"`
|
||||
}
|
||||
|
||||
// DNSConfig is the DNS configuration.
|
||||
|
Reference in New Issue
Block a user