mirror of
https://github.com/tailscale/tailscale.git
synced 2024-12-11 10:44:41 +00:00
a12aad6b47
perl -i -npe 's,netaddr.IPPrefixFrom,netip.PrefixFrom,' $(git grep -l -F netaddr.)
perl -i -npe 's,netaddr.IPPortFrom,netip.AddrPortFrom,' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPPrefix,netip.Prefix,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPPort,netip.AddrPort,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IP\b,netip.Addr,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPv6Raw\b,netip.AddrFrom16,g' $(git grep -l -F netaddr. )
goimports -w .
Then delete some stuff from the net/netaddr shim package which is no
longer neeed.
Updates #5162
Change-Id: Ia7a86893fe21c7e3ee1ec823e8aba288d4566cd8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
80 lines
1.7 KiB
Go
80 lines
1.7 KiB
Go
// Copyright (c) 2022 Tailscale Inc & AUTHORS All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package resolvconffile
|
|
|
|
import (
|
|
"net/netip"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"tailscale.com/util/dnsname"
|
|
)
|
|
|
|
func TestParse(t *testing.T) {
|
|
tests := []struct {
|
|
in string
|
|
want *Config
|
|
wantErr bool
|
|
}{
|
|
{in: `nameserver 192.168.0.100`,
|
|
want: &Config{
|
|
Nameservers: []netip.Addr{
|
|
netip.MustParseAddr("192.168.0.100"),
|
|
},
|
|
},
|
|
},
|
|
{in: `nameserver 192.168.0.100 # comment`,
|
|
want: &Config{
|
|
Nameservers: []netip.Addr{
|
|
netip.MustParseAddr("192.168.0.100"),
|
|
},
|
|
},
|
|
},
|
|
{in: `nameserver 192.168.0.100#`,
|
|
want: &Config{
|
|
Nameservers: []netip.Addr{
|
|
netip.MustParseAddr("192.168.0.100"),
|
|
},
|
|
},
|
|
},
|
|
{in: `nameserver #192.168.0.100`, wantErr: true},
|
|
{in: `nameserver`, wantErr: true},
|
|
{in: `# nameserver 192.168.0.100`, want: &Config{}},
|
|
{in: `nameserver192.168.0.100`, wantErr: true},
|
|
|
|
{in: `search tailsacle.com`,
|
|
want: &Config{
|
|
SearchDomains: []dnsname.FQDN{"tailsacle.com."},
|
|
},
|
|
},
|
|
{in: `search tailsacle.com # typo`,
|
|
want: &Config{
|
|
SearchDomains: []dnsname.FQDN{"tailsacle.com."},
|
|
},
|
|
},
|
|
{in: `searchtailsacle.com`, wantErr: true},
|
|
{in: `search`, wantErr: true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
cfg, err := Parse(strings.NewReader(tt.in))
|
|
if tt.wantErr {
|
|
if err != nil {
|
|
continue
|
|
}
|
|
t.Errorf("missing error for %q", tt.in)
|
|
continue
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error for %q: %v", tt.in, err)
|
|
continue
|
|
}
|
|
if !reflect.DeepEqual(cfg, tt.want) {
|
|
t.Errorf("got: %v\nwant: %v\n", cfg, tt.want)
|
|
}
|
|
}
|
|
}
|