Skip to content

Commit

Permalink
use full-qualified name as module
Browse files Browse the repository at this point in the history
  • Loading branch information
@0xERR0R
0xERR0R committed Aug 27, 2021
1 parent 010275b commit 9195129
Show file tree
Hide file tree
Showing 60 changed files with 161 additions and 135 deletions.
3 changes: 2 additions & 1 deletion api/api_endpoints.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion api/api_endpoints_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion api/api_suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package api_test

import (
. "blocky/log"
"testing"

. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/blocking.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/blocking_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/cmd_suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
. "blocky/log"
"testing"

. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

Expand Down
5 changes: 3 additions & 2 deletions cmd/lists.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/query.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 2 additions & 1 deletion cmd/query_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
7 changes: 4 additions & 3 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/root_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"blocky/log"
"github.com/0xERR0R/blocky/log"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
10 changes: 5 additions & 5 deletions cmd/serve.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/serve_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package cmd

import (
"blocky/config"
"time"

"github.com/0xERR0R/blocky/config"

. "github.com/onsi/ginkgo"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cmd

import (
"blocky/util"
"fmt"

"github.com/0xERR0R/blocky/util"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strconv"
"strings"

"blocky/log"
"github.com/0xERR0R/blocky/log"

"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion config/config_suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package config

import (
. "blocky/log"
"testing"

. "github.com/0xERR0R/blocky/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module blocky
module github.com/0xERR0R/blocky

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion helpertest/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions lists/list_cache.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package lists

import (
"blocky/evt"
"blocky/util"
"bufio"
"errors"
"fmt"
Expand All @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions lists/list_cache_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
3 changes: 2 additions & 1 deletion lists/list_suite_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package lists

import (
. "blocky/log"
"testing"

. "github.com/0xERR0R/blocky/log"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
3 changes: 2 additions & 1 deletion main.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package main

import (
"blocky/cmd"
"os"

"github.com/0xERR0R/blocky/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion metrics/metrics.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
8 changes: 4 additions & 4 deletions metrics/metrics_event_publisher.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions resolver/blocking_resolver.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
12 changes: 6 additions & 6 deletions resolver/blocking_resolver_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions resolver/caching_resolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 9195129

Please sign in to comment.