From 9b0c4fab004c5d06aa7b2c44d2782e626c6e62c9 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 13 Apr 2021 16:47:28 +0200 Subject: [PATCH] Update nats.go to 1.10.0 --- backend_server_test.go | 2 +- clientsession.go | 2 +- go.mod | 3 +-- go.sum | 18 ++++++++++++++---- mcu_janus.go | 2 +- natsclient.go | 2 +- natsclient_loopback.go | 2 +- natsclient_loopback_test.go | 2 +- proxy/main.go | 4 ++-- room.go | 2 +- server/main.go | 4 ++-- 11 files changed, 26 insertions(+), 17 deletions(-) diff --git a/backend_server_test.go b/backend_server_test.go index d04c9e3..90b5548 100644 --- a/backend_server_test.go +++ b/backend_server_test.go @@ -42,7 +42,7 @@ import ( "github.com/dlintw/goconf" "github.com/gorilla/mux" "github.com/gorilla/websocket" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) var ( diff --git a/clientsession.go b/clientsession.go index d2bc979..86a5c68 100644 --- a/clientsession.go +++ b/clientsession.go @@ -32,7 +32,7 @@ import ( "time" "unsafe" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) var ( diff --git a/go.mod b/go.mod index cdbed37..a923188 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,7 @@ require ( github.com/gorilla/websocket v1.2.0 github.com/mailru/easyjson v0.7.7 github.com/nats-io/gnatsd v1.4.1 // indirect - github.com/nats-io/go-nats v1.2.3-0.20170601154709-d4ca4c8b588d - github.com/nats-io/nuid v1.0.1-0.20170303150224-3cf34f9fca4e // indirect + github.com/nats-io/nats.go v1.10.0 github.com/notedit/janus-go v0.0.0-20200517101215-10eb8b95d1a0 github.com/oschwald/maxminddb-golang v1.3.1-0.20190523235738-1960b16a5147 go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b diff --git a/go.sum b/go.sum index 4ba6136..35bddaa 100644 --- a/go.sum +++ b/go.sum @@ -105,10 +105,15 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/gnatsd v1.4.1 h1:RconcfDeWpKCD6QIIwiVFcvForlXpWeJP7i5/lDLy44= github.com/nats-io/gnatsd v1.4.1/go.mod h1:nqco77VO78hLCJpIcVfygDP2rPGfsEHkGTUk94uh5DQ= -github.com/nats-io/go-nats v1.2.3-0.20170601154709-d4ca4c8b588d h1:VxUJV9Y7jvNV2pj+fD2fzVdouCwMCae471YJtsN2kDQ= -github.com/nats-io/go-nats v1.2.3-0.20170601154709-d4ca4c8b588d/go.mod h1:+t7RHT5ApZebkrQdnn6AhQJmhJJiKAvJUio1PiiCtj0= -github.com/nats-io/nuid v1.0.1-0.20170303150224-3cf34f9fca4e h1:IqlcbG/FqnOxFeFostcQnSNI9VMvHJCYfKV0IUSlT3Y= -github.com/nats-io/nuid v1.0.1-0.20170303150224-3cf34f9fca4e/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nats-io/jwt v0.3.2 h1:+RB5hMpXUUA2dfxuhBTEkMOrYmM+gKIZYS1KjSostMI= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats.go v1.10.0 h1:L8qnKaofSfNFbXg0C5F71LdjPRnmQwSsA4ukmkt1TvY= +github.com/nats-io/nats.go v1.10.0/go.mod h1:AjGArbfyR50+afOUotNX2Xs5SYHf+CoOa5HH1eEl2HE= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.4 h1:aEsHIssIk6ETN5m2/MD8Y4B2X7FfXrBAUdkyRvbVYzA= +github.com/nats-io/nkeys v0.1.4/go.mod h1:XdZpAbhgyyODYqjTawOnIOI7VlbKSarI9Gfy1tqEu/s= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/notedit/janus-go v0.0.0-20200517101215-10eb8b95d1a0 h1:EFU9iv8BMPyBo8iFMHvQleYlF5M3PY6zpAbxsngImjE= github.com/notedit/janus-go v0.0.0-20200517101215-10eb8b95d1a0/go.mod h1:BN/Txse3qz8tZOmCm2OfajB2wHVujWmX3o9nVdsI6gE= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -163,6 +168,9 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -173,6 +181,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -185,6 +194,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/mcu_janus.go b/mcu_janus.go index eec0585..7f44f15 100644 --- a/mcu_janus.go +++ b/mcu_janus.go @@ -33,7 +33,7 @@ import ( "time" "github.com/dlintw/goconf" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" "github.com/notedit/janus-go" ) diff --git a/natsclient.go b/natsclient.go index d1670c2..815ba23 100644 --- a/natsclient.go +++ b/natsclient.go @@ -29,7 +29,7 @@ import ( "os/signal" "time" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) const ( diff --git a/natsclient_loopback.go b/natsclient_loopback.go index e4dc1c6..0845277 100644 --- a/natsclient_loopback.go +++ b/natsclient_loopback.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) type LoopbackNatsClient struct { diff --git a/natsclient_loopback_test.go b/natsclient_loopback_test.go index 134e222..9952675 100644 --- a/natsclient_loopback_test.go +++ b/natsclient_loopback_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) func (c *LoopbackNatsClient) waitForSubscriptionsEmpty(ctx context.Context, t *testing.T) { diff --git a/proxy/main.go b/proxy/main.go index e082ec8..a354525 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -36,9 +36,9 @@ import ( "github.com/dlintw/goconf" "github.com/gorilla/mux" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" - "github.com/strukturag/nextcloud-spreed-signaling" + signaling "github.com/strukturag/nextcloud-spreed-signaling" ) var ( diff --git a/room.go b/room.go index ee47650..58c3d0d 100644 --- a/room.go +++ b/room.go @@ -31,7 +31,7 @@ import ( "sync" "time" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" ) const ( diff --git a/server/main.go b/server/main.go index 047d612..3606c4f 100644 --- a/server/main.go +++ b/server/main.go @@ -40,9 +40,9 @@ import ( "github.com/dlintw/goconf" _ "github.com/gorilla/context" "github.com/gorilla/mux" - "github.com/nats-io/go-nats" + "github.com/nats-io/nats.go" - "github.com/strukturag/nextcloud-spreed-signaling" + signaling "github.com/strukturag/nextcloud-spreed-signaling" ) var (