Skip to content

Commit d683911

Browse files
authored
feat(cli): update to urfave/cli/v3 (#364)
1 parent 8eec9dd commit d683911

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

cmd/server/main.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"syscall"
2626
"time"
2727

28-
"github.com/urfave/cli/v2"
28+
"github.com/urfave/cli/v3"
2929
"google.golang.org/protobuf/encoding/protojson"
3030

3131
"github.com/livekit/ingress/pkg/config"
@@ -44,7 +44,7 @@ import (
4444
)
4545

4646
func main() {
47-
app := &cli.App{
47+
cmd := &cli.Command{
4848
Name: "ingress",
4949
Usage: "LiveKit Ingress",
5050
Version: version.Version,
@@ -84,23 +84,23 @@ func main() {
8484
&cli.StringFlag{
8585
Name: "config",
8686
Usage: "LiveKit Ingress yaml config file",
87-
EnvVars: []string{"INGRESS_CONFIG_FILE"},
87+
Sources: cli.EnvVars("INGRESS_CONFIG_FILE"),
8888
},
8989
&cli.StringFlag{
9090
Name: "config-body",
9191
Usage: "LiveKit Ingress yaml config body",
92-
EnvVars: []string{"INGRESS_CONFIG_BODY"},
92+
Sources: cli.EnvVars("INGRESS_CONFIG_BODY"),
9393
},
9494
},
9595
Action: runService,
9696
}
9797

98-
if err := app.Run(os.Args); err != nil {
98+
if err := cmd.Run(context.Background(), os.Args); err != nil {
9999
logger.Infow("process excited", "error", err)
100100
}
101101
}
102102

103-
func runService(c *cli.Context) error {
103+
func runService(_ context.Context, c *cli.Command) error {
104104
conf, err := getConfig(c, true)
105105
if err != nil {
106106
return err
@@ -209,7 +209,7 @@ func setupHealthHandlers(conf *config.Config, svc *service.Service) error {
209209
return nil
210210
}
211211

212-
func runHandler(c *cli.Context) error {
212+
func runHandler(_ context.Context, c *cli.Command) error {
213213
conf, err := getConfig(c, false)
214214
if err != nil {
215215
return err
@@ -313,7 +313,7 @@ func setupHandlerRPCHandlers(conf *config.Config, handler *service.Handler, bus
313313
return service.RegisterIngressRpcHandlers(rpcServer, info)
314314
}
315315

316-
func getConfig(c *cli.Context, initialize bool) (*config.Config, error) {
316+
func getConfig(c *cli.Command, initialize bool) (*config.Config, error) {
317317
configFile := c.String("config")
318318
configBody := c.String("config-body")
319319
if configBody == "" {

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
github.com/prometheus/client_golang v1.22.0
2929
github.com/sirupsen/logrus v1.9.3
3030
github.com/stretchr/testify v1.10.0
31-
github.com/urfave/cli/v2 v2.27.6
3231
github.com/yutopp/go-flv v0.3.1
3332
go.uber.org/atomic v1.11.0
3433
golang.org/x/image v0.27.0
@@ -47,7 +46,6 @@ require (
4746
github.com/bep/debounce v1.2.1 // indirect
4847
github.com/bufbuild/protovalidate-go v0.8.0 // indirect
4948
github.com/cespare/xxhash/v2 v2.3.0 // indirect
50-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
5149
github.com/davecgh/go-spew v1.1.1 // indirect
5250
github.com/dennwc/iters v1.0.1 // indirect
5351
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -90,11 +88,10 @@ require (
9088
github.com/prometheus/procfs v0.15.1 // indirect
9189
github.com/puzpuzpuz/xsync/v3 v3.5.0 // indirect
9290
github.com/redis/go-redis/v9 v9.10.0 // indirect
93-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
9491
github.com/stoewer/go-strcase v1.3.0 // indirect
9592
github.com/twitchtv/twirp v8.1.3+incompatible // indirect
93+
github.com/urfave/cli/v3 v3.3.8
9694
github.com/wlynxg/anet v0.0.5 // indirect
97-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
9895
github.com/yutopp/go-amf0 v0.1.0 // indirect
9996
github.com/zeebo/xxh3 v1.0.2 // indirect
10097
go.uber.org/multierr v1.11.0 // indirect

go.sum

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
3636
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3737
github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
3838
github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
39-
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
40-
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
4139
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4240
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
4341
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -203,8 +201,6 @@ github.com/redis/go-redis/v9 v9.10.0 h1:FxwK3eV8p/CQa0Ch276C7u2d0eNC9kCmAYQ7mCXC
203201
github.com/redis/go-redis/v9 v9.10.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
204202
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
205203
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
206-
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
207-
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
208204
github.com/shoenig/test v1.7.0 h1:eWcHtTXa6QLnBvm0jgEabMRN/uJ4DMV3M8xUGgRkZmk=
209205
github.com/shoenig/test v1.7.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=
210206
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
@@ -224,8 +220,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
224220
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
225221
github.com/twitchtv/twirp v8.1.3+incompatible h1:+F4TdErPgSUbMZMwp13Q/KgDVuI7HJXP61mNV3/7iuU=
226222
github.com/twitchtv/twirp v8.1.3+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
227-
github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
228-
github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
223+
github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
224+
github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
229225
github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
230226
github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
231227
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
@@ -234,8 +230,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
234230
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
235231
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
236232
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
237-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
238-
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
239233
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
240234
github.com/yutopp/go-amf0 v0.0.0-20180803120851-48851794bb1f/go.mod h1:miopb3mUO8ynCPmYD04SZ0JCMFsBt0eOdAuQ6HHHQ6Q=
241235
github.com/yutopp/go-amf0 v0.1.0 h1:a3UeBZG7nRF0zfvmPn2iAfNo1RGzUpHz1VyJD2oGrik=

0 commit comments

Comments
 (0)