refactor: update import paths to use the new repository structure

WireKCP · Nov 15, 2024 · b3fe21b · b3fe21b
1 parent d56e503
commit b3fe21b
Show file tree

Hide file tree

Showing 31 changed files with 61 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# wgctrl [![Test Status](https://github.com/WireKCP/wkctrl/workflows/Linux%20Test/badge.svg)](https://github.com/WireKCP/wkctrl/actions) [![Go Reference](https://pkg.go.dev/badge/golang.zx2c4.com/wirekcp/wkctrl.svg)](https://pkg.go.dev/golang.zx2c4.com/wirekcp/wkctrl) [![Go Report Card](https://goreportcard.com/badge/github.com/wirekcp/wkctrl)](https://goreportcard.com/report/github.com/wirekcp/wkctrl)
+# wgctrl [![Test Status](https://github.com/WireKCP/wgctrl/workflows/Linux%20Test/badge.svg)](https://github.com/WireKCP/wgctrl/actions) [![Go Reference](https://pkg.go.dev/badge/github.com/wirekcp/wgctrl.svg)](https://pkg.go.dev/github.com/wirekcp/wgctrl) [![Go Report Card](https://goreportcard.com/badge/github.com/wirekcp/wgctrl)](https://goreportcard.com/report/github.com/wirekcp/wgctrl)
 
 
 Package `wgctrl` enables control of WireGuard devices on multiple platforms.
@@ -22,7 +22,7 @@ As new operating systems add support for in-kernel WireGuard implementations,
 this package should also be extended to support those native implementations.
 
 If you are aware of any efforts on this front, please
