diff --git a/api/api_endpoints.go b/api/api_endpoints.go index ded2fa18..f0eef2e1 100644 --- a/api/api_endpoints.go +++ b/api/api_endpoints.go @@ -1,12 +1,13 @@ package api import ( - "blocky/util" "encoding/json" "net/http" "strings" "time" + "github.com/0xERR0R/blocky/util" + "github.com/go-chi/chi" log "github.com/sirupsen/logrus" ) diff --git a/api/api_endpoints_test.go b/api/api_endpoints_test.go index 7150cddc..a8039500 100644 --- a/api/api_endpoints_test.go +++ b/api/api_endpoints_test.go @@ -1,11 +1,12 @@ package api import ( - . "blocky/helpertest" "encoding/json" "net/http" "time" + . "github.com/0xERR0R/blocky/helpertest" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/api/api_suite_test.go b/api/api_suite_test.go index b49b181b..e5715099 100644 --- a/api/api_suite_test.go +++ b/api/api_suite_test.go @@ -1,9 +1,9 @@ package api_test import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/cmd/blocking.go b/cmd/blocking.go index a3106fa4..91c72efa 100644 --- a/cmd/blocking.go +++ b/cmd/blocking.go @@ -1,14 +1,14 @@ package cmd import ( - "blocky/api" - "blocky/util" "encoding/json" "fmt" "net/http" "strings" - "blocky/log" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/spf13/cobra" ) diff --git a/cmd/blocking_test.go b/cmd/blocking_test.go index 9e5b2f94..ee655b6d 100644 --- a/cmd/blocking_test.go +++ b/cmd/blocking_test.go @@ -1,13 +1,14 @@ package cmd import ( - "blocky/api" "encoding/json" "net/http" "net/http/httptest" "net/url" "strconv" + "github.com/0xERR0R/blocky/api" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/cmd/cmd_suite_test.go b/cmd/cmd_suite_test.go index 99f24b2c..af7bb3a8 100644 --- a/cmd/cmd_suite_test.go +++ b/cmd/cmd_suite_test.go @@ -1,9 +1,9 @@ package cmd import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/cmd/lists.go b/cmd/lists.go index a47f3e56..1a695791 100644 --- a/cmd/lists.go +++ b/cmd/lists.go @@ -1,11 +1,12 @@ package cmd import ( - "blocky/api" - "blocky/log" "io/ioutil" "net/http" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/log" + "github.com/spf13/cobra" ) diff --git a/cmd/query.go b/cmd/query.go index 3e5896ae..db4beb7a 100644 --- a/cmd/query.go +++ b/cmd/query.go @@ -1,14 +1,14 @@ package cmd import ( - "blocky/api" - "blocky/util" "bytes" "encoding/json" "io/ioutil" "net/http" - "blocky/log" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" "github.com/spf13/cobra" diff --git a/cmd/query_test.go b/cmd/query_test.go index 50f71e65..777f2428 100644 --- a/cmd/query_test.go +++ b/cmd/query_test.go @@ -1,11 +1,12 @@ package cmd import ( - "blocky/api" "encoding/json" "net/http" "net/http/httptest" + "github.com/0xERR0R/blocky/api" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/cmd/root.go b/cmd/root.go index ea1da81b..adb9e942 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,14 +1,15 @@ package cmd import ( - "blocky/config" - "blocky/log" - "blocky/util" "fmt" "os" "strconv" "strings" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" + "github.com/spf13/cobra" ) diff --git a/cmd/root_test.go b/cmd/root_test.go index 57f0f7b8..f87035df 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -1,7 +1,7 @@ package cmd import ( - "blocky/log" + "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/cmd/serve.go b/cmd/serve.go index 12608bca..54db3815 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -1,17 +1,17 @@ package cmd import ( - "blocky/config" - "blocky/evt" - "blocky/server" - "blocky/util" "net/http" "os" "os/signal" "syscall" "time" - "blocky/log" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/evt" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/server" + "github.com/0xERR0R/blocky/util" "github.com/spf13/cobra" ) diff --git a/cmd/serve_test.go b/cmd/serve_test.go index 29055554..e0f17726 100644 --- a/cmd/serve_test.go +++ b/cmd/serve_test.go @@ -1,9 +1,10 @@ package cmd import ( - "blocky/config" "time" + "github.com/0xERR0R/blocky/config" + . "github.com/onsi/ginkgo" ) diff --git a/cmd/version.go b/cmd/version.go index ce906c6a..efc82ce6 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,9 +1,9 @@ package cmd import ( - "blocky/util" "fmt" + "github.com/0xERR0R/blocky/util" "github.com/spf13/cobra" ) diff --git a/config/config.go b/config/config.go index 79b29cb3..689064f6 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "blocky/log" + "github.com/0xERR0R/blocky/log" "gopkg.in/yaml.v2" ) diff --git a/config/config_suite_test.go b/config/config_suite_test.go index c5794952..5a84bf74 100644 --- a/config/config_suite_test.go +++ b/config/config_suite_test.go @@ -1,9 +1,9 @@ package config import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/config/config_test.go b/config/config_test.go index f16c4648..8831470d 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,11 +1,11 @@ package config import ( - . "blocky/log" "io/ioutil" "net" "os" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" diff --git a/go.mod b/go.mod index 87416f64..947e02d7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module blocky +module github.com/0xERR0R/blocky go 1.16 diff --git a/helpertest/helper.go b/helpertest/helper.go index 30af12ae..38817926 100644 --- a/helpertest/helper.go +++ b/helpertest/helper.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "os" - "blocky/log" + "github.com/0xERR0R/blocky/log" "github.com/miekg/dns" "github.com/onsi/gomega/types" diff --git a/lists/list_cache.go b/lists/list_cache.go index a70463f7..5acc2c84 100644 --- a/lists/list_cache.go +++ b/lists/list_cache.go @@ -1,8 +1,6 @@ package lists import ( - "blocky/evt" - "blocky/util" "bufio" "errors" "fmt" @@ -15,7 +13,9 @@ import ( "sync" "time" - "blocky/log" + "github.com/0xERR0R/blocky/evt" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/sirupsen/logrus" ) diff --git a/lists/list_cache_test.go b/lists/list_cache_test.go index 6efc1a17..84d817cb 100644 --- a/lists/list_cache_test.go +++ b/lists/list_cache_test.go @@ -1,15 +1,15 @@ package lists import ( - "blocky/evt" - . "blocky/helpertest" "net/http" + "net/http/httptest" + "os" "sync/atomic" "time" - "net/http/httptest" - "os" + "github.com/0xERR0R/blocky/evt" + . "github.com/0xERR0R/blocky/helpertest" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/lists/list_suite_test.go b/lists/list_suite_test.go index 604dc0e1..2f4a15b6 100644 --- a/lists/list_suite_test.go +++ b/lists/list_suite_test.go @@ -1,9 +1,10 @@ package lists import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/main.go b/main.go index ebb0ef95..494abd04 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,9 @@ package main import ( - "blocky/cmd" "os" + + "github.com/0xERR0R/blocky/cmd" ) func main() { diff --git a/metrics/metrics.go b/metrics/metrics.go index 77713671..c0333428 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "blocky/config" + "github.com/0xERR0R/blocky/config" "github.com/go-chi/chi" "github.com/prometheus/client_golang/prometheus" diff --git a/metrics/metrics_event_publisher.go b/metrics/metrics_event_publisher.go index dfe7a3dc..59c70964 100644 --- a/metrics/metrics_event_publisher.go +++ b/metrics/metrics_event_publisher.go @@ -1,12 +1,12 @@ package metrics import ( - "blocky/evt" - "blocky/lists" - "blocky/util" + "fmt" "time" - "fmt" + "github.com/0xERR0R/blocky/evt" + "github.com/0xERR0R/blocky/lists" + "github.com/0xERR0R/blocky/util" "github.com/prometheus/client_golang/prometheus" ) diff --git a/resolver/blocking_resolver.go b/resolver/blocking_resolver.go index 7815de48..d1ffd4cf 100644 --- a/resolver/blocking_resolver.go +++ b/resolver/blocking_resolver.go @@ -1,18 +1,18 @@ package resolver import ( - "blocky/api" - "blocky/config" - "blocky/evt" - "blocky/lists" - "blocky/util" "fmt" "net" "sort" "strings" "time" - "blocky/log" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/evt" + "github.com/0xERR0R/blocky/lists" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" "github.com/sirupsen/logrus" diff --git a/resolver/blocking_resolver_test.go b/resolver/blocking_resolver_test.go index 23f968c2..bc21f304 100644 --- a/resolver/blocking_resolver_test.go +++ b/resolver/blocking_resolver_test.go @@ -1,12 +1,12 @@ package resolver import ( - "blocky/config" - . "blocky/evt" - . "blocky/helpertest" - "blocky/lists" - . "blocky/log" - "blocky/util" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/evt" + . "github.com/0xERR0R/blocky/helpertest" + "github.com/0xERR0R/blocky/lists" + . "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "os" "time" diff --git a/resolver/caching_resolver.go b/resolver/caching_resolver.go index bb51ee88..3749b9fd 100644 --- a/resolver/caching_resolver.go +++ b/resolver/caching_resolver.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "blocky/config" - "blocky/evt" - "blocky/util" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/evt" + "github.com/0xERR0R/blocky/util" "github.com/0xERR0R/go-cache" "github.com/miekg/dns" diff --git a/resolver/caching_resolver_test.go b/resolver/caching_resolver_test.go index 184ee3ce..c7b8c247 100644 --- a/resolver/caching_resolver_test.go +++ b/resolver/caching_resolver_test.go @@ -3,10 +3,10 @@ package resolver import ( "time" - "blocky/config" - . "blocky/evt" - . "blocky/helpertest" - "blocky/util" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/evt" + . "github.com/0xERR0R/blocky/helpertest" + "github.com/0xERR0R/blocky/util" "github.com/0xERR0R/go-cache" "github.com/miekg/dns" diff --git a/resolver/client_names_resolver.go b/resolver/client_names_resolver.go index 9d04c374..4532143e 100644 --- a/resolver/client_names_resolver.go +++ b/resolver/client_names_resolver.go @@ -1,13 +1,14 @@ package resolver import ( - "blocky/config" - "blocky/util" "fmt" "net" "strings" "time" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/0xERR0R/go-cache" "github.com/miekg/dns" "github.com/sirupsen/logrus" diff --git a/resolver/client_names_resolver_test.go b/resolver/client_names_resolver_test.go index dfb6904c..18977891 100644 --- a/resolver/client_names_resolver_test.go +++ b/resolver/client_names_resolver_test.go @@ -1,12 +1,13 @@ package resolver import ( - "blocky/config" - "blocky/util" "errors" "fmt" "net" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/conditionall_upstream_resolver.go b/resolver/conditionall_upstream_resolver.go index ae8137d1..e1e56b15 100644 --- a/resolver/conditionall_upstream_resolver.go +++ b/resolver/conditionall_upstream_resolver.go @@ -1,11 +1,12 @@ package resolver import ( - "blocky/config" - "blocky/util" "fmt" "strings" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/sirupsen/logrus" ) diff --git a/resolver/conditionall_upstream_resolver_test.go b/resolver/conditionall_upstream_resolver_test.go index 51cadaf0..4a91a508 100644 --- a/resolver/conditionall_upstream_resolver_test.go +++ b/resolver/conditionall_upstream_resolver_test.go @@ -1,10 +1,10 @@ package resolver import ( - "blocky/config" - . "blocky/helpertest" - "blocky/log" - "blocky/util" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/helpertest" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" . "github.com/onsi/ginkgo" diff --git a/resolver/custom_dns_resolver.go b/resolver/custom_dns_resolver.go index 8ffa2f11..d4d7d797 100644 --- a/resolver/custom_dns_resolver.go +++ b/resolver/custom_dns_resolver.go @@ -1,12 +1,13 @@ package resolver import ( - "blocky/config" - "blocky/util" "fmt" "net" "strings" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/sirupsen/logrus" ) diff --git a/resolver/custom_dns_resolver_test.go b/resolver/custom_dns_resolver_test.go index bc82454f..cb8f0d48 100644 --- a/resolver/custom_dns_resolver_test.go +++ b/resolver/custom_dns_resolver_test.go @@ -1,10 +1,10 @@ package resolver import ( - "blocky/config" - . "blocky/helpertest" "net" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/helpertest" "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/ipv6_checker_test.go b/resolver/ipv6_checker_test.go index bbb52a1a..47195ce7 100644 --- a/resolver/ipv6_checker_test.go +++ b/resolver/ipv6_checker_test.go @@ -1,7 +1,7 @@ package resolver import ( - "blocky/util" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" . "github.com/onsi/ginkgo" diff --git a/resolver/metrics_resolver.go b/resolver/metrics_resolver.go index 62c91acf..9dfe75ef 100644 --- a/resolver/metrics_resolver.go +++ b/resolver/metrics_resolver.go @@ -1,12 +1,13 @@ package resolver import ( - "blocky/config" - "blocky/metrics" "fmt" "strings" "time" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/metrics" + "github.com/miekg/dns" "github.com/prometheus/client_golang/prometheus" ) diff --git a/resolver/metrics_resolver_test.go b/resolver/metrics_resolver_test.go index 058c71b3..19932b27 100644 --- a/resolver/metrics_resolver_test.go +++ b/resolver/metrics_resolver_test.go @@ -1,9 +1,10 @@ package resolver import ( - "blocky/config" "errors" + "github.com/0xERR0R/blocky/config" + "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/mocks.go b/resolver/mocks.go index 747c3ac2..0d483c82 100644 --- a/resolver/mocks.go +++ b/resolver/mocks.go @@ -1,8 +1,6 @@ package resolver import ( - "blocky/config" - "blocky/util" "io/ioutil" "net" "net/http" @@ -10,6 +8,9 @@ import ( "strconv" "strings" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/stretchr/testify/mock" ) diff --git a/resolver/parallel_best_resolver.go b/resolver/parallel_best_resolver.go index 07aeed85..1dde2069 100644 --- a/resolver/parallel_best_resolver.go +++ b/resolver/parallel_best_resolver.go @@ -1,13 +1,14 @@ package resolver import ( - "blocky/config" - "blocky/util" "fmt" "math" "strings" "time" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/mroth/weightedrand" "github.com/sirupsen/logrus" ) diff --git a/resolver/parallel_best_resolver_test.go b/resolver/parallel_best_resolver_test.go index 1bfc2336..ad46b16c 100644 --- a/resolver/parallel_best_resolver_test.go +++ b/resolver/parallel_best_resolver_test.go @@ -1,13 +1,13 @@ package resolver import ( - "blocky/config" - . "blocky/helpertest" - . "blocky/log" - "blocky/util" "strings" "time" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/helpertest" + . "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/query_logging_resolver.go b/resolver/query_logging_resolver.go index 7530bf6b..9ce937f0 100644 --- a/resolver/query_logging_resolver.go +++ b/resolver/query_logging_resolver.go @@ -1,8 +1,6 @@ package resolver import ( - "blocky/config" - "blocky/util" "encoding/csv" "fmt" "io" @@ -13,6 +11,9 @@ import ( "strings" "time" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/sirupsen/logrus" ) diff --git a/resolver/query_logging_resolver_test.go b/resolver/query_logging_resolver_test.go index 71974497..604a27f0 100644 --- a/resolver/query_logging_resolver_test.go +++ b/resolver/query_logging_resolver_test.go @@ -1,9 +1,6 @@ package resolver import ( - "blocky/config" - . "blocky/log" - "blocky/util" "bufio" "encoding/csv" "errors" @@ -14,6 +11,10 @@ import ( "path/filepath" "time" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/resolver.go b/resolver/resolver.go index 37f16c6b..2806f97e 100644 --- a/resolver/resolver.go +++ b/resolver/resolver.go @@ -1,13 +1,14 @@ package resolver import ( - "blocky/log" - "blocky/util" "fmt" "net" "strings" "time" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/sirupsen/logrus" ) diff --git a/resolver/resolver_suite_test.go b/resolver/resolver_suite_test.go index e78672b8..ceb66c9c 100644 --- a/resolver/resolver_suite_test.go +++ b/resolver/resolver_suite_test.go @@ -1,9 +1,10 @@ package resolver_test import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go index 39487fdb..e8758ad5 100644 --- a/resolver/resolver_test.go +++ b/resolver/resolver_test.go @@ -1,7 +1,7 @@ package resolver import ( - "blocky/config" + "github.com/0xERR0R/blocky/config" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/stats_resolver.go b/resolver/stats_resolver.go index 6936f483..5122f727 100644 --- a/resolver/stats_resolver.go +++ b/resolver/stats_resolver.go @@ -1,11 +1,12 @@ package resolver import ( - "blocky/stats" - "blocky/util" "fmt" "strings" + "github.com/0xERR0R/blocky/stats" + "github.com/0xERR0R/blocky/util" + "github.com/jedib0t/go-pretty/table" "github.com/miekg/dns" ) diff --git a/resolver/stats_resolver_test.go b/resolver/stats_resolver_test.go index 2d389720..b8679858 100644 --- a/resolver/stats_resolver_test.go +++ b/resolver/stats_resolver_test.go @@ -1,7 +1,7 @@ package resolver import ( - "blocky/util" + "github.com/0xERR0R/blocky/util" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/resolver/upstream_resolver.go b/resolver/upstream_resolver.go index 26b63bc7..c5cd7c41 100644 --- a/resolver/upstream_resolver.go +++ b/resolver/upstream_resolver.go @@ -1,8 +1,6 @@ package resolver import ( - "blocky/config" - "blocky/util" "bytes" "errors" "fmt" @@ -12,6 +10,9 @@ import ( "strconv" "time" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/util" + "github.com/miekg/dns" "github.com/sirupsen/logrus" ) diff --git a/resolver/upstream_resolver_test.go b/resolver/upstream_resolver_test.go index d1c9a4c8..9f710e20 100644 --- a/resolver/upstream_resolver_test.go +++ b/resolver/upstream_resolver_test.go @@ -1,14 +1,14 @@ package resolver import ( - "blocky/config" - . "blocky/helpertest" - "blocky/util" "crypto/tls" "fmt" "net/http" "time" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/helpertest" + "github.com/0xERR0R/blocky/util" "github.com/miekg/dns" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/server/server.go b/server/server.go index 615df0b6..d568f45b 100644 --- a/server/server.go +++ b/server/server.go @@ -1,20 +1,20 @@ package server import ( - "blocky/api" - "blocky/config" - "blocky/log" - "blocky/metrics" - "blocky/resolver" + "fmt" + "net" "net/http" "runtime" "runtime/debug" "strings" "time" - "blocky/util" - "fmt" - "net" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/metrics" + "github.com/0xERR0R/blocky/resolver" + "github.com/0xERR0R/blocky/util" "github.com/go-chi/chi" "github.com/miekg/dns" diff --git a/server/server_endpoints.go b/server/server_endpoints.go index a12e14b7..53823c75 100644 --- a/server/server_endpoints.go +++ b/server/server_endpoints.go @@ -1,12 +1,6 @@ package server import ( - "blocky/api" - "blocky/config" - "blocky/log" - "blocky/resolver" - "blocky/util" - "blocky/web" "encoding/base64" "encoding/json" "fmt" @@ -16,6 +10,13 @@ import ( "net/http" "strings" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/resolver" + "github.com/0xERR0R/blocky/util" + "github.com/0xERR0R/blocky/web" + "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/go-chi/cors" diff --git a/server/server_suite_test.go b/server/server_suite_test.go index 0234df81..f58203de 100644 --- a/server/server_suite_test.go +++ b/server/server_suite_test.go @@ -1,9 +1,9 @@ package server import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/server/server_test.go b/server/server_test.go index a892f4a0..223d6ce2 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -1,12 +1,6 @@ package server import ( - "blocky/api" - "blocky/config" - . "blocky/helpertest" - . "blocky/log" - "blocky/resolver" - "blocky/util" "bytes" "encoding/base64" "encoding/json" @@ -16,6 +10,13 @@ import ( "strings" "time" + "github.com/0xERR0R/blocky/api" + "github.com/0xERR0R/blocky/config" + . "github.com/0xERR0R/blocky/helpertest" + . "github.com/0xERR0R/blocky/log" + "github.com/0xERR0R/blocky/resolver" + "github.com/0xERR0R/blocky/util" + . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/stats/stats.go b/stats/stats.go index 76d9d8fd..1c56dc43 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -1,10 +1,11 @@ package stats import ( - "blocky/util" "strings" "sync" "time" + + "github.com/0xERR0R/blocky/util" ) const ( diff --git a/stats/stats_suite_test.go b/stats/stats_suite_test.go index f9fcc2e6..b424299a 100644 --- a/stats/stats_suite_test.go +++ b/stats/stats_suite_test.go @@ -1,9 +1,9 @@ package stats import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/util/bootstrap.go b/util/bootstrap.go index 6573fc14..cd2147a6 100644 --- a/util/bootstrap.go +++ b/util/bootstrap.go @@ -1,8 +1,8 @@ package util import ( - "blocky/config" - "blocky/log" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/log" "context" "fmt" diff --git a/util/common.go b/util/common.go index b8c0d72f..dedb774c 100644 --- a/util/common.go +++ b/util/common.go @@ -1,7 +1,6 @@ package util import ( - "blocky/config" "encoding/binary" "fmt" "net" @@ -10,7 +9,8 @@ import ( "sort" "strings" - "blocky/log" + "github.com/0xERR0R/blocky/config" + "github.com/0xERR0R/blocky/log" "github.com/miekg/dns" "github.com/sirupsen/logrus" diff --git a/util/common_test.go b/util/common_test.go index 25306eaa..eb05a85f 100644 --- a/util/common_test.go +++ b/util/common_test.go @@ -1,7 +1,6 @@ package util import ( - . "blocky/log" "errors" "fmt" "net" @@ -11,6 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/util/util_suite_test.go b/util/util_suite_test.go index eca4a12d..4248edc8 100644 --- a/util/util_suite_test.go +++ b/util/util_suite_test.go @@ -1,9 +1,9 @@ package util import ( - . "blocky/log" "testing" + . "github.com/0xERR0R/blocky/log" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" )