diff --git a/factory/config.go b/factory/config.go index 4097c32..7e6d0d5 100644 --- a/factory/config.go +++ b/factory/config.go @@ -14,9 +14,9 @@ import ( "strconv" protos "github.com/omec-project/config5g/proto/sdcoreConfig" - "github.com/omec-project/logger_util" "github.com/omec-project/nssf/logger" "github.com/omec-project/openapi/models" + logger_util "github.com/omec-project/util/logger" ) const ( diff --git a/go.mod b/go.mod index 9613c93..731bbed 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,9 @@ require ( github.com/evanphx/json-patch v5.9.0+incompatible github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 - github.com/omec-project/config5g v1.3.5 - github.com/omec-project/http2_util v1.2.0 - github.com/omec-project/logger_util v1.2.0 + github.com/omec-project/config5g v1.4.0 github.com/omec-project/openapi v1.2.0 - github.com/omec-project/util v1.0.13 + github.com/omec-project/util v1.1.0 github.com/prometheus/client_golang v1.19.1 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 @@ -47,7 +45,6 @@ require ( github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/omec-project/logger_conf v1.1.1 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect diff --git a/go.sum b/go.sum index 3b764c2..3c5bcf1 100644 --- a/go.sum +++ b/go.sum @@ -78,18 +78,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/omec-project/config5g v1.3.5 h1:6Lh8hEDOOWF9lUbiNcv5qrebko/ciF2cYRU1jT3VQ7A= -github.com/omec-project/config5g v1.3.5/go.mod h1:FLDTB4Cy8GzKvpe8Di6buLE1Y+RDu+WknzJCA5r9KMs= -github.com/omec-project/http2_util v1.2.0 h1:ggQ1GjY2x6VRpKuRhZj0t9dh6eISY6LRBv4rlMD++8s= -github.com/omec-project/http2_util v1.2.0/go.mod h1:KLgvU3o7qmG/i5XO/qITscFql2tWCAmjE6glX+dxe7M= -github.com/omec-project/logger_conf v1.1.1 h1:qo0cF5gnPfth8wy+I/QjiOx+F5jB6h4GLSOdyS+ted8= -github.com/omec-project/logger_conf v1.1.1/go.mod h1:2EwoAXjOcRTweseN+ogWifJvjocEKjz3kxRaIC4I88g= -github.com/omec-project/logger_util v1.2.0 h1:Wtx6skInAPqSic0b97QtJcs+xHDh5798MY2WRrnUz3s= -github.com/omec-project/logger_util v1.2.0/go.mod h1:LRHlDJdCqVjOxYvYslRryj0DFUNtxQkgxEiQ7fSCoPk= +github.com/omec-project/config5g v1.4.0 h1:UxwF4bXqlXcAYx+euWJoVmuP+vsLXQr8Chq68QWYswM= +github.com/omec-project/config5g v1.4.0/go.mod h1:/rF/hIDhZR+B2ytNe3bdLWASTI1wNMmC0QHdmaPVlNY= github.com/omec-project/openapi v1.2.0 h1:7Wvi0HLvhvxMyQtqGcqtMCPC/0QCGAFP5htrXCfWxRc= github.com/omec-project/openapi v1.2.0/go.mod h1:hjU13MB1m9MHTko87JfsUNCdeD6/m6VkNZDD8Vq5U9M= -github.com/omec-project/util v1.0.13 h1:50ghFbWo7aqhqIknC6KDPWmkht0tP1v2wjpIdcWVXKg= -github.com/omec-project/util v1.0.13/go.mod h1:Cn9P57qYFiEu0ZXti8imODsJIXVGqnqhP40MwbVbo3g= +github.com/omec-project/util v1.1.0 h1:TUuLmzqTLChIEXQlK9g5Ihgmw4FUm/UJnjfu0wT8Gz0= +github.com/omec-project/util v1.1.0/go.mod h1:BEv8nCokB4j0fgAQ6VVkKuQ2PSP3DJMEmz25pFMw5X8= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/nssaiavailability/routers.go b/nssaiavailability/routers.go index d2a5ee4..d35f450 100644 --- a/nssaiavailability/routers.go +++ b/nssaiavailability/routers.go @@ -20,7 +20,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/logger_util" + logger_util "github.com/omec-project/util/logger" "github.com/omec-project/nssf/logger" ) diff --git a/nsselection/routers.go b/nsselection/routers.go index ea9be3e..51068b9 100644 --- a/nsselection/routers.go +++ b/nsselection/routers.go @@ -20,7 +20,7 @@ import ( "github.com/gin-gonic/gin" - "github.com/omec-project/logger_util" + logger_util "github.com/omec-project/util/logger" "github.com/omec-project/nssf/logger" ) diff --git a/service/init.go b/service/init.go index 0a77e1a..085a4d7 100644 --- a/service/init.go +++ b/service/init.go @@ -20,8 +20,6 @@ import ( "syscall" "time" - "github.com/omec-project/http2_util" - "github.com/omec-project/logger_util" "github.com/omec-project/nssf/consumer" "github.com/omec-project/nssf/context" "github.com/omec-project/nssf/factory" @@ -31,6 +29,8 @@ import ( "github.com/omec-project/nssf/nsselection" "github.com/omec-project/nssf/util" "github.com/omec-project/openapi/models" + "github.com/omec-project/util/http2_util" + logger_util "github.com/omec-project/util/logger" "github.com/omec-project/util/path_util" pathUtilLogger "github.com/omec-project/util/path_util/logger" "github.com/sirupsen/logrus"