0xERR0R/blocky
1
0
Fork 0
mirror of https://github.com/0xERR0R/blocky.git synced 2026-10-11 21:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

use full-qualified name as module

Browse Source
This commit is contained in:
Dimitri Herzog
2021-08-27 13:41:36 +02:00
parent 010275b880
commit 919512959b
60 changed files with 161 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/api_endpoints.go
+2 -1
View File
@@ -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"
)
api/api_endpoints_test.go
+2 -1
View File
@@ -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"
api/api_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package api_test
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
cmd/blocking.go
+3 -3
View File
@@ -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"
)
cmd/blocking_test.go
+2 -1
View File
@@ -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"
)
cmd/cmd_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package cmd
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
cmd/lists.go
+3 -2
View File
@@ -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"
)
cmd/query.go
+3 -3
View File
@@ -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"
cmd/query_test.go
+2 -1
View File
@@ -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"
)
cmd/root.go
+4 -3
View File
@@ -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"
)
cmd/root_test.go
+1 -1
View File
@@ -1,7 +1,7 @@
package cmd
import (
"blocky/log"
"github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
cmd/serve.go
+5 -5
View File
@@ -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"
)
cmd/serve_test.go
+2 -1
View File
@@ -1,9 +1,10 @@
package cmd
import (
"blocky/config"
"time"
"github.com/0xERR0R/blocky/config"
. "github.com/onsi/ginkgo"
)
cmd/version.go
+1 -1
View File
@@ -1,9 +1,9 @@
package cmd
import (
"blocky/util"
"fmt"
"github.com/0xERR0R/blocky/util"
"github.com/spf13/cobra"
)
config/config.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"strconv"
"strings"
"blocky/log"
"github.com/0xERR0R/blocky/log"
"gopkg.in/yaml.v2"
)
config/config_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package config
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
config/config_test.go
+1 -1
View File
@@ -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"
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module blocky
module github.com/0xERR0R/blocky
go 1.16
helpertest/helper.go
+1 -1
View File
@@ -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"
lists/list_cache.go
+3 -3
View File
@@ -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"
)
lists/list_cache_test.go
+4 -4
View File
@@ -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"
)
lists/list_suite_test.go
+2 -1
View File
@@ -1,9 +1,10 @@
package lists
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
main.go
+2 -1
View File
@@ -1,8 +1,9 @@
package main
import (
"blocky/cmd"
"os"
"github.com/0xERR0R/blocky/cmd"
)
func main() {
metrics/metrics.go
+1 -1
View File
@@ -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"
metrics/metrics_event_publisher.go
+4 -4
View File
@@ -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"
)
resolver/blocking_resolver.go
+6 -6
View File
@@ -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"
resolver/blocking_resolver_test.go
+6 -6
View File
@@ -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"
resolver/caching_resolver.go
+3 -3
View File
@@ -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"
resolver/caching_resolver_test.go
+4 -4
View File
@@ -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"
resolver/client_names_resolver.go
+3 -2
View File
@@ -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"
resolver/client_names_resolver_test.go
+3 -2
View File
@@ -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"
resolver/conditionall_upstream_resolver.go
+3 -2
View File
@@ -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"
)
resolver/conditionall_upstream_resolver_test.go
+4 -4
View File
@@ -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"
resolver/custom_dns_resolver.go
+3 -2
View File
@@ -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"
)
resolver/custom_dns_resolver_test.go
+2 -2
View File
@@ -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"
resolver/ipv6_checker_test.go
+1 -1
View File
@@ -1,7 +1,7 @@
package resolver
import (
"blocky/util"
"github.com/0xERR0R/blocky/util"
"github.com/miekg/dns"
. "github.com/onsi/ginkgo"
resolver/metrics_resolver.go
+3 -2
View File
@@ -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"
)
resolver/metrics_resolver_test.go
+2 -1
View File
@@ -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"
resolver/mocks.go
+3 -2
View File
@@ -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"
)
resolver/parallel_best_resolver.go
+3 -2
View File
@@ -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"
)
resolver/parallel_best_resolver_test.go
+4 -4
View File
@@ -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"
resolver/query_logging_resolver.go
+3 -2
View File
@@ -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"
)
resolver/query_logging_resolver_test.go
+4 -3
View File
@@ -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"
resolver/resolver.go
+3 -2
View File
@@ -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"
)
resolver/resolver_suite_test.go
+2 -1
View File
@@ -1,9 +1,10 @@
package resolver_test
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
resolver/resolver_test.go
+1 -1
View File
@@ -1,7 +1,7 @@
package resolver
import (
"blocky/config"
"github.com/0xERR0R/blocky/config"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
resolver/stats_resolver.go
+3 -2
View File
@@ -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"
)
resolver/stats_resolver_test.go
+1 -1
View File
@@ -1,7 +1,7 @@
package resolver
import (
"blocky/util"
"github.com/0xERR0R/blocky/util"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
resolver/upstream_resolver.go
+3 -2
View File
@@ -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"
)
resolver/upstream_resolver_test.go
+3 -3
View File
@@ -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"
server/server.go
+8 -8
View File
@@ -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"
server/server_endpoints.go
+7 -6
View File
@@ -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"
server/server_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package server
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
server/server_test.go
+7 -6
View File
@@ -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"
stats/stats.go
+2 -1
View File
@@ -1,10 +1,11 @@
package stats
import (
"blocky/util"
"strings"
"sync"
"time"
"github.com/0xERR0R/blocky/util"
)
const (
stats/stats_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package stats
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
util/bootstrap.go
+2 -2
View File
@@ -1,8 +1,8 @@
package util
import (
"blocky/config"
"blocky/log"
"github.com/0xERR0R/blocky/config"
"github.com/0xERR0R/blocky/log"
"context"
"fmt"
util/common.go
+2 -2
View File
@@ -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"
util/common_test.go
+1 -1
View File
@@ -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"
)
util/util_suite_test.go
+1 -1
View File
@@ -1,9 +1,9 @@
package util
import (
. "blocky/log"
"testing"
. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)