chore: Move to util v1.1.0 (#116)

omec-project · May 30, 2024 · 9e3007c · 9e3007c
1 parent 4e5704a
commit 9e3007c
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 33 deletions.
diff --git a/context/context.go b/context/context.go
@@ -18,7 +18,7 @@ import (
 	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/udm/factory"
 	"github.com/omec-project/util/idgenerator"
-	"github.com/omec-project/util_3gpp/suci"
+	"github.com/omec-project/util/util_3gpp/suci"
 )
 
 var udmContext UDMContext

diff --git a/eventexposure/routers.go b/eventexposure/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/udm/logger"
 )
 

diff --git a/factory/config.go b/factory/config.go
@@ -11,18 +11,18 @@
 package factory
 
 import (
-	"github.com/omec-project/logger_util"
 	"github.com/omec-project/openapi/models"
+	"github.com/omec-project/util/logger"
 )
 
 const (
 	UDM_EXPECTED_CONFIG_VERSION = "1.0.0"
 )
 
 type Config struct {
-	Info          *Info               `yaml:"info"`
-	Configuration *Configuration      `yaml:"configuration"`
-	Logger        *logger_util.Logger `yaml:"logger"`
+	Info          *Info          `yaml:"info"`
+	Configuration *Configuration `yaml:"configuration"`
+	Logger        *logger.Logger `yaml:"logger"`
 }
 
 type Info struct {

diff --git a/go.mod b/go.mod
@@ -7,12 +7,9 @@ require (
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	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_3gpp v1.2.1
+	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
@@ -41,12 +38,12 @@ require (
 	github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	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
@@ -19,6 +19,7 @@ github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -75,20 +76,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_3gpp v1.2.1 h1:OE8dckynwEqCpqLkRdMVuKPTQ8Afdq/I3nlROa4fQVo=
-github.com/omec-project/util_3gpp v1.2.1/go.mod h1:q2fd2dniyDlCDO/2WwEnU9+fTAO7OYrzRnPqaBxZFyc=
+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/httpcallback/router.go b/httpcallback/router.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/logger_util"
 	"github.com/omec-project/udm/logger"
+	logger_util "github.com/omec-project/util/logger"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/parameterprovision/routers.go b/parameterprovision/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/udm/logger"
 )
 

diff --git a/producer/generate_auth_data.go b/producer/generate_auth_data.go
@@ -25,7 +25,7 @@ import (
 	"github.com/omec-project/util/httpwrapper"
 	"github.com/omec-project/util/milenage"
 	"github.com/omec-project/util/ueauth"
-	"github.com/omec-project/util_3gpp/suci"
+	"github.com/omec-project/util/util_3gpp/suci"
 )
 
 const (

diff --git a/service/init.go b/service/init.go
@@ -18,8 +18,6 @@ import (
 
 	"github.com/omec-project/config5g/proto/client"
 	protos "github.com/omec-project/config5g/proto/sdcoreConfig"
-	"github.com/omec-project/http2_util"
-	"github.com/omec-project/logger_util"
 	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/udm/consumer"
 	"github.com/omec-project/udm/context"
@@ -33,6 +31,8 @@ import (
 	"github.com/omec-project/udm/ueauthentication"
 	"github.com/omec-project/udm/uecontextmanagement"
 	"github.com/omec-project/udm/util"
+	"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"

diff --git a/subscriberdatamanagement/routers.go b/subscriberdatamanagement/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/udm/logger"
 )
 

diff --git a/ueauthentication/routers.go b/ueauthentication/routers.go
@@ -21,7 +21,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 
-	"github.com/omec-project/logger_util"
+	logger_util "github.com/omec-project/util/logger"
 	"github.com/omec-project/udm/logger"
 )
 

diff --git a/uecontextmanagement/routers.go b/uecontextmanagement/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/udm/logger"
 )
 

diff --git a/util/init_context.go b/util/init_context.go
@@ -14,7 +14,7 @@ import (
 	"github.com/omec-project/udm/context"
 	"github.com/omec-project/udm/factory"
 	"github.com/omec-project/udm/logger"
-	"github.com/omec-project/util_3gpp/suci"
+	"github.com/omec-project/util/util_3gpp/suci"
 )
 
 func InitUDMContext(udmContext *context.UDMContext) {