diff --git a/VERSION b/VERSION index 9471546..400084b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.7-dev +1.6.7 diff --git a/go.mod b/go.mod index e4dd632..4db76ca 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/omec-project/util v1.3.2 github.com/prometheus/client_golang v1.22.0 github.com/stretchr/testify v1.10.0 - github.com/urfave/cli v1.22.17 + github.com/urfave/cli/v3 v3.3.8 go.mongodb.org/mongo-driver v1.17.4 go.uber.org/zap v1.27.0 gopkg.in/yaml.v2 v2.4.0 @@ -26,7 +26,6 @@ require ( github.com/bytedance/sonic/loader v0.2.4 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.5 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/evanphx/json-patch v5.9.11+incompatible // indirect github.com/gabriel-vasile/mimetype v1.4.9 // indirect @@ -52,7 +51,6 @@ require ( github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.64.0 // indirect github.com/prometheus/procfs v0.16.1 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.14 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect diff --git a/go.sum b/go.sum index f42f64c..00c33ed 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= @@ -15,8 +14,6 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4= github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo= -github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= 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= @@ -108,26 +105,22 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.14 h1:yOQvXCBc3Ij46LRkRoh4Yd5qK6LVOgi0bYOXfb7ifjw= github.com/ugorji/go/codec v1.2.14/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/urfave/cli v1.22.17 h1:SYzXoiPfQjHBbkYxbew5prZHS1TOLT3ierW8SYLqtVQ= -github.com/urfave/cli v1.22.17/go.mod h1:b0ht0aqgH/6pBYzzxURyrM4xXNgsoT/n2ZzwQiEhNVo= +github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E= +github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= diff --git a/nrf.go b/nrf.go index a61e7c5..606ba9d 100644 --- a/nrf.go +++ b/nrf.go @@ -11,18 +11,19 @@ package main import ( + "context" "fmt" "os" "github.com/omec-project/nrf/logger" nrf_service "github.com/omec-project/nrf/service" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" ) var NRF = &nrf_service.NRF{} func main() { - app := cli.NewApp() + app := &cli.Command{} app.Name = "nrf" logger.InitLog.Infoln(app.Name) app.Usage = "Network Repository Function" @@ -30,12 +31,12 @@ func main() { app.Action = action app.Flags = NRF.GetCliCmd() - if err := app.Run(os.Args); err != nil { + if err := app.Run(context.Background(), os.Args); err != nil { logger.AppLog.Fatalf("NRF run error: %v", err) } } -func action(c *cli.Context) error { +func action(ctx context.Context, c *cli.Command) error { if err := NRF.Initialize(c); err != nil { logger.CfgLog.Errorf("%+v", err) return fmt.Errorf("failed to initialize") diff --git a/service/init.go b/service/init.go index 7e24144..31b478b 100644 --- a/service/init.go +++ b/service/init.go @@ -29,7 +29,7 @@ import ( openapiLogger "github.com/omec-project/openapi/logger" "github.com/omec-project/util/http2_util" utilLogger "github.com/omec-project/util/logger" - "github.com/urfave/cli" + "github.com/urfave/cli/v3" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -46,7 +46,7 @@ type ( var config Config var nrfCLi = []cli.Flag{ - cli.StringFlag{ + &cli.StringFlag{ Name: "cfg", Usage: "nrf config file", Required: true, @@ -63,7 +63,7 @@ func (*NRF) GetCliCmd() (flags []cli.Flag) { return nrfCLi } -func (nrf *NRF) Initialize(c *cli.Context) error { +func (nrf *NRF) Initialize(c *cli.Command) error { config = Config{ cfg: c.String("cfg"), } @@ -200,9 +200,9 @@ func (nrf *NRF) setLogLevel() { } } -func (nrf *NRF) FilterCli(c *cli.Context) (args []string) { +func (nrf *NRF) FilterCli(c *cli.Command) (args []string) { for _, flag := range nrf.GetCliCmd() { - name := flag.GetName() + name := flag.Names()[0] value := fmt.Sprint(c.Generic(name)) if value == "" { continue @@ -268,7 +268,7 @@ func (nrf *NRF) Start() { } } -func (nrf *NRF) Exec(c *cli.Context) error { +func (nrf *NRF) Exec(c *cli.Command) error { initLog.Debugln("args:", c.String("cfg")) args := nrf.FilterCli(c) initLog.Debugln("filter:", args)