Skip to content

Commit b03a325

Browse files
committed
#patch: cleanup redundant code
1 parent 3abfc89 commit b03a325

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

geofence.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,22 @@ func validateIPAddress(ipAddress string) error {
7070

7171
// getIPGeoData fetches geolocation data for specified IP address from https://freegeoip.app
7272
func (g *Geofence) getIPGeoData(ipAddress string) (*FreeGeoIPResponse, error) {
73+
freeGeoIPResponse := &FreeGeoIPResponse{}
74+
freeGeoIPError := &FreeGeoIPError{}
75+
7376
resp, err := g.FreeGeoIPClient.R().
7477
SetHeader("Accept", "application/json").
7578
SetQueryParam("apikey", g.Token).
76-
SetResult(&FreeGeoIPResponse{}).
77-
SetError(&FreeGeoIPError{}).
79+
SetResult(freeGeoIPResponse).
80+
SetError(freeGeoIPError).
7881
Get(ipAddress)
7982
if err != nil {
80-
return &FreeGeoIPResponse{}, err
83+
return freeGeoIPResponse, err
8184
}
8285

8386
// If api gives back status code >399, report error to user
8487
if resp.IsError() {
85-
return &FreeGeoIPResponse{}, resp.Error().(*FreeGeoIPError)
88+
return freeGeoIPResponse, freeGeoIPError
8689
}
8790

8891
return resp.Result().(*FreeGeoIPResponse), nil

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ require (
1313
require (
1414
github.com/davecgh/go-spew v1.1.0 // indirect
1515
github.com/pmezard/go-difflib v1.0.0 // indirect
16-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
16+
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd // indirect
1717
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
1818
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
1414
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
1515
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1616
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
17-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
18-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
17+
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd h1:zYlwaUHTmxuf6H7hwO2dgwqozQmH7zf4x+/qql4oVWc=
18+
golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1919
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2020
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
2121
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 commit comments

Comments
 (0)