Update module to v2 (#520)

cnderrauber · web-flow · commit fc13d04f6185 · 2025-02-13T18:02:09.000+08:00
* Update module to v2

Make go mod version consistent with git tag so other
projects can import the livekit-cli module.

* changeset

* changeset
diff --git a/.nanpa/2131758.kdl 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+patch type="added" "Update go module to v2"`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ import (`
`35`	`35`	`"github.com/livekit/protocol/livekit"`
`36`	`36`	`lksdk "github.com/livekit/server-sdk-go/v2"`
`37`	`37`
`38`		`- "github.com/livekit/livekit-cli/pkg/loadtester"`
`39`		`- "github.com/livekit/livekit-cli/pkg/util"`
	`38`	`+ "github.com/livekit/livekit-cli/v2/pkg/loadtester"`
	`39`	`+ "github.com/livekit/livekit-cli/v2/pkg/util"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`type egressType string`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`
`21`	`21`	`"github.com/urfave/cli/v3"`
`22`	`22`
`23`		`- "github.com/livekit/livekit-cli/pkg/util"`
	`23`	`+ "github.com/livekit/livekit-cli/v2/pkg/util"`
`24`	`24`	`"github.com/livekit/protocol/livekit"`
`25`	`25`	`lksdk "github.com/livekit/server-sdk-go/v2"`
`26`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`"github.com/livekit/protocol/logger"`
`35`	`35`	`lksdk "github.com/livekit/server-sdk-go/v2"`
`36`	`36`
`37`		`- provider2 "github.com/livekit/livekit-cli/pkg/provider"`
	`37`	`+ provider2 "github.com/livekit/livekit-cli/v2/pkg/provider"`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"github.com/go-logr/logr"`
`22`	`22`	`"github.com/urfave/cli/v3"`
`23`	`23`
`24`		`- "github.com/livekit/livekit-cli/pkg/loadtester"`
	`24`	`+ "github.com/livekit/livekit-cli/v2/pkg/loadtester"`
`25`	`25`	`"github.com/livekit/protocol/logger"`
`26`	`26`	`lksdk "github.com/livekit/server-sdk-go/v2"`
`27`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/livekit/protocol/logger"`
`28`	`28`	`lksdk "github.com/livekit/server-sdk-go/v2"`
`29`	`29`
`30`		`- livekitcli "github.com/livekit/livekit-cli"`
	`30`	`+ livekitcli "github.com/livekit/livekit-cli/v2"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ import (`
`26`	`26`	`"github.com/charmbracelet/lipgloss/table"`
`27`	`27`	`"github.com/urfave/cli/v3"`
`28`	`28`
`29`		`- "github.com/livekit/livekit-cli/pkg/config"`
`30`		`- "github.com/livekit/livekit-cli/pkg/util"`
	`29`	`+ "github.com/livekit/livekit-cli/v2/pkg/config"`
	`30`	`+ "github.com/livekit/livekit-cli/v2/pkg/util"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`var (`