diff --git a/README.md b/README.md index da7fe223..ffbaeb65 100644 --- a/README.md +++ b/README.md @@ -24,20 +24,20 @@ brew install ipinfo-cli OR to install the latest `amd64` version without automatic updates: ```bash -curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.1/macos.sh | sh +curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.2/macos.sh | sh ``` ### Debian / Ubuntu (amd64) ```bash -curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.1/deb.sh | sh +curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.2/deb.sh | sh ``` OR ```bash -curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.1/ipinfo_2.0.1.deb -sudo dpkg -i ipinfo_2.0.1.deb +curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.2/ipinfo_2.0.2.deb +sudo dpkg -i ipinfo_2.0.2.deb ``` ### Using `go get` @@ -91,12 +91,12 @@ After choosing a platform `PLAT` from above, run: ```bash # for Windows, use ".zip" instead of ".tar.gz" -curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.1/ipinfo_2.0.1_${PLAT}.tar.gz +curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.2/ipinfo_2.0.2_${PLAT}.tar.gz # OR -wget https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.1/ipinfo_2.0.1_${PLAT}.tar.gz +wget https://github.com/ipinfo/cli/releases/download/ipinfo-2.0.2/ipinfo_2.0.2_${PLAT}.tar.gz -tar -xvf ipinfo_2.0.1_${PLAT}.tar.gz -mv ipinfo_2.0.1_${PLAT} /usr/local/bin/ipinfo +tar -xvf ipinfo_2.0.2_${PLAT}.tar.gz +mv ipinfo_2.0.2_${PLAT} /usr/local/bin/ipinfo ``` ### Using `git` diff --git a/go.mod b/go.mod index 789546f9..5928bc6e 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,14 @@ module github.com/ipinfo/cli go 1.16 require ( - github.com/hashicorp/go-multierror v1.1.1 - github.com/posener/script v1.1.5 github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.10.0 github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/ipinfo/go/v2 v2.5.1 + github.com/hashicorp/go-multierror v1.1.1 + github.com/ipinfo/go/v2 v2.5.3 github.com/jszwec/csvutil v1.4.0 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 + github.com/posener/script v1.1.5 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988 // indirect diff --git a/go.sum b/go.sum index af1291e4..0be966c6 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/ipinfo/go/v2 v2.5.1 h1:qR33bLrS39TktuwaoXMLnoj8jXyhQOsD3YVEZP9kOLU= -github.com/ipinfo/go/v2 v2.5.1/go.mod h1:2MrJVdUamrTc5VdC7yrbKGbsOOxMtdUpnpBJmtZgA8o= +github.com/ipinfo/go/v2 v2.5.3 h1:N8Ll2LDgzA7NTmHSaaQcFzmVw0RLyuSNDwX5cZRyA/o= +github.com/ipinfo/go/v2 v2.5.3/go.mod h1:2MrJVdUamrTc5VdC7yrbKGbsOOxMtdUpnpBJmtZgA8o= github.com/jszwec/csvutil v1.4.0 h1:ro7gZN8PRsyNUEX8qE/eYPE5/kffEXMs+4eRcOd1oUk= github.com/jszwec/csvutil v1.4.0/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg= github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= @@ -21,7 +21,6 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 h1:Qj1ukM4GlMWXNdMBuXcXfz/Kw9s1qm0CLY32QxuSImI= github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -29,7 +28,6 @@ github.com/posener/script v1.1.5 h1:su+9YHNlevT+Hlq2Xul5skh5kYDIBE+x4xu+5mLDT9o= github.com/posener/script v1.1.5/go.mod h1:Rg3ijooqulo05aGLyGsHoLmIOUzHUVK19WVgrYBPU/E= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= @@ -45,7 +43,6 @@ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlp golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 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 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= diff --git a/ipinfo/deb.sh b/ipinfo/deb.sh index 3c502a29..a374442c 100755 --- a/ipinfo/deb.sh +++ b/ipinfo/deb.sh @@ -1,6 +1,6 @@ #!/bin/sh -VSN=2.0.1 +VSN=2.0.2 curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-${VSN}/ipinfo_${VSN}.deb sudo dpkg -i ipinfo_${VSN}.deb diff --git a/ipinfo/dist/DEBIAN/control b/ipinfo/dist/DEBIAN/control index 49e6ac34..196824cc 100644 --- a/ipinfo/dist/DEBIAN/control +++ b/ipinfo/dist/DEBIAN/control @@ -1,6 +1,6 @@ Source: ipinfo Section: utils -Version: 2.0.1 +Version: 2.0.2 Priority: optional Maintainer: IPinfo Vcs-Git: https://github.com/ipinfo/cli diff --git a/ipinfo/macos.sh b/ipinfo/macos.sh index 49c0eb94..5e3c5115 100755 --- a/ipinfo/macos.sh +++ b/ipinfo/macos.sh @@ -1,6 +1,6 @@ #!/bin/sh -VSN=2.0.1 +VSN=2.0.2 PLAT=darwin_amd64 curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-${VSN}/ipinfo_${VSN}_${PLAT}.tar.gz diff --git a/ipinfo/main.go b/ipinfo/main.go index 36cc8f98..ad7ce8d1 100644 --- a/ipinfo/main.go +++ b/ipinfo/main.go @@ -13,7 +13,7 @@ import ( ) var progBase = filepath.Base(os.Args[0]) -var version = "2.0.1" +var version = "2.0.2" var ii *ipinfo.Client diff --git a/vendor/github.com/ipinfo/go/v2/ipinfo/client.go b/vendor/github.com/ipinfo/go/v2/ipinfo/client.go index 8fb53fcb..22dcecc3 100644 --- a/vendor/github.com/ipinfo/go/v2/ipinfo/client.go +++ b/vendor/github.com/ipinfo/go/v2/ipinfo/client.go @@ -13,7 +13,7 @@ import ( const ( defaultBaseURL = "https://ipinfo.io/" - defaultUserAgent = "IPinfoClient/Go/2.5.1" + defaultUserAgent = "IPinfoClient/Go/2.5.3" ) // A Client is the main handler to communicate with the IPinfo API. diff --git a/vendor/github.com/ipinfo/go/v2/ipinfo/summary.go b/vendor/github.com/ipinfo/go/v2/ipinfo/summary.go index 647a9bc6..31d26604 100644 --- a/vendor/github.com/ipinfo/go/v2/ipinfo/summary.go +++ b/vendor/github.com/ipinfo/go/v2/ipinfo/summary.go @@ -3,7 +3,6 @@ package ipinfo import ( "bytes" "encoding/json" - "errors" "net" ) @@ -32,27 +31,19 @@ type IPSummary struct { } // GetIPSummary returns summarized results for a group of IPs. -// -// `ips` must contain at least 10 unique IPs, and a total maximum of 1000. func GetIPSummary(ips []net.IP) (*IPSummary, error) { return DefaultClient.GetIPSummary(ips) } // GetIPSummary returns summarized results for a group of IPs. -// -// `ips` must contain at least 10 unique IPs, and a total maximum of 1000. func (c *Client) GetIPSummary(ips []net.IP) (*IPSummary, error) { - if len(ips) < 10 || len(ips) > 1000 { - return nil, errors.New("unique ip count must be >10 && <1000") - } - jsonArrStr, err := json.Marshal(ips) if err != nil { return nil, err } jsonBuf := bytes.NewBuffer(jsonArrStr) - req, err := c.newRequest(nil, "POST", "summarize", jsonBuf) + req, err := c.newRequest(nil, "POST", "summarize?cli=1", jsonBuf) if err != nil { return nil, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 1df07acb..0a9b03f7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,7 +10,7 @@ github.com/hashicorp/errwrap # github.com/hashicorp/go-multierror v1.1.1 ## explicit github.com/hashicorp/go-multierror -# github.com/ipinfo/go/v2 v2.5.1 +# github.com/ipinfo/go/v2 v2.5.3 ## explicit github.com/ipinfo/go/v2/ipinfo github.com/ipinfo/go/v2/ipinfo/cache