From 2a92e730c4ccfddbb71600d6fc5b47d6caac100f Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Thu, 9 Jul 2020 15:39:55 -0400 Subject: [PATCH] rename package from ziti-tunnel-win to desktop-edge-win --- service/cziti/cziti-cli/main.go | 2 +- service/cziti/dns-proxy.go | 2 +- service/cziti/sdk.go | 2 +- service/go.mod | 2 +- service/ziti-tunnel/dto/dtos.go | 4 ++-- service/ziti-tunnel/globals/loghelper.go | 2 +- service/ziti-tunnel/idutil/identity.go | 4 ++-- service/ziti-tunnel/main.go | 4 ++-- service/ziti-tunnel/service/debug.go | 2 +- service/ziti-tunnel/service/events.go | 2 +- service/ziti-tunnel/service/ipc.go | 12 ++++++------ service/ziti-tunnel/service/pkg-vars.go | 4 ++-- service/ziti-tunnel/service/service.go | 2 +- service/ziti-tunnel/service/state.go | 8 ++++---- service/ziti-wintun/main.go | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/service/cziti/cziti-cli/main.go b/service/cziti/cziti-cli/main.go index daf67bb7..320cf59d 100644 --- a/service/cziti/cziti-cli/main.go +++ b/service/cziti/cziti-cli/main.go @@ -25,7 +25,7 @@ import ( "os" "strconv" "strings" - "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/cziti" ) func main() { diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 6a69d3e5..e87e618d 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -22,7 +22,7 @@ import ( "github.com/miekg/dns" "net" "time" - "github.com/openziti/ziti-tunnel-win/service/cziti/windns" + "github.com/openziti/desktop-edge-win/service/cziti/windns" ) func processDNSquery(packet []byte, p *net.UDPAddr, s *net.UDPConn) { diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index c55568d9..8a9ca7ba 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -34,7 +34,7 @@ import ( "encoding/json" "errors" "github.com/michaelquigley/pfxlog" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/config" "github.com/robfig/cron/v3" "io/ioutil" "os" diff --git a/service/go.mod b/service/go.mod index 8169dc73..6c31d9cb 100644 --- a/service/go.mod +++ b/service/go.mod @@ -1,4 +1,4 @@ -module github.com/openziti/ziti-tunnel-win/service +module github.com/openziti/desktop-edge-win/service go 1.14 diff --git a/service/ziti-tunnel/dto/dtos.go b/service/ziti-tunnel/dto/dtos.go index e7502ff7..afd6e8d6 100644 --- a/service/ziti-tunnel/dto/dtos.go +++ b/service/ziti-tunnel/dto/dtos.go @@ -20,9 +20,9 @@ package dto import ( idcfg "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/enroll" - "github.com/openziti/ziti-tunnel-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/cziti" "log" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/config" ) type AddIdentity struct { diff --git a/service/ziti-tunnel/globals/loghelper.go b/service/ziti-tunnel/globals/loghelper.go index e90699d8..4d7b11e1 100644 --- a/service/ziti-tunnel/globals/loghelper.go +++ b/service/ziti-tunnel/globals/loghelper.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/config" ) var Elog debug.Log diff --git a/service/ziti-tunnel/idutil/identity.go b/service/ziti-tunnel/idutil/identity.go index ad09b3d3..29881de8 100644 --- a/service/ziti-tunnel/idutil/identity.go +++ b/service/ziti-tunnel/idutil/identity.go @@ -20,8 +20,8 @@ package idutil import ( "github.com/michaelquigley/pfxlog" idcfg "github.com/openziti/sdk-golang/ziti/config" - "github.com/openziti/ziti-tunnel-win/service/cziti" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" + "github.com/openziti/desktop-edge-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" ) var log = pfxlog.Logger() diff --git a/service/ziti-tunnel/main.go b/service/ziti-tunnel/main.go index 855e5e13..b7b68b9d 100644 --- a/service/ziti-tunnel/main.go +++ b/service/ziti-tunnel/main.go @@ -24,10 +24,10 @@ import ( "golang.org/x/sys/windows/svc/eventlog" "os" "strings" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/globals" "golang.org/x/sys/windows/svc" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/service" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/service" ) var log = globals.Logger() diff --git a/service/ziti-tunnel/service/debug.go b/service/ziti-tunnel/service/debug.go index 861ccee0..95155796 100644 --- a/service/ziti-tunnel/service/debug.go +++ b/service/ziti-tunnel/service/debug.go @@ -19,7 +19,7 @@ package service import ( idcfg "github.com/openziti/sdk-golang/ziti/config" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" ) func dbg() { diff --git a/service/ziti-tunnel/service/events.go b/service/ziti-tunnel/service/events.go index 5a644680..26a7a82a 100644 --- a/service/ziti-tunnel/service/events.go +++ b/service/ziti-tunnel/service/events.go @@ -17,7 +17,7 @@ package service -import "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" +import "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" const ( ADDED = "added" diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 186c3d34..cdef8683 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -26,12 +26,12 @@ import ( "github.com/openziti/foundation/identity/identity" idcfg "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/enroll" - "github.com/openziti/ziti-tunnel-win/service/cziti" - "github.com/openziti/ziti-tunnel-win/service/cziti/windns" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil" + "github.com/openziti/desktop-edge-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/cziti/windns" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/config" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/globals" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/idutil" "golang.org/x/sys/windows/svc" "golang.zx2c4.com/wireguard/tun" "io" diff --git a/service/ziti-tunnel/service/pkg-vars.go b/service/ziti-tunnel/service/pkg-vars.go index ca36cc19..ea0aa0f4 100644 --- a/service/ziti-tunnel/service/pkg-vars.go +++ b/service/ziti-tunnel/service/pkg-vars.go @@ -21,8 +21,8 @@ import ( "golang.org/x/sys/windows/svc" "sync" "time" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/globals" ) var pipeBase = `\\.\pipe\NetFoundry\tunneler\` diff --git a/service/ziti-tunnel/service/service.go b/service/ziti-tunnel/service/service.go index 7e0e303f..b87eaff6 100644 --- a/service/ziti-tunnel/service/service.go +++ b/service/ziti-tunnel/service/service.go @@ -23,7 +23,7 @@ import ( "fmt" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/debug" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/globals" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/globals" ) diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index e010af33..33283c44 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -21,10 +21,10 @@ import ( "bufio" "encoding/json" "fmt" - "github.com/openziti/ziti-tunnel-win/service/cziti" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/config" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/dto" - "github.com/openziti/ziti-tunnel-win/service/ziti-tunnel/idutil" + "github.com/openziti/desktop-edge-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/config" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/dto" + "github.com/openziti/desktop-edge-win/service/ziti-tunnel/idutil" "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" "net" diff --git a/service/ziti-wintun/main.go b/service/ziti-wintun/main.go index be5d0198..b6f65edf 100644 --- a/service/ziti-wintun/main.go +++ b/service/ziti-wintun/main.go @@ -28,8 +28,8 @@ import ( user2 "os/user" "path/filepath" "syscall" - "github.com/openziti/ziti-tunnel-win/service/cziti" - "github.com/openziti/ziti-tunnel-win/service/cziti/windns" + "github.com/openziti/desktop-edge-win/service/cziti" + "github.com/openziti/desktop-edge-win/service/cziti/windns" ) const bufferSize = 64 * 1024