From ab89c0677d9d5f3e2812e9d881f661d45218faf9 Mon Sep 17 00:00:00 2001 From: skeris Date: Tue, 26 Nov 2024 01:17:44 +0300 Subject: [PATCH] replace all themakers/hlog to penaside/hlog because themakers deleted one --- .gitea/workflows/lint.yml | 2 +- app/app.go | 2 +- dal/minio/minio.go | 2 +- dal/mongo/dal.go | 2 +- dal/mongo/dal_test.go | 2 +- go.mod | 6 +++--- go.sum | 10 ++++++---- middleware/http_middleware.go | 2 +- middleware/middleware.go | 2 +- service/service.go | 2 +- service/service_account_test.go | 2 +- version/version.go | 2 +- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/lint.yml b/.gitea/workflows/lint.yml index 20e6298..0bd7867 100644 --- a/.gitea/workflows/lint.yml +++ b/.gitea/workflows/lint.yml @@ -9,6 +9,6 @@ on: jobs: Lint: runs-on: [hubstaging] - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.0 + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2 with: runner: hubstaging diff --git a/app/app.go b/app/app.go index c84a71c..6ff12b3 100644 --- a/app/app.go +++ b/app/app.go @@ -17,7 +17,7 @@ import ( "github.com/skeris/appInit" tb "gopkg.in/tucnak/telebot.v2" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" "go.uber.org/zap" ) diff --git a/dal/minio/minio.go b/dal/minio/minio.go index 6b840bf..e53bfec 100644 --- a/dal/minio/minio.go +++ b/dal/minio/minio.go @@ -8,7 +8,7 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" ) type BlobStore struct { diff --git a/dal/mongo/dal.go b/dal/mongo/dal.go index c898729..bbbbf42 100644 --- a/dal/mongo/dal.go +++ b/dal/mongo/dal.go @@ -8,7 +8,7 @@ import ( "time" "github.com/rs/xid" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" diff --git a/dal/mongo/dal_test.go b/dal/mongo/dal_test.go index ab58def..2e12403 100644 --- a/dal/mongo/dal_test.go +++ b/dal/mongo/dal_test.go @@ -3,7 +3,7 @@ package mongo import ( "context" "github.com/stretchr/testify/suite" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" "go.uber.org/zap" "heruvym/model" "testing" diff --git a/go.mod b/go.mod index 1d10bff..f3eefe9 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,8 @@ module heruvym go 1.23.2 require ( - gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96 + gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 + gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/go-playground/validator/v10 v10.13.0 github.com/go-redis/redis/v8 v8.11.5 @@ -16,7 +17,6 @@ require ( github.com/skeris/appInit v1.0.2 github.com/stretchr/testify v1.8.2 github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33 - github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf go.mongodb.org/mongo-driver v1.10.3 go.uber.org/zap v1.27.0 gopkg.in/tucnak/telebot.v2 v2.5.0 @@ -60,7 +60,7 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - go.uber.org/multierr v1.10.0 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.7.0 // indirect golang.org/x/net v0.8.0 // indirect golang.org/x/sync v0.1.0 // indirect diff --git a/go.sum b/go.sum index 41bac61..593a075 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,9 @@ +gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9 h1:tBkXWNIt8icmkMMnq8MA421RWkUy4OZh5P7C3q8uCu4= +gitea.pena/PenaSide/hlog v0.0.0-20241125221102-a54c29c002a9/go.mod h1:sanhSL8aEsfcq21P+eItYiAnKAre+B67nGJmDfk2cf0= gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96 h1:m4EMXEhsA/glI6eJeZnRGUhYPSQdcWj3hzT2IDNlWS0= gitea.pena/PenaSide/linters-golang v0.0.0-20241114215743-9a8e7d58cf96/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= +gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg= +gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= @@ -128,8 +132,6 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33 h1:N9f/Q+2Ssa+yDcbfaoLTYvXmdeyUUxsJKdPUVsjSmiA= github.com/themakers/bdd v0.0.0-20210316111417-6b1dfe326f33/go.mod h1:rpcH99JknBh8seZmlOlUg51gasZH6QH34oXNsIwYT6E= -github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf h1:TJJm6KcBssmbWzplF5lzixXl1RBAi/ViPs1GaSOkhwo= -github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf/go.mod h1:1FsorU3vnXO9xS9SrhUp8fRb/6H/Zfll0rPt1i4GWaA= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= @@ -158,8 +160,8 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= -go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= diff --git a/middleware/http_middleware.go b/middleware/http_middleware.go index 9676cc9..cbecb09 100644 --- a/middleware/http_middleware.go +++ b/middleware/http_middleware.go @@ -10,7 +10,7 @@ import ( errors2 "github.com/pkg/errors" "github.com/rs/xid" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" ) // My MiddleWare with gorilla/mux diff --git a/middleware/middleware.go b/middleware/middleware.go index 5a7cd30..1539562 100644 --- a/middleware/middleware.go +++ b/middleware/middleware.go @@ -4,7 +4,7 @@ import ( "heruvym/jwt_adapter" "net/http" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" ) func setJwtHeader(adapter *jwt_adapter.JwtAdapter, w http.ResponseWriter, logger hlog.Logger) error { diff --git a/service/service.go b/service/service.go index bab97e0..4cb45a6 100644 --- a/service/service.go +++ b/service/service.go @@ -22,7 +22,7 @@ import ( "time" "github.com/rs/xid" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" tb "gopkg.in/tucnak/telebot.v2" ) diff --git a/service/service_account_test.go b/service/service_account_test.go index e8fba79..7f52304 100644 --- a/service/service_account_test.go +++ b/service/service_account_test.go @@ -6,7 +6,7 @@ import ( "encoding/json" "github.com/gofiber/fiber/v2" "github.com/stretchr/testify/suite" - "github.com/themakers/hlog" + "gitea.pena/PenaSide/hlog" "go.uber.org/zap" "heruvym/dal/mongo" "heruvym/middleware" diff --git a/version/version.go b/version/version.go index cc6c6e3..3c025f6 100644 --- a/version/version.go +++ b/version/version.go @@ -7,4 +7,4 @@ var ( Commit = "unset" // Release is a semantic version of current build Release = "unset" -) \ No newline at end of file +)