Skip to content

Commit

Permalink
Chore/upgrade dependencies (#2)
Browse files Browse the repository at this point in the history
* Upgrade dependencies

* Update Gin remote IP feature
  • Loading branch information
sbpann committed Jun 8, 2024
1 parent 1668035 commit 9346d14
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 38 deletions.
3 changes: 1 addition & 2 deletions gin.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package bucharest
import (
"io"
"mime/multipart"
"net"
"net/http"
"os"
"time"
Expand Down Expand Up @@ -88,7 +87,7 @@ func (r *ginRequest) ClientIP() string {
return r.gin.ClientIP()
}

func (r *ginRequest) RemoteIP() (net.IP, bool) {
func (r *ginRequest) RemoteIP() string {
return r.gin.RemoteIP()
}

Expand Down
5 changes: 2 additions & 3 deletions gin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,9 @@ func TestIP(t *testing.T) {
var path string
handler := func(ctx HTTPContext) HTTPError {
assert.Equal(t, ctx.Gin().ClientIP(), ctx.ClientIP())
remote_ip, trust := ctx.RemoteIP()
expected_remote_ip, expected_trust := ctx.Gin().RemoteIP()
remote_ip := ctx.RemoteIP()
expected_remote_ip := ctx.Gin().RemoteIP()
assert.Equal(t, remote_ip, expected_remote_ip)
assert.Equal(t, trust, expected_trust)
ctx.Status(http.StatusNoContent)
return nil
}
Expand Down
78 changes: 47 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,53 +1,69 @@
module github.com/argonlab-io/bucharest

go 1.18
go 1.22

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/gin-gonic/gin v1.7.7
github.com/go-playground/validator/v10 v10.11.0
github.com/DATA-DOG/go-sqlmock v1.5.2
github.com/gin-gonic/gin v1.10.0
github.com/go-playground/validator/v10 v10.21.0
github.com/go-redis/redis/v8 v8.11.5
github.com/google/uuid v1.3.0
github.com/jmoiron/sqlx v1.3.5
github.com/sirupsen/logrus v1.8.1
github.com/spf13/viper v1.11.0
github.com/stretchr/testify v1.7.1
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
gorm.io/gorm v1.23.5
github.com/google/uuid v1.6.0
github.com/jmoiron/sqlx v1.4.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.24.0
gorm.io/gorm v1.25.10
)

require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/bytedance/sonic v1.11.8 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.4 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.3.0 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 9346d14

Please sign in to comment.