From b347ed74c5dc2fbdae791fe226857df42e4a163f Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 9 Jul 2018 08:54:04 +0200 Subject: [PATCH] update import paths --- cmd/backupd/backupd.go | 6 +++--- cmd/captured/captured.go | 2 +- cmd/dhcp4/dhcp4.go | 6 +++--- cmd/dhcp4d/dhcp4d.go | 6 +++--- cmd/dhcp6/dhcp6.go | 7 ++++--- cmd/diagd/diagd.go | 4 ++-- cmd/dnsd/dnsd.go | 8 ++++---- cmd/netconfigd/netconfigd.go | 6 +++--- cmd/radvd/radvd.go | 4 ++-- cmd/randomd/randomd.go | 3 ++- integration/dhcpv4/dhcpv4_test.go | 4 ++-- integration/dhcpv6/dhcpv6_test.go | 4 ++-- integration/dns/dns_test.go | 2 +- integration/netconfig/netconfig_test.go | 3 ++- integration/radvd/radvd_test.go | 3 ++- internal/backup/backup_test.go | 3 ++- internal/dhcp4d/dhcp4d.go | 2 +- internal/diag/diag_test.go | 3 ++- internal/dns/dns.go | 2 +- internal/dns/dns_test.go | 3 ++- internal/multilisten/multilisten.go | 3 ++- internal/netconfig/netconfig.go | 8 ++++---- internal/testing/dnsmasq/example_test.go | 3 ++- 23 files changed, 52 insertions(+), 43 deletions(-) diff --git a/cmd/backupd/backupd.go b/cmd/backupd/backupd.go index 9791d2e..016c682 100644 --- a/cmd/backupd/backupd.go +++ b/cmd/backupd/backupd.go @@ -24,9 +24,9 @@ import ( "github.com/gokrazy/gokrazy" - "router7/internal/backup" - "router7/internal/multilisten" - "router7/internal/teelogger" + "github.com/rtr7/router7/internal/backup" + "github.com/rtr7/router7/internal/multilisten" + "github.com/rtr7/router7/internal/teelogger" ) var log = teelogger.NewConsole() diff --git a/cmd/captured/captured.go b/cmd/captured/captured.go index 98dddae..35e6a55 100644 --- a/cmd/captured/captured.go +++ b/cmd/captured/captured.go @@ -26,7 +26,7 @@ import ( "sync" "syscall" - "router7/internal/multilisten" + "github.com/rtr7/router7/internal/multilisten" "github.com/gokrazy/gokrazy" "github.com/google/gopacket" diff --git a/cmd/dhcp4/dhcp4.go b/cmd/dhcp4/dhcp4.go index 282204f..e6010da 100644 --- a/cmd/dhcp4/dhcp4.go +++ b/cmd/dhcp4/dhcp4.go @@ -28,9 +28,9 @@ import ( "syscall" "time" - "router7/internal/dhcp4" - "router7/internal/notify" - "router7/internal/teelogger" + "github.com/rtr7/router7/internal/dhcp4" + "github.com/rtr7/router7/internal/notify" + "github.com/rtr7/router7/internal/teelogger" ) var log = teelogger.NewConsole() diff --git a/cmd/dhcp4d/dhcp4d.go b/cmd/dhcp4d/dhcp4d.go index 6325aa8..0652eea 100644 --- a/cmd/dhcp4d/dhcp4d.go +++ b/cmd/dhcp4d/dhcp4d.go @@ -22,9 +22,9 @@ import ( "os" "syscall" - "router7/internal/dhcp4d" - "router7/internal/notify" - "router7/internal/teelogger" + "github.com/rtr7/router7/internal/dhcp4d" + "github.com/rtr7/router7/internal/notify" + "github.com/rtr7/router7/internal/teelogger" "github.com/krolaw/dhcp4" "github.com/krolaw/dhcp4/conn" diff --git a/cmd/dhcp6/dhcp6.go b/cmd/dhcp6/dhcp6.go index d9695f6..bd86a57 100644 --- a/cmd/dhcp6/dhcp6.go +++ b/cmd/dhcp6/dhcp6.go @@ -23,11 +23,12 @@ import ( "os" "os/signal" "path/filepath" - "router7/internal/dhcp6" - "router7/internal/notify" - "router7/internal/teelogger" "syscall" "time" + + "github.com/rtr7/router7/internal/dhcp6" + "github.com/rtr7/router7/internal/notify" + "github.com/rtr7/router7/internal/teelogger" ) var log = teelogger.NewConsole() diff --git a/cmd/diagd/diagd.go b/cmd/diagd/diagd.go index 4749416..779737c 100644 --- a/cmd/diagd/diagd.go +++ b/cmd/diagd/diagd.go @@ -31,8 +31,8 @@ import ( "github.com/gokrazy/gokrazy" - "router7/internal/diag" - "router7/internal/multilisten" + "github.com/rtr7/router7/internal/diag" + "github.com/rtr7/router7/internal/multilisten" ) var httpListeners = multilisten.NewPool() diff --git a/cmd/dnsd/dnsd.go b/cmd/dnsd/dnsd.go index ee877ab..67daa2c 100644 --- a/cmd/dnsd/dnsd.go +++ b/cmd/dnsd/dnsd.go @@ -29,10 +29,10 @@ import ( "github.com/gokrazy/gokrazy" miekgdns "github.com/miekg/dns" - "router7/internal/dhcp4d" - "router7/internal/dns" - "router7/internal/multilisten" - "router7/internal/netconfig" + "github.com/rtr7/router7/internal/dhcp4d" + "github.com/rtr7/router7/internal/dns" + "github.com/rtr7/router7/internal/multilisten" + "github.com/rtr7/router7/internal/netconfig" _ "net/http/pprof" ) diff --git a/cmd/netconfigd/netconfigd.go b/cmd/netconfigd/netconfigd.go index 1b8c2f9..f336231 100644 --- a/cmd/netconfigd/netconfigd.go +++ b/cmd/netconfigd/netconfigd.go @@ -30,9 +30,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" - "router7/internal/multilisten" - "router7/internal/netconfig" - "router7/internal/teelogger" + "github.com/rtr7/router7/internal/multilisten" + "github.com/rtr7/router7/internal/netconfig" + "github.com/rtr7/router7/internal/teelogger" ) var log = teelogger.NewConsole() diff --git a/cmd/radvd/radvd.go b/cmd/radvd/radvd.go index 7a4cf57..616e2b3 100644 --- a/cmd/radvd/radvd.go +++ b/cmd/radvd/radvd.go @@ -24,8 +24,8 @@ import ( "os/signal" "syscall" - "router7/internal/dhcp6" - "router7/internal/radvd" + "github.com/rtr7/router7/internal/dhcp6" + "github.com/rtr7/router7/internal/radvd" ) func logic() error { diff --git a/cmd/randomd/randomd.go b/cmd/randomd/randomd.go index 926f427..5172aab 100644 --- a/cmd/randomd/randomd.go +++ b/cmd/randomd/randomd.go @@ -20,11 +20,12 @@ import ( "io/ioutil" "os" "os/signal" - "router7/internal/teelogger" "syscall" "time" "unsafe" + "github.com/rtr7/router7/internal/teelogger" + "golang.org/x/sys/unix" ) diff --git a/integration/dhcpv4/dhcpv4_test.go b/integration/dhcpv4/dhcpv4_test.go index 58f8b9d..fd1ce0d 100644 --- a/integration/dhcpv4/dhcpv4_test.go +++ b/integration/dhcpv4/dhcpv4_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "router7/internal/dhcp4" - "router7/internal/testing/dnsmasq" + "github.com/rtr7/router7/internal/dhcp4" + "github.com/rtr7/router7/internal/testing/dnsmasq" "github.com/google/go-cmp/cmp" ) diff --git a/integration/dhcpv6/dhcpv6_test.go b/integration/dhcpv6/dhcpv6_test.go index e5d5b38..940f05c 100644 --- a/integration/dhcpv6/dhcpv6_test.go +++ b/integration/dhcpv6/dhcpv6_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "router7/internal/dhcp6" - "router7/internal/testing/dnsmasq" + "github.com/rtr7/router7/internal/dhcp6" + "github.com/rtr7/router7/internal/testing/dnsmasq" "github.com/google/go-cmp/cmp" ) diff --git a/integration/dns/dns_test.go b/integration/dns/dns_test.go index caae5e3..65794ae 100644 --- a/integration/dns/dns_test.go +++ b/integration/dns/dns_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "router7/internal/dns" + "github.com/rtr7/router7/internal/dns" miekgdns "github.com/miekg/dns" ) diff --git a/integration/netconfig/netconfig_test.go b/integration/netconfig/netconfig_test.go index c63f915..d7ae4b1 100644 --- a/integration/netconfig/netconfig_test.go +++ b/integration/netconfig/netconfig_test.go @@ -21,10 +21,11 @@ import ( "os/exec" "path/filepath" "regexp" - "router7/internal/netconfig" "strings" "testing" + "github.com/rtr7/router7/internal/netconfig" + "github.com/google/go-cmp/cmp" "github.com/google/nftables/expr" ) diff --git a/integration/radvd/radvd_test.go b/integration/radvd/radvd_test.go index c4b6dd0..beae733 100644 --- a/integration/radvd/radvd_test.go +++ b/integration/radvd/radvd_test.go @@ -19,9 +19,10 @@ import ( "net" "os" "os/exec" - "router7/internal/radvd" "testing" + "github.com/rtr7/router7/internal/radvd" + "github.com/google/go-cmp/cmp" ) diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go index 0c126e2..3fe9bc4 100644 --- a/internal/backup/backup_test.go +++ b/internal/backup/backup_test.go @@ -20,8 +20,9 @@ import ( "os" "os/exec" "path/filepath" - "router7/internal/backup" "testing" + + "github.com/rtr7/router7/internal/backup" ) func TestArchive(t *testing.T) { diff --git a/internal/dhcp4d/dhcp4d.go b/internal/dhcp4d/dhcp4d.go index f402916..5ab55e0 100644 --- a/internal/dhcp4d/dhcp4d.go +++ b/internal/dhcp4d/dhcp4d.go @@ -23,7 +23,7 @@ import ( "syscall" "time" - "router7/internal/netconfig" + "github.com/rtr7/router7/internal/netconfig" "github.com/google/gopacket" "github.com/google/gopacket/layers" diff --git a/internal/diag/diag_test.go b/internal/diag/diag_test.go index 7fe5a8f..ccc126f 100644 --- a/internal/diag/diag_test.go +++ b/internal/diag/diag_test.go @@ -15,9 +15,10 @@ package diag_test import ( - "router7/internal/diag" "testing" + "github.com/rtr7/router7/internal/diag" + "github.com/google/go-cmp/cmp" ) diff --git a/internal/dns/dns.go b/internal/dns/dns.go index 8897d12..329d859 100644 --- a/internal/dns/dns.go +++ b/internal/dns/dns.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "router7/internal/dhcp4d" + "github.com/rtr7/router7/internal/dhcp4d" "github.com/miekg/dns" "github.com/prometheus/client_golang/prometheus" diff --git a/internal/dns/dns_test.go b/internal/dns/dns_test.go index a9a93aa..d6ffd48 100644 --- a/internal/dns/dns_test.go +++ b/internal/dns/dns_test.go @@ -18,9 +18,10 @@ import ( "bytes" "net" "os" - "router7/internal/dhcp4d" "testing" + "github.com/rtr7/router7/internal/dhcp4d" + "github.com/miekg/dns" ) diff --git a/internal/multilisten/multilisten.go b/internal/multilisten/multilisten.go index 8dff7b1..2e8613d 100644 --- a/internal/multilisten/multilisten.go +++ b/internal/multilisten/multilisten.go @@ -21,8 +21,9 @@ import ( "io/ioutil" "log" "path/filepath" - "router7/internal/dhcp6" "sync" + + "github.com/rtr7/router7/internal/dhcp6" ) type Listener interface { diff --git a/internal/netconfig/netconfig.go b/internal/netconfig/netconfig.go index 7d30dd0..17b5c2f 100644 --- a/internal/netconfig/netconfig.go +++ b/internal/netconfig/netconfig.go @@ -33,10 +33,10 @@ import ( "github.com/vishvananda/netlink" "golang.org/x/sys/unix" - "router7/internal/dhcp4" - "router7/internal/dhcp6" - "router7/internal/notify" - "router7/internal/teelogger" + "github.com/rtr7/router7/internal/dhcp4" + "github.com/rtr7/router7/internal/dhcp6" + "github.com/rtr7/router7/internal/notify" + "github.com/rtr7/router7/internal/teelogger" ) var log = teelogger.NewConsole() diff --git a/internal/testing/dnsmasq/example_test.go b/internal/testing/dnsmasq/example_test.go index 61331c7..6ac3c39 100644 --- a/internal/testing/dnsmasq/example_test.go +++ b/internal/testing/dnsmasq/example_test.go @@ -15,10 +15,11 @@ package dnsmasq_test import ( - "router7/internal/testing/dnsmasq" "strings" "testing" + "github.com/rtr7/router7/internal/testing/dnsmasq" + "github.com/google/go-cmp/cmp" )