Skip to content

Commit

Permalink
go.mod: update to 1.30.1 (#154)
Browse files Browse the repository at this point in the history
Signed-off-by: Denton Gentry <dgentry@tailscale.com>

Signed-off-by: Denton Gentry <dgentry@tailscale.com>
  • Loading branch information
DentonGentry committed Sep 9, 2022
1 parent 144c69f commit 6eabefb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/tailscale/tailscale-client-go v1.6.0
golang.org/x/tools v0.1.12
inet.af/netaddr v0.0.0-20220811202034-502d2d690317
tailscale.com v1.28.0
tailscale.com v1.30.1
)

require (
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -410,5 +410,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 h1:U2fwK6P2EqmopP/hFLTOAjWTki0qgd4GMJn5X8wOleU=
inet.af/netaddr v0.0.0-20220811202034-502d2d690317/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k=
tailscale.com v1.28.0 h1:eW5bJMqw6eu7YUjBcgJY94uIcm5Zv+xpyTxxa7ztZOM=
tailscale.com v1.28.0/go.mod h1:T9uKhlkxVPdSu1Qvp882evcS/hQ1+TAyZ7sJ/VACGRI=
tailscale.com v1.30.1 h1:ZhacIpLTAtlxJwTCvBz0ZpwMFeyvn2CvVAuIIRIWm5Y=
tailscale.com v1.30.1/go.mod h1:MO+tWkQp2YIF3KBnnej/mQvgYccRS5Xk/IrEpZ4Z3BU=
4 changes: 2 additions & 2 deletions tailscale/data_source_4via6.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package tailscale

import (
"context"
"net/netip"

"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"inet.af/netaddr"
"tailscale.com/net/tsaddr"
)

Expand Down Expand Up @@ -38,7 +38,7 @@ func dataSource4Via6() *schema.Resource {

func dataSource4Via6Read(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
site := uint32(d.Get("site").(int))
cidr, err := netaddr.ParseIPPrefix(d.Get("cidr").(string))
cidr, err := netip.ParsePrefix(d.Get("cidr").(string))
if err != nil {
return diagnosticsError(err, "Provided CIDR is invalid")
}
Expand Down
4 changes: 2 additions & 2 deletions tailscale/data_source_4via6_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package tailscale_test

import (
"fmt"
"net/netip"
"strconv"
"testing"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
"inet.af/netaddr"
"tailscale.com/net/tsaddr"
)

Expand Down Expand Up @@ -57,7 +57,7 @@ func check4Via6Result(n string) resource.TestCheckFunc {
return fmt.Errorf("attribute cidr expected to not be nil")
}

cidr, err := netaddr.ParseIPPrefix(cidrAttr)
cidr, err := netip.ParsePrefix(cidrAttr)
if err != nil {
return fmt.Errorf("invalid CIDR %q: %s", cidrAttr, err)
}
Expand Down

0 comments on commit 6eabefb

Please sign in to comment.