diff --git a/.gitignore b/.gitignore index ac30f00..56d06b1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /custom.html /vendor/ .vscode/ +.idea/ /bin/ diff --git a/cmd/echoip/main.go b/cmd/echoip/main.go index 7c0a668..b47e74c 100644 --- a/cmd/echoip/main.go +++ b/cmd/echoip/main.go @@ -7,11 +7,11 @@ import ( "os" - "github.com/mpolden/echoip/http" - "github.com/mpolden/echoip/iputil" - "github.com/mpolden/echoip/iputil/geo" - "github.com/mpolden/echoip/iputil/ipstack" - parser "github.com/mpolden/echoip/iputil/paser" + "github.com/levelsoftware/echoip/http" + "github.com/levelsoftware/echoip/iputil" + "github.com/levelsoftware/echoip/iputil/geo" + "github.com/levelsoftware/echoip/iputil/ipstack" + parser "github.com/levelsoftware/echoip/iputil/paser" ipstackApi "github.com/qioalice/ipstack" ) diff --git a/go.mod b/go.mod index 55d4af8..38293f9 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/mpolden/echoip +module github.com/levelsoftware/echoip go 1.13 require ( github.com/oschwald/geoip2-golang v1.5.0 - github.com/qioalice/ipstack v1.0.1 // indirect + github.com/qioalice/ipstack v1.0.1 golang.org/x/sys v0.0.0-20210223212115-eede4237b368 // indirect ) diff --git a/go.sum b/go.sum index f585e6f..8bfbc1b 100644 --- a/go.sum +++ b/go.sum @@ -9,16 +9,13 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/qioalice/ipstack v1.0.1 h1:Ync2O+tR2AH9/TzTg4aeJxd9c1Xz2CeH1joECwnhvms= github.com/qioalice/ipstack v1.0.1/go.mod h1:6eB9LdNCUdUoOsfDB8Pn2GpmD2I+f2k3yR30ceuf/rY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/sys v0.0.0-20191224085550-c709ea063b76 h1:Dho5nD6R3PcW2SH1or8vS0dszDaXRxIw55lBX7XiE5g= golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210223212115-eede4237b368 h1:fDE3p0qf2V1co1vfj3/o87Ps8Hq6QTGNxJ5Xe7xSp80= golang.org/x/sys v0.0.0-20210223212115-eede4237b368/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/http/cache.go b/http/cache.go index 2882fc9..99fcc79 100644 --- a/http/cache.go +++ b/http/cache.go @@ -7,7 +7,7 @@ import ( "net" "sync" - parser "github.com/mpolden/echoip/iputil/paser" + parser "github.com/levelsoftware/echoip/iputil/paser" ) type Cache struct { diff --git a/http/cache_test.go b/http/cache_test.go index c33aff9..76bbc1b 100644 --- a/http/cache_test.go +++ b/http/cache_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - parser "github.com/mpolden/echoip/iputil/paser" + parser "github.com/levelsoftware/echoip/iputil/paser" ) func TestCacheCapacity(t *testing.T) { diff --git a/http/http.go b/http/http.go index 9693d2b..39fe1c5 100644 --- a/http/http.go +++ b/http/http.go @@ -11,8 +11,8 @@ import ( "net/http/pprof" - parser "github.com/mpolden/echoip/iputil/paser" - "github.com/mpolden/echoip/useragent" + parser "github.com/levelsoftware/echoip/iputil/paser" + "github.com/levelsoftware/echoip/useragent" "net" "net/http" diff --git a/http/http_test.go b/http/http_test.go index dd136a3..f6c54e1 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/mpolden/echoip/iputil" - "github.com/mpolden/echoip/iputil/geo" - parser "github.com/mpolden/echoip/iputil/paser" + "github.com/levelsoftware/echoip/iputil" + "github.com/levelsoftware/echoip/iputil/geo" + parser "github.com/levelsoftware/echoip/iputil/paser" ) func lookupAddr(net.IP) (string, error) { return "localhost", nil } diff --git a/iputil/geo/geo.go b/iputil/geo/geo.go index a170a81..d92f36b 100644 --- a/iputil/geo/geo.go +++ b/iputil/geo/geo.go @@ -5,8 +5,8 @@ import ( "math" "net" - "github.com/mpolden/echoip/iputil" - parser "github.com/mpolden/echoip/iputil/paser" + "github.com/levelsoftware/echoip/iputil" + parser "github.com/levelsoftware/echoip/iputil/paser" geoip2 "github.com/oschwald/geoip2-golang" ) diff --git a/iputil/ipstack/ipstack.go b/iputil/ipstack/ipstack.go index 207d6f9..449e489 100644 --- a/iputil/ipstack/ipstack.go +++ b/iputil/ipstack/ipstack.go @@ -5,8 +5,8 @@ import ( "net" "time" - "github.com/mpolden/echoip/iputil" - parser "github.com/mpolden/echoip/iputil/paser" + "github.com/levelsoftware/echoip/iputil" + parser "github.com/levelsoftware/echoip/iputil/paser" "github.com/qioalice/ipstack" ) diff --git a/iputil/paser/parser.go b/iputil/paser/parser.go index c4899c0..7f8226d 100644 --- a/iputil/paser/parser.go +++ b/iputil/paser/parser.go @@ -4,7 +4,7 @@ import ( "math/big" "net" - "github.com/mpolden/echoip/useragent" + "github.com/levelsoftware/echoip/useragent" ) type Parser interface {