-[file an issue](https://github.com/WireKCP/wkctrl/issues/new).
+[file an issue](https://github.com/WireKCP/wgctrl/issues/new).
 
 This package implements WireGuard configuration protocol operations, enabling
 the configuration of existing WireGuard devices. Operations such as creating

diff --git a/client.go b/client.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"os"
 
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // Expose an identical interface to the underlying packages.

diff --git a/client_integration_test.go b/client_integration_test.go
@@ -13,10 +13,10 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/mikioh/ipaddr"
-	"golang.zx2c4.com/wireguard/wgctrl"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgtest"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wgtest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 func TestIntegrationClient(t *testing.T) {

diff --git a/client_test.go b/client_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 var (

diff --git a/cmd/wgctrl/main.go b/cmd/wgctrl/main.go
@@ -9,8 +9,8 @@ import (
 	"net"
 	"strings"
 
-	"golang.zx2c4.com/wireguard/wgctrl"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module golang.zx2c4.com/wireguard/wgctrl
+module github.com/wirekcp/wgctrl
 
 go 1.20
 

diff --git a/internal/wgfreebsd/client_freebsd.go b/internal/wgfreebsd/client_freebsd.go
@@ -17,11 +17,11 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/wirekcp/wgctrl/internal/wgfreebsd/internal/nv"
+	"github.com/wirekcp/wgctrl/internal/wgfreebsd/internal/wgh"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgfreebsd/internal/nv"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgfreebsd/internal/wgh"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 // ifGroupWG is the WireGuard interface group name passed to the kernel.

diff --git a/internal/wgfreebsd/internal/nv/nvlist_test.go b/internal/wgfreebsd/internal/nv/nvlist_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgfreebsd/internal/nv"
+	"github.com/wirekcp/wgctrl/internal/wgfreebsd/internal/nv"
 )
 
 func TestMarshaling(t *testing.T) {

diff --git a/internal/wginternal/client.go b/internal/wginternal/client.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"io"
 
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // ErrReadOnly indicates that the driver backing a device is read-only. It is

diff --git a/internal/wglinux/client_linux.go b/internal/wglinux/client_linux.go
@@ -12,9 +12,9 @@ import (
 	"github.com/mdlayher/genetlink"
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nlenc"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 var _ wginternal.Client = &Client{}

diff --git a/internal/wglinux/client_linux_test.go b/internal/wglinux/client_linux_test.go
@@ -19,8 +19,8 @@ import (
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nlenc"
 	"github.com/mdlayher/netlink/nltest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 const (

diff --git a/internal/wglinux/configure_linux.go b/internal/wglinux/configure_linux.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nlenc"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 // configAttrs creates the required encoded netlink attributes to configure

diff --git a/internal/wglinux/configure_linux_test.go b/internal/wglinux/configure_linux_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nlenc"
 	"github.com/mikioh/ipaddr"
+	"github.com/wirekcp/wgctrl/internal/wgtest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgtest"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 func TestLinuxClientConfigureDevice(t *testing.T) {

diff --git a/internal/wglinux/parse_linux.go b/internal/wglinux/parse_linux.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/mdlayher/genetlink"
 	"github.com/mdlayher/netlink"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 // parseDevice parses a Device from a slice of generic netlink messages,

diff --git a/internal/wglinux/parse_linux_test.go b/internal/wglinux/parse_linux_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/mdlayher/genetlink/genltest"
 	"github.com/mdlayher/netlink"
 	"github.com/mdlayher/netlink/nlenc"
+	"github.com/wirekcp/wgctrl/internal/wgtest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgtest"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 func TestLinuxClientDevicesError(t *testing.T) {

diff --git a/internal/wgopenbsd/client_openbsd.go b/internal/wgopenbsd/client_openbsd.go
@@ -13,10 +13,10 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wgopenbsd/internal/wgh"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgopenbsd/internal/wgh"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 // ifGroupWG is the WireGuard interface group name passed to the kernel.

diff --git a/internal/wgopenbsd/client_openbsd_test.go b/internal/wgopenbsd/client_openbsd_test.go
@@ -12,10 +12,10 @@ import (
 	"unsafe"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/wirekcp/wgctrl/internal/wgopenbsd/internal/wgh"
+	"github.com/wirekcp/wgctrl/internal/wgtest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/sys/unix"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgopenbsd/internal/wgh"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgtest"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 func TestClientDevices(t *testing.T) {

diff --git a/internal/wgtest/wgtest.go b/internal/wgtest/wgtest.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // MustCIDR converts CIDR string s into a net.IPNet or panics.

diff --git a/internal/wguser/client.go b/internal/wguser/client.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 var _ wginternal.Client = &Client{}

diff --git a/internal/wguser/client_test.go b/internal/wguser/client_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // A known device name used throughout unit and integration tests.

diff --git a/internal/wguser/configure.go b/internal/wguser/configure.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"strings"
 
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // configureDevice configures a device specified by its path.

diff --git a/internal/wguser/configure_test.go b/internal/wguser/configure_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgtest"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/internal/wgtest"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // Example string source (with some slight modifications to use all fields):

diff --git a/internal/wguser/parse.go b/internal/wguser/parse.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"time"
 
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // The WireGuard userspace configuration protocol is described here:

diff --git a/internal/wguser/parse_test.go b/internal/wguser/parse_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 // Example string source (with some slight modifications to use all fields):

diff --git a/internal/wgwindows/client_windows.go b/internal/wgwindows/client_windows.go
@@ -8,9 +8,9 @@ import (
 
 	"golang.org/x/sys/windows"
 
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgwindows/internal/ioctl"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wgwindows/internal/ioctl"
+	"github.com/wirekcp/wgctrl/wgtypes"
 )
 
 var _ wginternal.Client = &Client{}

diff --git a/os_freebsd.go b/os_freebsd.go
@@ -4,9 +4,9 @@
 package wgctrl
 
 import (
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgfreebsd"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wguser"
+	"github.com/wirekcp/wgctrl/internal/wgfreebsd"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wguser"
 )
 
 // newClients configures wginternal.Clients for FreeBSD systems.

diff --git a/os_linux.go b/os_linux.go
@@ -4,9 +4,9 @@
 package wgctrl
 
 import (
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wglinux"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wguser"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wglinux"
+	"github.com/wirekcp/wgctrl/internal/wguser"
 )
 
 // newClients configures wginternal.Clients for Linux systems.

diff --git a/os_openbsd.go b/os_openbsd.go
@@ -4,9 +4,9 @@
 package wgctrl
 
 import (
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgopenbsd"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wguser"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wgopenbsd"
+	"github.com/wirekcp/wgctrl/internal/wguser"
 )
 
 // newClients configures wginternal.Clients for OpenBSD systems.

diff --git a/os_userspace.go b/os_userspace.go
@@ -4,8 +4,8 @@
 package wgctrl
 
 import (
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wguser"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wguser"
 )
 
 // newClients configures wginternal.Clients for systems which only support

diff --git a/os_windows.go b/os_windows.go
@@ -4,9 +4,9 @@
 package wgctrl
 
 import (
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wginternal"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wguser"
-	"golang.zx2c4.com/wireguard/wgctrl/internal/wgwindows"
+	"github.com/wirekcp/wgctrl/internal/wginternal"
+	"github.com/wirekcp/wgctrl/internal/wguser"
+	"github.com/wirekcp/wgctrl/internal/wgwindows"
 )
 
 // newClients configures wginternal.Clients for Windows systems.

diff --git a/wgtypes/types_test.go b/wgtypes/types_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/wirekcp/wgctrl/wgtypes"
 	"golang.org/x/crypto/curve25519"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
 )
 
 func TestPreparedKeys(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"net"
-    	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+    	"github.com/wirekcp/wgctrl/wgtypes"
     )
     // MustCIDR converts CIDR string s into a net.IPNet or panics.
@@ Expand Down @@