From fc13d04f61850ffebb05f767f5176580f5293d6c Mon Sep 17 00:00:00 2001 From: cnderrauber Date: Thu, 13 Feb 2025 18:02:09 +0800 Subject: [PATCH] Update module to v2 (#520) * Update module to v2 Make go mod version consistent with git tag so other projects can import the livekit-cli module. * changeset * changeset --- .nanpa/2131758.kdl | 1 + cmd/lk/app.go | 6 +++--- cmd/lk/cloud.go | 6 +++--- cmd/lk/dispatch.go | 2 +- cmd/lk/egress.go | 4 ++-- cmd/lk/ingress.go | 2 +- cmd/lk/join.go | 2 +- cmd/lk/loadtest.go | 2 +- cmd/lk/main.go | 2 +- cmd/lk/project.go | 4 ++-- cmd/lk/proto.go | 2 +- cmd/lk/replay.go | 4 ++-- cmd/lk/room.go | 2 +- cmd/lk/token.go | 2 +- cmd/lk/utils.go | 4 ++-- go.mod | 2 +- pkg/bootstrap/bootstrap.go | 2 +- pkg/loadtester/loadtest.go | 2 +- pkg/loadtester/loadtester.go | 2 +- 19 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 .nanpa/2131758.kdl diff --git a/.nanpa/2131758.kdl b/.nanpa/2131758.kdl new file mode 100644 index 00000000..17197161 --- /dev/null +++ b/.nanpa/2131758.kdl @@ -0,0 +1 @@ +patch type="added" "Update go module to v2" diff --git a/cmd/lk/app.go b/cmd/lk/app.go index b62848b4..f5e1411a 100644 --- a/cmd/lk/app.go +++ b/cmd/lk/app.go @@ -25,9 +25,9 @@ import ( "github.com/charmbracelet/huh" "github.com/charmbracelet/huh/spinner" "github.com/charmbracelet/lipgloss" - "github.com/livekit/livekit-cli/pkg/bootstrap" - "github.com/livekit/livekit-cli/pkg/config" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/bootstrap" + "github.com/livekit/livekit-cli/v2/pkg/config" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/urfave/cli/v3" ) diff --git a/cmd/lk/cloud.go b/cmd/lk/cloud.go index 7b609c6c..a169106c 100644 --- a/cmd/lk/cloud.go +++ b/cmd/lk/cloud.go @@ -28,9 +28,9 @@ import ( "github.com/pkg/browser" "github.com/urfave/cli/v3" - authutil "github.com/livekit/livekit-cli/pkg/auth" - "github.com/livekit/livekit-cli/pkg/config" - "github.com/livekit/livekit-cli/pkg/util" + authutil "github.com/livekit/livekit-cli/v2/pkg/auth" + "github.com/livekit/livekit-cli/v2/pkg/config" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/auth" ) diff --git a/cmd/lk/dispatch.go b/cmd/lk/dispatch.go index 12b8a3f2..52569614 100644 --- a/cmd/lk/dispatch.go +++ b/cmd/lk/dispatch.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/livekit" "github.com/livekit/protocol/utils" lksdk "github.com/livekit/server-sdk-go/v2" diff --git a/cmd/lk/egress.go b/cmd/lk/egress.go index d2348241..fd4b5d3a 100644 --- a/cmd/lk/egress.go +++ b/cmd/lk/egress.go @@ -35,8 +35,8 @@ import ( "github.com/livekit/protocol/livekit" lksdk "github.com/livekit/server-sdk-go/v2" - "github.com/livekit/livekit-cli/pkg/loadtester" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/loadtester" + "github.com/livekit/livekit-cli/v2/pkg/util" ) type egressType string diff --git a/cmd/lk/ingress.go b/cmd/lk/ingress.go index ad34140e..61823a52 100644 --- a/cmd/lk/ingress.go +++ b/cmd/lk/ingress.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/livekit" lksdk "github.com/livekit/server-sdk-go/v2" ) diff --git a/cmd/lk/join.go b/cmd/lk/join.go index ca442e48..c093ddb4 100644 --- a/cmd/lk/join.go +++ b/cmd/lk/join.go @@ -34,7 +34,7 @@ import ( "github.com/livekit/protocol/logger" lksdk "github.com/livekit/server-sdk-go/v2" - provider2 "github.com/livekit/livekit-cli/pkg/provider" + provider2 "github.com/livekit/livekit-cli/v2/pkg/provider" ) var ( diff --git a/cmd/lk/loadtest.go b/cmd/lk/loadtest.go index 3e8bdec1..0bba4509 100644 --- a/cmd/lk/loadtest.go +++ b/cmd/lk/loadtest.go @@ -21,7 +21,7 @@ import ( "github.com/go-logr/logr" "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/loadtester" + "github.com/livekit/livekit-cli/v2/pkg/loadtester" "github.com/livekit/protocol/logger" lksdk "github.com/livekit/server-sdk-go/v2" ) diff --git a/cmd/lk/main.go b/cmd/lk/main.go index a4315270..9365b1a5 100644 --- a/cmd/lk/main.go +++ b/cmd/lk/main.go @@ -27,7 +27,7 @@ import ( "github.com/livekit/protocol/logger" lksdk "github.com/livekit/server-sdk-go/v2" - livekitcli "github.com/livekit/livekit-cli" + livekitcli "github.com/livekit/livekit-cli/v2" ) func main() { diff --git a/cmd/lk/project.go b/cmd/lk/project.go index e1255c29..d0de9d9e 100644 --- a/cmd/lk/project.go +++ b/cmd/lk/project.go @@ -26,8 +26,8 @@ import ( "github.com/charmbracelet/lipgloss/table" "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/config" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/config" + "github.com/livekit/livekit-cli/v2/pkg/util" ) var ( diff --git a/cmd/lk/proto.go b/cmd/lk/proto.go index 1f26d147..c09f06ab 100644 --- a/cmd/lk/proto.go +++ b/cmd/lk/proto.go @@ -25,7 +25,7 @@ import ( "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/proto" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" ) const flagRequest = "request" diff --git a/cmd/lk/replay.go b/cmd/lk/replay.go index 6149bd8f..5aa967f3 100644 --- a/cmd/lk/replay.go +++ b/cmd/lk/replay.go @@ -22,8 +22,8 @@ import ( "github.com/twitchtv/twirp" "github.com/urfave/cli/v3" - authutil "github.com/livekit/livekit-cli/pkg/auth" - "github.com/livekit/livekit-cli/pkg/util" + authutil "github.com/livekit/livekit-cli/v2/pkg/auth" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/auth" "github.com/livekit/protocol/replay" lksdk "github.com/livekit/server-sdk-go/v2" diff --git a/cmd/lk/room.go b/cmd/lk/room.go index 852e6fa4..4600e721 100644 --- a/cmd/lk/room.go +++ b/cmd/lk/room.go @@ -31,7 +31,7 @@ import ( "github.com/livekit/protocol/logger" lksdk "github.com/livekit/server-sdk-go/v2" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" ) var ( diff --git a/cmd/lk/token.go b/cmd/lk/token.go index c0912283..5f794376 100644 --- a/cmd/lk/token.go +++ b/cmd/lk/token.go @@ -25,7 +25,7 @@ import ( "github.com/charmbracelet/huh" "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/auth" "github.com/livekit/protocol/livekit" ) diff --git a/cmd/lk/utils.go b/cmd/lk/utils.go index cd61b31b..22a61869 100644 --- a/cmd/lk/utils.go +++ b/cmd/lk/utils.go @@ -23,8 +23,8 @@ import ( "github.com/twitchtv/twirp" "github.com/urfave/cli/v3" - "github.com/livekit/livekit-cli/pkg/config" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/config" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/livekit/protocol/utils/interceptors" ) diff --git a/go.mod b/go.mod index 20f7a817..2ed2bda2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/livekit/livekit-cli +module github.com/livekit/livekit-cli/v2 go 1.23 diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go index d8b52f89..435bbf28 100644 --- a/pkg/bootstrap/bootstrap.go +++ b/pkg/bootstrap/bootstrap.go @@ -36,7 +36,7 @@ import ( "github.com/joho/godotenv" "gopkg.in/yaml.v3" - authutil "github.com/livekit/livekit-cli/pkg/auth" + authutil "github.com/livekit/livekit-cli/v2/pkg/auth" ) const ( diff --git a/pkg/loadtester/loadtest.go b/pkg/loadtester/loadtest.go index 0efcade5..6ff06f4d 100644 --- a/pkg/loadtester/loadtest.go +++ b/pkg/loadtester/loadtest.go @@ -27,7 +27,7 @@ import ( "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss/table" - "github.com/livekit/livekit-cli/pkg/util" + "github.com/livekit/livekit-cli/v2/pkg/util" "github.com/pkg/errors" "golang.org/x/sync/errgroup" "golang.org/x/sync/syncmap" diff --git a/pkg/loadtester/loadtester.go b/pkg/loadtester/loadtester.go index 88eda33c..95fdaa06 100644 --- a/pkg/loadtester/loadtester.go +++ b/pkg/loadtester/loadtester.go @@ -24,7 +24,7 @@ import ( "github.com/pion/webrtc/v4" "go.uber.org/atomic" - provider2 "github.com/livekit/livekit-cli/pkg/provider" + provider2 "github.com/livekit/livekit-cli/v2/pkg/provider" "github.com/livekit/protocol/livekit" lksdk "github.com/livekit/server-sdk-go/v2" "github.com/livekit/server-sdk-go/v2/pkg/samplebuilder"