From 14cabda5c2af6f60295edd405188a564797ec5c0 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 8 Sep 2024 17:58:44 +0200 Subject: [PATCH] update shortuid to v4 Signed-off-by: Nicola Murino --- go.mod | 2 +- go.sum | 6 +++--- internal/common/actions_test.go | 2 +- internal/httpd/httpd_test.go | 2 +- internal/util/util.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 22e6ed9e..6dae1172 100644 --- a/go.mod +++ b/go.mod @@ -39,7 +39,7 @@ require ( github.com/jlaffaye/ftp v0.2.0 github.com/klauspost/compress v1.17.9 github.com/lestrrat-go/jwx/v2 v2.1.1 - github.com/lithammer/shortuuid/v3 v3.0.7 + github.com/lithammer/shortuuid/v4 v4.0.0 github.com/mattn/go-sqlite3 v1.14.23 github.com/mhale/smtpd v0.8.3 github.com/minio/sio v0.4.1 diff --git a/go.sum b/go.sum index d0f4a351..41f8829d 100644 --- a/go.sum +++ b/go.sum @@ -202,7 +202,7 @@ github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/wire v0.6.0 h1:HBkoIh4BdSxoyo9PveV8giw7ZsaBOvzWKfcg/6MrVwI= @@ -264,8 +264,8 @@ github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNB github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8= -github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts= +github.com/lithammer/shortuuid/v4 v4.0.0 h1:QRbbVkfgNippHOS8PXDkti4NaWeyYfcBTHtw7k08o4c= +github.com/lithammer/shortuuid/v4 v4.0.0/go.mod h1:Zs8puNcrvf2rV9rTH51ZLLcj7ZXqQI3lv67aw4KiB1Y= github.com/lufia/plan9stats v0.0.0-20240819163618-b1d8f4d146e7 h1:5RK988zAqB3/AN3opGfRpoQgAVqr6/A5+qRTi67VUZY= github.com/lufia/plan9stats v0.0.0-20240819163618-b1d8f4d146e7/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= diff --git a/internal/common/actions_test.go b/internal/common/actions_test.go index 28eea408..87b168f6 100644 --- a/internal/common/actions_test.go +++ b/internal/common/actions_test.go @@ -23,7 +23,7 @@ import ( "runtime" "testing" - "github.com/lithammer/shortuuid/v3" + "github.com/lithammer/shortuuid/v4" "github.com/rs/xid" "github.com/sftpgo/sdk" "github.com/sftpgo/sdk/plugin/notifier" diff --git a/internal/httpd/httpd_test.go b/internal/httpd/httpd_test.go index fc43b71d..29534d59 100644 --- a/internal/httpd/httpd_test.go +++ b/internal/httpd/httpd_test.go @@ -46,7 +46,7 @@ import ( "github.com/go-chi/render" _ "github.com/go-sql-driver/mysql" _ "github.com/jackc/pgx/v5/stdlib" - "github.com/lithammer/shortuuid/v3" + "github.com/lithammer/shortuuid/v4" _ "github.com/mattn/go-sqlite3" "github.com/mhale/smtpd" "github.com/pquerna/otp" diff --git a/internal/util/util.go b/internal/util/util.go index 3de95b1f..30d0bd09 100644 --- a/internal/util/util.go +++ b/internal/util/util.go @@ -47,7 +47,7 @@ import ( "unsafe" "github.com/google/uuid" - "github.com/lithammer/shortuuid/v3" + "github.com/lithammer/shortuuid/v4" "github.com/rs/xid" "golang.org/x/crypto/ssh" @@ -578,7 +578,7 @@ func GenerateRandomBytes(length int) []byte { return b[:length] } -// GenerateUniqueID retuens an unique ID +// GenerateUniqueID returns an unique ID func GenerateUniqueID() string { u, err := uuid.NewRandom() if err != nil {