Skip to content

Commit 3f71b46

Browse files
authored
Migrate codebase to use cli/v3 (#157)
Signed-off-by: Arrobo, Gabriel <[email protected]>
1 parent 06d3bae commit 3f71b46

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.3-dev
1+
1.6.3

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ go 1.24.0
55
require (
66
github.com/fsnotify/fsnotify v1.9.0
77
github.com/spf13/viper v1.20.1
8-
github.com/urfave/cli/v2 v2.27.7
8+
github.com/urfave/cli/v3 v3.3.8
99
go.uber.org/zap v1.27.0
1010
golang.org/x/net v0.41.0
1111
gopkg.in/yaml.v2 v2.4.0
1212
)
1313

1414
require (
15-
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
1615
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
1716
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
18-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
1917
github.com/sagikazarmark/locafero v0.9.0 // indirect
2018
github.com/sourcegraph/conc v0.3.0 // indirect
2119
github.com/spf13/afero v1.14.0 // indirect
2220
github.com/spf13/cast v1.9.2 // indirect
2321
github.com/spf13/pflag v1.0.6 // indirect
2422
github.com/subosito/gotenv v1.6.0 // indirect
25-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
2623
go.uber.org/multierr v1.11.0 // indirect
2724
golang.org/x/sys v0.33.0 // indirect
2825
golang.org/x/text v0.26.0 // indirect

go.sum

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
2-
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
31
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
42
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
53
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -20,8 +18,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
2018
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2119
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
2220
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
23-
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
24-
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
2521
github.com/sagikazarmark/locafero v0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k=
2622
github.com/sagikazarmark/locafero v0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk=
2723
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
@@ -38,10 +34,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
3834
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3935
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
4036
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
41-
github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
42-
github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
43-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
44-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
37+
github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
38+
github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
4539
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
4640
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
4741
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

simapp.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/fsnotify/fsnotify"
2727
"github.com/omec-project/simapp/logger"
2828
"github.com/spf13/viper"
29-
"github.com/urfave/cli/v2"
29+
"github.com/urfave/cli/v3"
3030
"go.uber.org/zap"
3131
"go.uber.org/zap/zapcore"
3232
"golang.org/x/net/http2"
@@ -309,7 +309,7 @@ func syncConfig(w http.ResponseWriter, req *http.Request) {
309309
}
310310

311311
func main() {
312-
app := cli.NewApp()
312+
app := &cli.Command{}
313313
app.Name = "simapp"
314314
logger.SimappLog.Infoln(app.Name)
315315
app.Usage = "SIMApp"
@@ -322,12 +322,12 @@ func main() {
322322
},
323323
}
324324
app.Action = action
325-
if err := app.Run(os.Args); err != nil {
325+
if err := app.Run(context.Background(), os.Args); err != nil {
326326
logger.SimappLog.Fatalf("SIMApp run error: %v", err)
327327
}
328328
}
329329

330-
func action(c *cli.Context) error {
330+
func action(ctx context.Context, c *cli.Command) error {
331331
logger.SimappLog.Infoln("SIMApp started")
332332
configMsgChan = make(chan configMessage, 100)
333333
var subProvisionEndpt SubProvisionEndpt

0 commit comments

Comments
 (0)