From c3bc85e22d4ee7e4abf4505814082077ad6023fb Mon Sep 17 00:00:00 2001 From: Maycon Santos Date: Sat, 26 Mar 2022 12:08:54 +0100 Subject: [PATCH] Rename module to netbirdio/netbird (#288) rename the go module to netbirdio/netbird as part of our rebranding. --- .goreleaser.yaml | 4 ++-- .goreleaser_ui_darwin.yaml | 2 +- client/cmd/down.go | 4 ++-- client/cmd/login.go | 6 +++--- client/cmd/login_test.go | 6 +++--- client/cmd/root.go | 2 +- client/cmd/service.go | 2 +- client/cmd/service_controller.go | 6 +++--- client/cmd/status.go | 6 +++--- client/cmd/testutil.go | 14 +++++++------- client/cmd/up.go | 6 +++--- client/cmd/up_daemon_test.go | 2 +- client/cmd/version.go | 2 +- client/internal/config.go | 4 ++-- client/internal/config_test.go | 2 +- client/internal/connect.go | 8 ++++---- client/internal/engine.go | 16 ++++++++-------- client/internal/engine_test.go | 16 ++++++++-------- client/internal/login.go | 6 +++--- client/internal/peer/conn.go | 4 ++-- client/internal/peer/conn_test.go | 2 +- client/internal/proxy/noproxy.go | 2 +- client/internal/proxy/proxy.go | 2 +- client/main.go | 2 +- client/server/server.go | 4 ++-- client/ui/client_ui.go | 4 ++-- encryption/encryption_test.go | 4 ++-- go.mod | 2 +- management/client/client.go | 4 ++-- management/client/client_test.go | 14 +++++++------- management/client/grpc.go | 6 +++--- management/client/mock.go | 4 ++-- management/cmd/management.go | 12 ++++++------ management/main.go | 2 +- management/server/account.go | 6 +++--- management/server/account_test.go | 2 +- management/server/config.go | 4 ++-- management/server/file_store.go | 2 +- management/server/file_store_test.go | 2 +- management/server/grpcserver.go | 4 ++-- management/server/http/handler/peers.go | 4 ++-- management/server/http/handler/peers_test.go | 6 +++--- management/server/http/handler/setupkeys.go | 6 +++--- management/server/http/server.go | 6 +++--- management/server/management_proto_test.go | 6 +++--- management/server/management_test.go | 8 ++++---- management/server/migration/convert_accounts.go | 2 +- .../server/migration/convert_accounts_test.go | 4 ++-- management/server/mock_server/account_mock.go | 6 +++--- .../server/mock_server/management_server_mock.go | 2 +- management/server/peer.go | 2 +- management/server/turncredentials.go | 2 +- management/server/turncredentials_test.go | 2 +- management/server/updatechannel.go | 2 +- management/server/updatechannel_test.go | 2 +- signal/client/client.go | 2 +- signal/client/client_test.go | 4 ++-- signal/client/grpc.go | 4 ++-- signal/client/mock.go | 2 +- signal/cmd/run.go | 8 ++++---- signal/main.go | 2 +- signal/peer/peer.go | 2 +- signal/server/signal.go | 4 ++-- util/file_test.go | 2 +- 64 files changed, 146 insertions(+), 146 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index ab9f6d8ed..24c4ef652 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -22,7 +22,7 @@ builds: - goos: windows goarch: arm ldflags: - - -s -w -X github.com/wiretrustee/wiretrustee/client/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser + - -s -w -X github.com/netbirdio/netbird/client/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser mod_timestamp: '{{ .CommitTimestamp }}' tags: - load_wgnt_from_rsrc @@ -65,7 +65,7 @@ builds: goarch: - amd64 ldflags: - - -s -w -X github.com/wiretrustee/wiretrustee/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser + - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser mod_timestamp: '{{ .CommitTimestamp }}' archives: diff --git a/.goreleaser_ui_darwin.yaml b/.goreleaser_ui_darwin.yaml index 04262b85f..04d6fb44e 100644 --- a/.goreleaser_ui_darwin.yaml +++ b/.goreleaser_ui_darwin.yaml @@ -14,7 +14,7 @@ builds: - hardfloat - softfloat ldflags: - - -s -w -X github.com/wiretrustee/wiretrustee/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser + - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser mod_timestamp: '{{ .CommitTimestamp }}' tags: - load_wgnt_from_rsrc diff --git a/client/cmd/down.go b/client/cmd/down.go index c9549fc12..ce66054f5 100644 --- a/client/cmd/down.go +++ b/client/cmd/down.go @@ -2,13 +2,13 @@ package cmd import ( "context" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" "time" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/client/proto" + "github.com/netbirdio/netbird/client/proto" ) var downCmd = &cobra.Command{ diff --git a/client/cmd/login.go b/client/cmd/login.go index b45cf1c42..261bc7d6b 100644 --- a/client/cmd/login.go +++ b/client/cmd/login.go @@ -3,13 +3,13 @@ package cmd import ( "context" "fmt" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/client/proto" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/client/proto" ) var loginCmd = &cobra.Command{ diff --git a/client/cmd/login_test.go b/client/cmd/login_test.go index 046a7c531..6bb7eff4f 100644 --- a/client/cmd/login_test.go +++ b/client/cmd/login_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/iface" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/iface" + "github.com/netbirdio/netbird/util" ) func TestLogin(t *testing.T) { diff --git a/client/cmd/root.go b/client/cmd/root.go index 46da3a403..320aa7da7 100644 --- a/client/cmd/root.go +++ b/client/cmd/root.go @@ -17,7 +17,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/wiretrustee/wiretrustee/client/internal" + "github.com/netbirdio/netbird/client/internal" ) var ( diff --git a/client/cmd/service.go b/client/cmd/service.go index 67df76f98..1afe8c044 100644 --- a/client/cmd/service.go +++ b/client/cmd/service.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" "google.golang.org/grpc" - "github.com/wiretrustee/wiretrustee/client/internal" + "github.com/netbirdio/netbird/client/internal" ) type program struct { diff --git a/client/cmd/service_controller.go b/client/cmd/service_controller.go index 99ef1bea9..2a5315ea1 100644 --- a/client/cmd/service_controller.go +++ b/client/cmd/service_controller.go @@ -11,10 +11,10 @@ import ( "github.com/kardianos/service" log "github.com/sirupsen/logrus" + "github.com/netbirdio/netbird/client/proto" + "github.com/netbirdio/netbird/client/server" + "github.com/netbirdio/netbird/util" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/client/proto" - "github.com/wiretrustee/wiretrustee/client/server" - "github.com/wiretrustee/wiretrustee/util" "google.golang.org/grpc" ) diff --git a/client/cmd/status.go b/client/cmd/status.go index 209ed0a65..d5c664833 100644 --- a/client/cmd/status.go +++ b/client/cmd/status.go @@ -2,14 +2,14 @@ package cmd import ( "context" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "google.golang.org/grpc/status" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/client/proto" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/client/proto" ) var statusCmd = &cobra.Command{ diff --git a/client/cmd/testutil.go b/client/cmd/testutil.go index 9fc177564..a57814fa1 100644 --- a/client/cmd/testutil.go +++ b/client/cmd/testutil.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" - clientProto "github.com/wiretrustee/wiretrustee/client/proto" - client "github.com/wiretrustee/wiretrustee/client/server" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" - mgmt "github.com/wiretrustee/wiretrustee/management/server" - sigProto "github.com/wiretrustee/wiretrustee/signal/proto" - sig "github.com/wiretrustee/wiretrustee/signal/server" + clientProto "github.com/netbirdio/netbird/client/proto" + client "github.com/netbirdio/netbird/client/server" + mgmtProto "github.com/netbirdio/netbird/management/proto" + mgmt "github.com/netbirdio/netbird/management/server" + sigProto "github.com/netbirdio/netbird/signal/proto" + sig "github.com/netbirdio/netbird/signal/server" "google.golang.org/grpc" ) diff --git a/client/cmd/up.go b/client/cmd/up.go index ae870f74e..f6f80bf3a 100644 --- a/client/cmd/up.go +++ b/client/cmd/up.go @@ -3,12 +3,12 @@ package cmd import ( "context" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/util" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/client/proto" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/client/proto" ) var upCmd = &cobra.Command{ diff --git a/client/cmd/up_daemon_test.go b/client/cmd/up_daemon_test.go index 2c803b7c2..0295d2b21 100644 --- a/client/cmd/up_daemon_test.go +++ b/client/cmd/up_daemon_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/wiretrustee/wiretrustee/client/internal" + "github.com/netbirdio/netbird/client/internal" ) var cliAddr string diff --git a/client/cmd/version.go b/client/cmd/version.go index 187d31d87..e774fc7b5 100644 --- a/client/cmd/version.go +++ b/client/cmd/version.go @@ -1,8 +1,8 @@ package cmd import ( + "github.com/netbirdio/netbird/client/system" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/client/system" ) var ( diff --git a/client/internal/config.go b/client/internal/config.go index c5a8f0976..84406b1a5 100644 --- a/client/internal/config.go +++ b/client/internal/config.go @@ -2,9 +2,9 @@ package internal import ( "fmt" + "github.com/netbirdio/netbird/iface" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/iface" - "github.com/wiretrustee/wiretrustee/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "net/url" "os" diff --git a/client/internal/config_test.go b/client/internal/config_test.go index f776174c2..06e9c1bfc 100644 --- a/client/internal/config_test.go +++ b/client/internal/config_test.go @@ -2,8 +2,8 @@ package internal import ( "errors" + "github.com/netbirdio/netbird/util" "github.com/stretchr/testify/assert" - "github.com/wiretrustee/wiretrustee/util" "os" "path/filepath" "testing" diff --git a/client/internal/connect.go b/client/internal/connect.go index 3d22249ab..e3c54f638 100644 --- a/client/internal/connect.go +++ b/client/internal/connect.go @@ -4,11 +4,11 @@ import ( "context" "time" + "github.com/netbirdio/netbird/iface" + mgm "github.com/netbirdio/netbird/management/client" + mgmProto "github.com/netbirdio/netbird/management/proto" + signal "github.com/netbirdio/netbird/signal/client" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/iface" - mgm "github.com/wiretrustee/wiretrustee/management/client" - mgmProto "github.com/wiretrustee/wiretrustee/management/proto" - signal "github.com/wiretrustee/wiretrustee/signal/client" "github.com/cenkalti/backoff/v4" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" diff --git a/client/internal/engine.go b/client/internal/engine.go index f084f491c..361fe3843 100644 --- a/client/internal/engine.go +++ b/client/internal/engine.go @@ -9,16 +9,16 @@ import ( "sync" "time" + "github.com/netbirdio/netbird/client/internal/peer" + "github.com/netbirdio/netbird/client/internal/proxy" + "github.com/netbirdio/netbird/iface" + mgm "github.com/netbirdio/netbird/management/client" + mgmProto "github.com/netbirdio/netbird/management/proto" + signal "github.com/netbirdio/netbird/signal/client" + sProto "github.com/netbirdio/netbird/signal/proto" + "github.com/netbirdio/netbird/util" "github.com/pion/ice/v2" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/internal/peer" - "github.com/wiretrustee/wiretrustee/client/internal/proxy" - "github.com/wiretrustee/wiretrustee/iface" - mgm "github.com/wiretrustee/wiretrustee/management/client" - mgmProto "github.com/wiretrustee/wiretrustee/management/proto" - signal "github.com/wiretrustee/wiretrustee/signal/client" - sProto "github.com/wiretrustee/wiretrustee/signal/proto" - "github.com/wiretrustee/wiretrustee/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/client/internal/engine_test.go b/client/internal/engine_test.go index 536d4f858..78614d04b 100644 --- a/client/internal/engine_test.go +++ b/client/internal/engine_test.go @@ -11,15 +11,15 @@ import ( "testing" "time" + "github.com/netbirdio/netbird/client/system" + mgmt "github.com/netbirdio/netbird/management/client" + mgmtProto "github.com/netbirdio/netbird/management/proto" + "github.com/netbirdio/netbird/management/server" + signal "github.com/netbirdio/netbird/signal/client" + "github.com/netbirdio/netbird/signal/proto" + signalServer "github.com/netbirdio/netbird/signal/server" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/system" - mgmt "github.com/wiretrustee/wiretrustee/management/client" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" - "github.com/wiretrustee/wiretrustee/management/server" - signal "github.com/wiretrustee/wiretrustee/signal/client" - "github.com/wiretrustee/wiretrustee/signal/proto" - signalServer "github.com/wiretrustee/wiretrustee/signal/server" - "github.com/wiretrustee/wiretrustee/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/keepalive" diff --git a/client/internal/login.go b/client/internal/login.go index 31253a828..117810438 100644 --- a/client/internal/login.go +++ b/client/internal/login.go @@ -6,10 +6,10 @@ import ( "github.com/cenkalti/backoff/v4" "github.com/google/uuid" + "github.com/netbirdio/netbird/client/system" + mgm "github.com/netbirdio/netbird/management/client" + mgmProto "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/system" - mgm "github.com/wiretrustee/wiretrustee/management/client" - mgmProto "github.com/wiretrustee/wiretrustee/management/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/client/internal/peer/conn.go b/client/internal/peer/conn.go index 83b4904d6..0cf31c097 100644 --- a/client/internal/peer/conn.go +++ b/client/internal/peer/conn.go @@ -2,15 +2,15 @@ package peer import ( "context" - "github.com/wiretrustee/wiretrustee/iface" + "github.com/netbirdio/netbird/iface" "golang.zx2c4.com/wireguard/wgctrl" "net" "sync" "time" + "github.com/netbirdio/netbird/client/internal/proxy" "github.com/pion/ice/v2" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/internal/proxy" ) // ConnConfig is a peer Connection configuration diff --git a/client/internal/peer/conn_test.go b/client/internal/peer/conn_test.go index fcdf1840c..90b33bb7a 100644 --- a/client/internal/peer/conn_test.go +++ b/client/internal/peer/conn_test.go @@ -2,8 +2,8 @@ package peer import ( "github.com/magiconair/properties/assert" + "github.com/netbirdio/netbird/client/internal/proxy" "github.com/pion/ice/v2" - "github.com/wiretrustee/wiretrustee/client/internal/proxy" "sync" "testing" "time" diff --git a/client/internal/proxy/noproxy.go b/client/internal/proxy/noproxy.go index c750fd69e..ecb96ef33 100644 --- a/client/internal/proxy/noproxy.go +++ b/client/internal/proxy/noproxy.go @@ -1,8 +1,8 @@ package proxy import ( + "github.com/netbirdio/netbird/iface" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/iface" "net" ) diff --git a/client/internal/proxy/proxy.go b/client/internal/proxy/proxy.go index a856ab1e6..d580594c2 100644 --- a/client/internal/proxy/proxy.go +++ b/client/internal/proxy/proxy.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/wiretrustee/wiretrustee/iface" + "github.com/netbirdio/netbird/iface" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "io" "net" diff --git a/client/main.go b/client/main.go index 3a80c90e3..c03989a91 100644 --- a/client/main.go +++ b/client/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/wiretrustee/wiretrustee/client/cmd" + "github.com/netbirdio/netbird/client/cmd" ) func main() { diff --git a/client/server/server.go b/client/server/server.go index 4dc13fd79..5b9c934e3 100644 --- a/client/server/server.go +++ b/client/server/server.go @@ -7,8 +7,8 @@ import ( log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/client/proto" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/client/proto" ) // Server for service control. diff --git a/client/ui/client_ui.go b/client/ui/client_ui.go index f05f5489d..3b0e7281b 100644 --- a/client/ui/client_ui.go +++ b/client/ui/client_ui.go @@ -16,10 +16,10 @@ import ( _ "embed" "github.com/getlantern/systray" + "github.com/netbirdio/netbird/client/internal" + "github.com/netbirdio/netbird/client/proto" log "github.com/sirupsen/logrus" "github.com/skratchdot/open-golang/open" - "github.com/wiretrustee/wiretrustee/client/internal" - "github.com/wiretrustee/wiretrustee/client/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/encryption/encryption_test.go b/encryption/encryption_test.go index fbaf4ca7c..2696650ff 100644 --- a/encryption/encryption_test.go +++ b/encryption/encryption_test.go @@ -1,10 +1,10 @@ package encryption_test import ( + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/encryption/testprotos" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/encryption/testprotos" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/go.mod b/go.mod index 07c965d3b..58c569f2d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/wiretrustee/wiretrustee +module github.com/netbirdio/netbird go 1.18 diff --git a/management/client/client.go b/management/client/client.go index 76dc3ad03..abfb54e4b 100644 --- a/management/client/client.go +++ b/management/client/client.go @@ -3,8 +3,8 @@ package client import ( "io" - "github.com/wiretrustee/wiretrustee/client/system" - "github.com/wiretrustee/wiretrustee/management/proto" + "github.com/netbirdio/netbird/client/system" + "github.com/netbirdio/netbird/management/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/management/client/client_test.go b/management/client/client_test.go index 3f95347aa..41b9a57ce 100644 --- a/management/client/client_test.go +++ b/management/client/client_test.go @@ -8,17 +8,17 @@ import ( "testing" "time" - "github.com/wiretrustee/wiretrustee/client/system" + "github.com/netbirdio/netbird/client/system" + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/management/proto" + mgmtProto "github.com/netbirdio/netbird/management/proto" + mgmt "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/mock_server" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/management/proto" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" - mgmt "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/management/server/mock_server" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/management/client/grpc.go b/management/client/grpc.go index c13ebafa0..1f945e5d7 100644 --- a/management/client/grpc.go +++ b/management/client/grpc.go @@ -8,10 +8,10 @@ import ( "time" "github.com/cenkalti/backoff/v4" + "github.com/netbirdio/netbird/client/system" + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/client/system" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/management/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" diff --git a/management/client/mock.go b/management/client/mock.go index ac4c64c07..aa6a038e6 100644 --- a/management/client/mock.go +++ b/management/client/mock.go @@ -1,8 +1,8 @@ package client import ( - "github.com/wiretrustee/wiretrustee/client/system" - "github.com/wiretrustee/wiretrustee/management/proto" + "github.com/netbirdio/netbird/client/system" + "github.com/netbirdio/netbird/management/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" ) diff --git a/management/cmd/management.go b/management/cmd/management.go index b490ec369..50392438d 100644 --- a/management/cmd/management.go +++ b/management/cmd/management.go @@ -5,18 +5,18 @@ import ( "crypto/tls" "flag" "fmt" - "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/management/server/http" - "github.com/wiretrustee/wiretrustee/management/server/idp" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/http" + "github.com/netbirdio/netbird/management/server/idp" + "github.com/netbirdio/netbird/util" "net" "os" "time" + "github.com/netbirdio/netbird/encryption" + mgmtProto "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/encryption" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" diff --git a/management/main.go b/management/main.go index 370fe491c..561ed8f26 100644 --- a/management/main.go +++ b/management/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/wiretrustee/wiretrustee/management/cmd" + "github.com/netbirdio/netbird/management/cmd" "os" ) diff --git a/management/server/account.go b/management/server/account.go index 804ea9edf..eebcc51c9 100644 --- a/management/server/account.go +++ b/management/server/account.go @@ -1,11 +1,11 @@ package server import ( + "github.com/netbirdio/netbird/management/server/idp" + "github.com/netbirdio/netbird/management/server/jwtclaims" + "github.com/netbirdio/netbird/util" "github.com/rs/xid" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/management/server/idp" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" - "github.com/wiretrustee/wiretrustee/util" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "strings" diff --git a/management/server/account_test.go b/management/server/account_test.go index ac32a1c0f..5f44970d2 100644 --- a/management/server/account_test.go +++ b/management/server/account_test.go @@ -1,8 +1,8 @@ package server import ( + "github.com/netbirdio/netbird/management/server/jwtclaims" "github.com/stretchr/testify/require" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "net" "testing" diff --git a/management/server/config.go b/management/server/config.go index 358ce5a02..c76e171ad 100644 --- a/management/server/config.go +++ b/management/server/config.go @@ -1,8 +1,8 @@ package server import ( - "github.com/wiretrustee/wiretrustee/management/server/idp" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/management/server/idp" + "github.com/netbirdio/netbird/util" ) type Protocol string diff --git a/management/server/file_store.go b/management/server/file_store.go index a6833b04f..37277854e 100644 --- a/management/server/file_store.go +++ b/management/server/file_store.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" ) // storeFileName Store file name. Stored in the datadir diff --git a/management/server/file_store_test.go b/management/server/file_store_test.go index bf05f9b8b..df6c7d40e 100644 --- a/management/server/file_store_test.go +++ b/management/server/file_store_test.go @@ -1,8 +1,8 @@ package server import ( + "github.com/netbirdio/netbird/util" "github.com/stretchr/testify/require" - "github.com/wiretrustee/wiretrustee/util" "net" "path/filepath" "testing" diff --git a/management/server/grpcserver.go b/management/server/grpcserver.go index d0a09f03f..23a12fc1f 100644 --- a/management/server/grpcserver.go +++ b/management/server/grpcserver.go @@ -6,9 +6,9 @@ import ( "time" "github.com/golang/protobuf/ptypes/timestamp" + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/management/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/management/server/http/handler/peers.go b/management/server/http/handler/peers.go index 8da5d2151..a8958e086 100644 --- a/management/server/http/handler/peers.go +++ b/management/server/http/handler/peers.go @@ -3,13 +3,13 @@ package handler import ( "encoding/json" "fmt" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" + "github.com/netbirdio/netbird/management/server/jwtclaims" "net/http" "time" "github.com/gorilla/mux" + "github.com/netbirdio/netbird/management/server" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/management/server" ) //Peers is a handler that returns peers of the account diff --git a/management/server/http/handler/peers_test.go b/management/server/http/handler/peers_test.go index ac04d4f53..9967c6551 100644 --- a/management/server/http/handler/peers_test.go +++ b/management/server/http/handler/peers_test.go @@ -2,7 +2,7 @@ package handler import ( "encoding/json" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" + "github.com/netbirdio/netbird/management/server/jwtclaims" "io" "net" "net/http" @@ -10,8 +10,8 @@ import ( "testing" "github.com/magiconair/properties/assert" - "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/management/server/mock_server" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/mock_server" ) func initTestMetaData(peer ...*server.Peer) *Peers { diff --git a/management/server/http/handler/setupkeys.go b/management/server/http/handler/setupkeys.go index 06b411f4d..1cb12e868 100644 --- a/management/server/http/handler/setupkeys.go +++ b/management/server/http/handler/setupkeys.go @@ -3,14 +3,14 @@ package handler import ( "encoding/json" "fmt" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" + "github.com/netbirdio/netbird/management/server/jwtclaims" "net/http" "time" "github.com/gorilla/mux" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/util" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/management/server/http/server.go b/management/server/http/server.go index e641a11fe..1be916eff 100644 --- a/management/server/http/server.go +++ b/management/server/http/server.go @@ -7,11 +7,11 @@ import ( "time" "github.com/gorilla/mux" + s "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/http/handler" + "github.com/netbirdio/netbird/management/server/http/middleware" "github.com/rs/cors" log "github.com/sirupsen/logrus" - s "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/management/server/http/handler" - "github.com/wiretrustee/wiretrustee/management/server/http/middleware" "golang.org/x/crypto/acme/autocert" ) diff --git a/management/server/management_proto_test.go b/management/server/management_proto_test.go index 0aedce662..4427e6abe 100644 --- a/management/server/management_proto_test.go +++ b/management/server/management_proto_test.go @@ -3,10 +3,10 @@ package server import ( "context" "fmt" + "github.com/netbirdio/netbird/encryption" + mgmtProto "github.com/netbirdio/netbird/management/proto" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/encryption" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" - "github.com/wiretrustee/wiretrustee/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/management/server/management_test.go b/management/server/management_test.go index c0aa0417d..379ccd559 100644 --- a/management/server/management_test.go +++ b/management/server/management_test.go @@ -2,7 +2,7 @@ package server_test import ( "context" - server "github.com/wiretrustee/wiretrustee/management/server" + server "github.com/netbirdio/netbird/management/server" "google.golang.org/grpc/credentials/insecure" "io/ioutil" "math/rand" @@ -14,13 +14,13 @@ import ( "time" pb "github.com/golang/protobuf/proto" //nolint + "github.com/netbirdio/netbird/encryption" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/encryption" + mgmtProto "github.com/netbirdio/netbird/management/proto" + "github.com/netbirdio/netbird/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - mgmtProto "github.com/wiretrustee/wiretrustee/management/proto" - "github.com/wiretrustee/wiretrustee/util" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/keepalive" diff --git a/management/server/migration/convert_accounts.go b/management/server/migration/convert_accounts.go index b912ee06d..82439f2f2 100644 --- a/management/server/migration/convert_accounts.go +++ b/management/server/migration/convert_accounts.go @@ -3,8 +3,8 @@ package main import ( "flag" "fmt" + "github.com/netbirdio/netbird/management/server" "github.com/rs/xid" - "github.com/wiretrustee/wiretrustee/management/server" ) func main() { diff --git a/management/server/migration/convert_accounts_test.go b/management/server/migration/convert_accounts_test.go index 082a6bdd3..bb2232244 100644 --- a/management/server/migration/convert_accounts_test.go +++ b/management/server/migration/convert_accounts_test.go @@ -1,8 +1,8 @@ package main import ( - "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/util" "path/filepath" "testing" ) diff --git a/management/server/mock_server/account_mock.go b/management/server/mock_server/account_mock.go index b0c30561a..8a727896f 100644 --- a/management/server/mock_server/account_mock.go +++ b/management/server/mock_server/account_mock.go @@ -1,9 +1,9 @@ package mock_server import ( - "github.com/wiretrustee/wiretrustee/management/server" - "github.com/wiretrustee/wiretrustee/management/server/jwtclaims" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/management/server" + "github.com/netbirdio/netbird/management/server/jwtclaims" + "github.com/netbirdio/netbird/util" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/management/server/mock_server/management_server_mock.go b/management/server/mock_server/management_server_mock.go index 181aed188..fee6a4827 100644 --- a/management/server/mock_server/management_server_mock.go +++ b/management/server/mock_server/management_server_mock.go @@ -3,7 +3,7 @@ package mock_server import ( "context" - "github.com/wiretrustee/wiretrustee/management/proto" + "github.com/netbirdio/netbird/management/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/management/server/peer.go b/management/server/peer.go index 8f0f1f042..929ef93e2 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -1,7 +1,7 @@ package server import ( - "github.com/wiretrustee/wiretrustee/management/proto" + "github.com/netbirdio/netbird/management/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "net" diff --git a/management/server/turncredentials.go b/management/server/turncredentials.go index 98f1de700..380fe08fb 100644 --- a/management/server/turncredentials.go +++ b/management/server/turncredentials.go @@ -5,8 +5,8 @@ import ( "crypto/sha1" "encoding/base64" "fmt" + "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/management/proto" "sync" "time" ) diff --git a/management/server/turncredentials_test.go b/management/server/turncredentials_test.go index d3089fa77..c91176ac3 100644 --- a/management/server/turncredentials_test.go +++ b/management/server/turncredentials_test.go @@ -4,7 +4,7 @@ import ( "crypto/hmac" "crypto/sha1" "encoding/base64" - "github.com/wiretrustee/wiretrustee/util" + "github.com/netbirdio/netbird/util" "testing" "time" ) diff --git a/management/server/updatechannel.go b/management/server/updatechannel.go index 9095f4b1f..d4e7d9220 100644 --- a/management/server/updatechannel.go +++ b/management/server/updatechannel.go @@ -1,8 +1,8 @@ package server import ( + "github.com/netbirdio/netbird/management/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/management/proto" "sync" ) diff --git a/management/server/updatechannel_test.go b/management/server/updatechannel_test.go index e0087f17c..d0352e0fa 100644 --- a/management/server/updatechannel_test.go +++ b/management/server/updatechannel_test.go @@ -1,7 +1,7 @@ package server import ( - "github.com/wiretrustee/wiretrustee/management/proto" + "github.com/netbirdio/netbird/management/proto" "testing" ) diff --git a/signal/client/client.go b/signal/client/client.go index e1a8bb767..4b7c90ca0 100644 --- a/signal/client/client.go +++ b/signal/client/client.go @@ -2,7 +2,7 @@ package client import ( "fmt" - "github.com/wiretrustee/wiretrustee/signal/proto" + "github.com/netbirdio/netbird/signal/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "io" "strings" diff --git a/signal/client/client_test.go b/signal/client/client_test.go index 5f59e5b80..db07e8e34 100644 --- a/signal/client/client_test.go +++ b/signal/client/client_test.go @@ -2,11 +2,11 @@ package client import ( "context" + sigProto "github.com/netbirdio/netbird/signal/proto" + "github.com/netbirdio/netbird/signal/server" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" - sigProto "github.com/wiretrustee/wiretrustee/signal/proto" - "github.com/wiretrustee/wiretrustee/signal/server" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/signal/client/grpc.go b/signal/client/grpc.go index 0406bdc06..4d2463766 100644 --- a/signal/client/grpc.go +++ b/signal/client/grpc.go @@ -5,9 +5,9 @@ import ( "crypto/tls" "fmt" "github.com/cenkalti/backoff/v4" + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/signal/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/signal/proto" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/signal/client/mock.go b/signal/client/mock.go index 0b86defc7..21ec77cd6 100644 --- a/signal/client/mock.go +++ b/signal/client/mock.go @@ -1,7 +1,7 @@ package client import ( - "github.com/wiretrustee/wiretrustee/signal/proto" + "github.com/netbirdio/netbird/signal/proto" ) type MockClient struct { diff --git a/signal/cmd/run.go b/signal/cmd/run.go index 9e9936366..08bdc14f6 100644 --- a/signal/cmd/run.go +++ b/signal/cmd/run.go @@ -3,12 +3,12 @@ package cmd import ( "flag" "fmt" + "github.com/netbirdio/netbird/encryption" + "github.com/netbirdio/netbird/signal/proto" + "github.com/netbirdio/netbird/signal/server" + "github.com/netbirdio/netbird/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/wiretrustee/wiretrustee/encryption" - "github.com/wiretrustee/wiretrustee/signal/proto" - "github.com/wiretrustee/wiretrustee/signal/server" - "github.com/wiretrustee/wiretrustee/util" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" diff --git a/signal/main.go b/signal/main.go index 7fd98e1f6..328f23a97 100644 --- a/signal/main.go +++ b/signal/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/wiretrustee/wiretrustee/signal/cmd" + "github.com/netbirdio/netbird/signal/cmd" "os" ) diff --git a/signal/peer/peer.go b/signal/peer/peer.go index fb5e1aa1b..9c7ba3728 100644 --- a/signal/peer/peer.go +++ b/signal/peer/peer.go @@ -1,8 +1,8 @@ package peer import ( + "github.com/netbirdio/netbird/signal/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/signal/proto" "sync" ) diff --git a/signal/server/signal.go b/signal/server/signal.go index d2857dd7c..3bca53307 100644 --- a/signal/server/signal.go +++ b/signal/server/signal.go @@ -3,9 +3,9 @@ package server import ( "context" "fmt" + "github.com/netbirdio/netbird/signal/peer" + "github.com/netbirdio/netbird/signal/proto" log "github.com/sirupsen/logrus" - "github.com/wiretrustee/wiretrustee/signal/peer" - "github.com/wiretrustee/wiretrustee/signal/proto" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/util/file_test.go b/util/file_test.go index c502285d0..84a7db80d 100644 --- a/util/file_test.go +++ b/util/file_test.go @@ -3,9 +3,9 @@ package util_test import ( "crypto/md5" "encoding/hex" + "github.com/netbirdio/netbird/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/wiretrustee/wiretrustee/util" "io" "io/ioutil" "os"