Skip to content

Commit

Permalink
chore: Use util v1.1.0 (#254)
Browse files Browse the repository at this point in the history 
* chore: Use util v1.1.0

* Bump metricfunc and ngap

* Bump nrf
  • Loading branch information
@ghislainbourgeois
ghislainbourgeois authored May 31, 2024
1 parent 3edc30a commit deafc7c
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 43 deletions.
2 changes: 1 addition & 1 deletion communication/routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/sirupsen/logrus"

"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
)

var HttpLog *logrus.Entry
Expand Down
2 changes: 1 addition & 1 deletion eventexposure/routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/gin-gonic/gin"

"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
)

// Route is the information for every URI.
Expand Down
8 changes: 4 additions & 4 deletions factory/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ package factory
import (
"time"

"github.com/omec-project/logger_util"
"github.com/omec-project/openapi/models"
"github.com/omec-project/util/logger"
)

const (
AMF_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 {
Expand Down
16 changes: 6 additions & 10 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@ require (
github.com/mitchellh/mapstructure v1.5.0
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
github.com/omec-project/aper v1.1.2
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/metricfunc v1.4.0
github.com/omec-project/nas v1.2.2
github.com/omec-project/ngap v1.2.1
github.com/omec-project/nrf v1.4.0
github.com/omec-project/config5g v1.4.0
github.com/omec-project/metricfunc v1.4.1
github.com/omec-project/nas v1.3.0
github.com/omec-project/ngap v1.2.2
github.com/omec-project/nrf v1.4.1
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/spf13/viper v1.18.2
Expand Down Expand Up @@ -73,8 +71,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/montanaflynn/stats v0.6.6 // indirect
github.com/omec-project/logger_conf v1.1.1 // indirect
github.com/omec-project/util_3gpp v1.2.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pierrec/lz4/v4 v4.1.15 // indirect
github.com/pkg/errors v0.9.1 // indirect
Expand Down
32 changes: 12 additions & 20 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,28 +173,20 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/omec-project/aper v1.1.2 h1:oRtfloQJQV5HXhOkPpOXbRW9Ay8TAe5kTcbMMkInmOQ=
github.com/omec-project/aper v1.1.2/go.mod h1:jDWasZ2XLFL2uSEWhgGlT/ELyrpwCJd/2kE/VEGG8Ew=
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/metricfunc v1.4.0 h1:gOc8K6BIFw/NYBKeagb3MucNSDDqTgEt2mrdvXI/B60=
github.com/omec-project/metricfunc v1.4.0/go.mod h1:S7+R12DJtKD8s4iTEjgJUb3jXlUklFj+9t8wTIeNx4A=
github.com/omec-project/nas v1.2.2 h1:5qvKH6Eew0IwivRMC6eWueRPgXwYSLfRUPcH5sbsv44=
github.com/omec-project/nas v1.2.2/go.mod h1:QdRwa7KjgzWpuDnIdezNZgtCwhHH7RcFDdQTSCB5afM=
github.com/omec-project/ngap v1.2.1 h1:YLgkfMYWetvIszqoMr7I5ZPJXxTiK23KLcjiYDawisc=
github.com/omec-project/ngap v1.2.1/go.mod h1:sPvpU/ahwqoTvFi5IfnzHmJvIxQPnsVCmq7iU/L1lEo=
github.com/omec-project/nrf v1.4.0 h1:/JhSPHkUpWbx674Uo9BBL1hIO1Yx1Cl4YMse7CqMgeI=
github.com/omec-project/nrf v1.4.0/go.mod h1:1vnIqQvUcAx6ugh0ZjdEqYP0MKdb1uHrURwy0z4GuQ8=
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/metricfunc v1.4.1 h1:n1EajFuGaHs9wouLL2GOBEt1oWj074dXei/NWLGNDaw=
github.com/omec-project/metricfunc v1.4.1/go.mod h1:biEfEyPV0KdhwYMQEcDFwuju7vQfx7fAvgDdc8MvF84=
github.com/omec-project/nas v1.3.0 h1:zNqEQSNTsupT3qP6keSuOusOHKrqEYoC5ghKR8TpKEQ=
github.com/omec-project/nas v1.3.0/go.mod h1:So4hpY95XZTpX0Joco/axIH4MlO0o13UT1rWQWZEuLQ=
github.com/omec-project/ngap v1.2.2 h1:TAeF2IvBL5FIBqJ/8HTRe63q9cAxjPBRhj3jodbxBhg=
github.com/omec-project/ngap v1.2.2/go.mod h1:sPvpU/ahwqoTvFi5IfnzHmJvIxQPnsVCmq7iU/L1lEo=
github.com/omec-project/nrf v1.4.1 h1:/5JaICgZ2URtTe7Bz9/xzEFgHaiaAHTbWcVGr9zek1I=
github.com/omec-project/nrf v1.4.1/go.mod h1:F4JBDAZ9uWUkSjk7fh1lvzuJs8Jxbn2CGIXK8SsiaDI=
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/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
Expand Down
2 changes: 1 addition & 1 deletion httpcallback/router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/gin-gonic/gin"
"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion location/routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/gin-gonic/gin"

"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
)

// Route is the information for every URI.
Expand Down
2 changes: 1 addition & 1 deletion mt/routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/gin-gonic/gin"

"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
)

// Route is the information for every URI.
Expand Down
2 changes: 1 addition & 1 deletion ngap/message/send_test.go.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/omec-project/CommonConsumerTestData/AMF/TestAmf"
"github.com/omec-project/CommonConsumerTestData/AMF/TestComm"
"github.com/omec-project/aper"
"github.com/omec-project/http2_util"
"github.com/omec-project/util/http2_util"
"github.com/omec-project/nas/nasMessage"
"github.com/omec-project/nas/nasTestpacket"
"github.com/omec-project/nas/nasType"
Expand Down
2 changes: 1 addition & 1 deletion oam/routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/gin-gonic/gin"

"github.com/omec-project/amf/logger"
"github.com/omec-project/logger_util"
logger_util "github.com/omec-project/util/logger"
)

// Route is the information for every URI.
Expand Down
4 changes: 2 additions & 2 deletions service/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ import (
aperLogger "github.com/omec-project/aper/logger"
gClient "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"
nasLogger "github.com/omec-project/nas/logger"
ngapLogger "github.com/omec-project/ngap/logger"
nrf_cache "github.com/omec-project/nrf/nrfcache"
"github.com/omec-project/openapi/models"
"github.com/omec-project/util/fsm"
fsmLogger "github.com/omec-project/util/fsm/logger"
"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"
Expand Down

0 comments on commit deafc7c

Please sign in to comment.