Skip to content

Target Tailscale version to v1.30.0 (and replace inet.af/netaddr with net/netip) #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 4, 2022
Merged

Target Tailscale version to v1.30.0 (and replace inet.af/netaddr with net/netip) #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
12385d4
Target Tailscale v1.30.0
juanfont Sep 1, 2022
197da8a
Migrate config.go to net/netip
juanfont Sep 1, 2022
a24710a
Migrate machine to net/netip
juanfont Sep 1, 2022
cdf48b1
Migrate utils to net/netip
juanfont Sep 1, 2022
290ec8b
Migrate ACLs to net/netip
juanfont Sep 1, 2022
7af7815
Migrate routes to net/netip
juanfont Sep 1, 2022
64ede5d
Move namespaces unit tests to net/netip
juanfont Sep 2, 2022
efb12f2
Move db to net/netip
juanfont Sep 2, 2022
71410cb
Port dns to net/netip
juanfont Sep 2, 2022
51abf90
Use net/netip in derp server
juanfont Sep 2, 2022
d5cc5b2
Move integration tests to net/netip
juanfont Sep 2, 2022
d294114
Merge branch 'main' into bump-tailscale-v1.30
juanfont Sep 3, 2022
2733fb3
Minor change in go.mod
juanfont Sep 3, 2022
30c0fdb
Update changelog
juanfont Sep 3, 2022
38b26f5
Merge branch 'main' into bump-ts1.30
juanfont Sep 3, 2022
198e92c
Remove dependency on netaddr
juanfont Sep 3, 2022
32d68a4
Update flake sha
juanfont Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Added support for Tailscale TS2021 protocol [#738](https://github.com/juanfont/headscale/pull/738)
- Add ability to specify config location via env var `HEADSCALE_CONFIG` [#674](https://github.com/juanfont/headscale/issues/674)
- Target Go 1.19 for Headscale [#778](https://github.com/juanfont/headscale/pull/778)
- Target Tailscale v1.30.0 to build Headscale [#780](https://github.com/juanfont/headscale/pull/780)

## 0.16.4 (2022-08-21)

Expand Down
6 changes: 3 additions & 3 deletions acls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"io"
"net/netip"
"os"
"path/filepath"
"strconv"
Expand All @@ -13,7 +14,6 @@ import (
"github.com/rs/zerolog/log"
"github.com/tailscale/hujson"
"gopkg.in/yaml.v3"
"inet.af/netaddr"
"tailscale.com/tailcfg"
)

Expand Down Expand Up @@ -394,13 +394,13 @@ func expandAlias(
}

// if alias is an IP
ip, err := netaddr.ParseIP(alias)
ip, err := netip.ParseAddr(alias)
if err == nil {
return []string{ip.String()}, nil
}

// if alias is an CIDR
cidr, err := netaddr.ParseIPPrefix(alias)
cidr, err := netip.ParsePrefix(alias)
if err == nil {
return []string{cidr.String()}, nil
}
Expand Down
Loading