Skip to content

Commit

Permalink
chore: Update pion dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rg0now committed Sep 25, 2023
1 parent 06bd535 commit f0f4212
Show file tree
Hide file tree
Showing 18 changed files with 104 additions and 103 deletions.
2 changes: 1 addition & 1 deletion cmd/turncat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/pion/logging"
"github.com/pion/turn/v2"
"github.com/pion/turn/v3"
flag "github.com/spf13/pflag"

corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"strings"

"github.com/pion/transport/v2"
"github.com/pion/transport/v3"

"github.com/l7mp/stunner/internal/resolver"
"github.com/l7mp/stunner/pkg/apis/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"github.com/pion/transport/test"
"github.com/pion/transport/v3/test"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/yaml"

Expand Down
47 changes: 21 additions & 26 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,24 @@ go 1.19

require (
github.com/fsnotify/fsnotify v1.6.0
github.com/pion/dtls/v2 v2.2.6
github.com/google/uuid v1.3.1
github.com/gorilla/websocket v1.5.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
github.com/pion/dtls/v2 v2.2.7
github.com/pion/logging v0.2.2
github.com/pion/transport/v2 v2.0.2
// replace from l7mp/turn
github.com/pion/turn/v2 v2.1.0
github.com/prometheus/client_golang v1.14.0
github.com/pion/randutil v0.1.0
github.com/pion/transport/v3 v3.0.1
github.com/pion/turn/v3 v3.0.1
github.com/prometheus/client_golang v1.16.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.4
golang.org/x/sys v0.12.0
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
sigs.k8s.io/controller-runtime v0.12.3
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/google/uuid v1.1.2
github.com/gorilla/websocket v1.5.0
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
github.com/pion/randutil v0.1.0
github.com/pion/transport v0.14.1
golang.org/x/sys v0.6.0
)

require (
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
Expand All @@ -51,21 +46,21 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pion/stun v0.4.0 // indirect
github.com/pion/udp/v2 v2.0.1 // indirect
github.com/pion/stun/v2 v2.0.0 // indirect
github.com/pion/transport/v2 v2.2.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/term v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
106 changes: 56 additions & 50 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"
"time"

"github.com/pion/transport/test"
"github.com/pion/turn/v2"
"github.com/pion/transport/v3/test"
"github.com/pion/turn/v3"
"github.com/stretchr/testify/assert"

"github.com/l7mp/stunner/pkg/apis/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions internal/object/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"

"github.com/pion/logging"
"github.com/pion/transport/v2"
"github.com/pion/turn/v2"
"github.com/pion/transport/v3"
"github.com/pion/turn/v3"

"github.com/l7mp/stunner/internal/util"
"github.com/l7mp/stunner/pkg/apis/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions internal/telemetry/relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"net"

"github.com/pion/randutil"
"github.com/pion/transport/v2"
"github.com/pion/transport/v2/stdnet"
"github.com/pion/transport/v3"
"github.com/pion/transport/v3/stdnet"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion internal/util/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"time"

"github.com/pion/transport/v2"
"github.com/pion/transport/v3"
)

type FileConnAddr struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/util/socketpool.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package util

import (
"github.com/pion/transport/v2"
"github.com/pion/transport/v3"
)

// NewPacketConnPool creates a new packet connection pool which is fixed to a single connection,
Expand Down
4 changes: 2 additions & 2 deletions internal/util/socketpool_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"golang.org/x/sys/unix"

"github.com/pion/transport/v2"
"github.com/pion/transport/v2/stdnet"
"github.com/pion/transport/v3"
"github.com/pion/transport/v3/stdnet"
)

// unixPacketConPool implements socketpools for unix with full support for SO_REUSEPORT
Expand Down
4 changes: 2 additions & 2 deletions pkg/authentication/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/pion/turn/v2"
"github.com/pion/turn/v3"
)

// UsernameSeparator is the separator character used in time-windowed TURN authentication as
Expand Down Expand Up @@ -72,7 +72,7 @@ func GetLongTermCredential(username string, sharedSecret string) (string, error)
}

// GenerateAuthKey is a convenience function to easily generate keys in the format used by
// AuthHandler. Re-exported from `pion/turn/v2` so that our callers will have a single import.
// AuthHandler. Re-exported from `pion/turn` so that our callers will have a single import.
func GenerateAuthKey(username, realm, password string) []byte {
return turn.GenerateAuthKey(username, realm, password)
}
2 changes: 1 addition & 1 deletion reconcile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/pion/transport/test"
"github.com/pion/transport/v3/test"
"github.com/stretchr/testify/assert"

"github.com/l7mp/stunner/internal/object"
Expand Down
2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"

"github.com/pion/dtls/v2"
"github.com/pion/turn/v2"
"github.com/pion/turn/v3"

"github.com/l7mp/stunner/internal/object"
"github.com/l7mp/stunner/internal/telemetry"
Expand Down
4 changes: 2 additions & 2 deletions stunner.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/google/uuid"
"github.com/pion/logging"
"github.com/pion/transport/v2"
"github.com/pion/transport/v2/stdnet"
"github.com/pion/transport/v3"
"github.com/pion/transport/v3/stdnet"

"github.com/l7mp/stunner/internal/manager"
"github.com/l7mp/stunner/internal/object"
Expand Down
10 changes: 5 additions & 5 deletions stunner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (

"github.com/pion/dtls/v2"
"github.com/pion/logging"
"github.com/pion/transport/v2"
"github.com/pion/transport/v2/stdnet"
"github.com/pion/transport/v2/test"
"github.com/pion/transport/v2/vnet"
"github.com/pion/turn/v2"
"github.com/pion/transport/v3"
"github.com/pion/transport/v3/stdnet"
"github.com/pion/transport/v3/test"
"github.com/pion/transport/v3/vnet"
"github.com/pion/turn/v3"
"github.com/stretchr/testify/assert"

"github.com/l7mp/stunner/internal/resolver"
Expand Down
2 changes: 1 addition & 1 deletion turncat.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/pion/dtls/v2"
"github.com/pion/logging"
"github.com/pion/turn/v2"
"github.com/pion/turn/v3"

"github.com/l7mp/stunner/internal/util"
"github.com/l7mp/stunner/pkg/apis/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions turncat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"time"

"github.com/pion/logging"
"github.com/pion/transport/test"
"github.com/pion/turn/v2"
"github.com/pion/transport/v3/test"
"github.com/pion/turn/v3"
"github.com/stretchr/testify/assert"

"github.com/l7mp/stunner/pkg/logger"
Expand Down

0 comments on commit f0f4212

Please sign in to comment.