Skip to content

Commit 609c68c

Browse files
plorenzplorenz
committed
Update for channel/v3
1 parent 45d261f commit 609c68c

File tree

10 files changed

+27
-23
lines changed

10 files changed

+27
-23
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ require (
1818
github.com/michaelquigley/pfxlog v0.6.10
1919
github.com/mitchellh/go-ps v1.0.0
2020
github.com/mitchellh/mapstructure v1.5.0
21-
github.com/openziti/channel/v2 v2.0.136
21+
github.com/openziti/channel/v3 v3.0.0-20240906172147-702f52deaf5c
2222
github.com/openziti/edge-api v0.26.23
23-
github.com/openziti/foundation/v2 v2.0.47
24-
github.com/openziti/identity v1.0.81
23+
github.com/openziti/foundation/v2 v2.0.48
24+
github.com/openziti/identity v1.0.84
2525
github.com/openziti/metrics v1.2.56
2626
github.com/openziti/secretstream v0.1.21
27-
github.com/openziti/transport/v2 v2.0.138
27+
github.com/openziti/transport/v2 v2.0.143
2828
github.com/orcaman/concurrent-map/v2 v2.0.1
2929
github.com/pkg/errors v0.9.1
3030
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -302,20 +302,20 @@ github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
302302
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
303303
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
304304
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
305-
github.com/openziti/channel/v2 v2.0.136 h1:XWjcNrPhto2XiD5HLhsh7GhmqfHEweQIJ/eUjtVKUJs=
306-
github.com/openziti/channel/v2 v2.0.136/go.mod h1:7jhk6JtJPP1O8aWYx+w2IuwCunFJ88Ot4AQcrKiX5og=
305+
github.com/openziti/channel/v3 v3.0.0-20240906172147-702f52deaf5c h1:Edu5+8hTUz8gUpB+gBZ1lPCutOVgqEndtePKrL3iwLQ=
306+
github.com/openziti/channel/v3 v3.0.0-20240906172147-702f52deaf5c/go.mod h1:HKLmCTrimAI7RXpydb4ubORzafisOoxgvuvTbEaXlEM=
307307
github.com/openziti/edge-api v0.26.23 h1:tXXGc/ACg7bQys+8K8ElS49A8VWfBi8Y6nGV53NqE9U=
308308
github.com/openziti/edge-api v0.26.23/go.mod h1:t0qfgV5u2+HItpvgDIShA69v6m7RZ+PrbQuLQaDDdx8=
309-
github.com/openziti/foundation/v2 v2.0.47 h1:f2LM6FQOhHXJ9QMTpr4GAKq8qXspNG3EGczMjjyz7uc=
310-
github.com/openziti/foundation/v2 v2.0.47/go.mod h1:pj5nPmVtAdF1QX+aRtALw69hxcsAzrWDpBUe+Zrc73Q=
311-
github.com/openziti/identity v1.0.81 h1:zeS+sCxsfIbNAvlLHqM+74BcCPitW4Vpmarlrcun6hw=
312-
github.com/openziti/identity v1.0.81/go.mod h1:/UKDen2MOw2Kjs0WuKiBloIT2bPrV0jxLAo8eyVy0ic=
309+
github.com/openziti/foundation/v2 v2.0.48 h1:G0/P8XQS+xTAS3KYQ/PHjLFHLABZkLJeNDbPgPTaxU0=
310+
github.com/openziti/foundation/v2 v2.0.48/go.mod h1:pj5nPmVtAdF1QX+aRtALw69hxcsAzrWDpBUe+Zrc73Q=
311+
github.com/openziti/identity v1.0.84 h1:AxNS/KZb50rzJkZ+1IF1aoollObrelZBUoMlWtpw2Y4=
312+
github.com/openziti/identity v1.0.84/go.mod h1:EVkwgH4r/uQ/GUUFjIZN6WBiGcQHUhfiv6o+WUAtuDk=
313313
github.com/openziti/metrics v1.2.56 h1:sOX5SCdK2Kx2vci+2PWIXDedbyRDUWylM3xJmmISiUs=
314314
github.com/openziti/metrics v1.2.56/go.mod h1:nATuueUtFF5PDhwBwbq93g8sjpQZmf0yo2rySOnOUEY=
315315
github.com/openziti/secretstream v0.1.21 h1:r4xN8/CzSEvxZFFYGSztrlhMtIvk3B+SQcq2zgZ4Tb4=
316316
github.com/openziti/secretstream v0.1.21/go.mod h1:1lfAnS8gBHsKZiPbRRK1sularbAsqizN6tWUEuZSfo0=
317-
github.com/openziti/transport/v2 v2.0.138 h1:F7TUv34BZ6x2BetYLtYbxSU/G15B+vkGRU4uPKwvRvU=
318-
github.com/openziti/transport/v2 v2.0.138/go.mod h1:v0PN1dhFP48HeUUeBq9n/Ql2u5ln8EOtPBA3KkzD2GI=
317+
github.com/openziti/transport/v2 v2.0.143 h1:qhqI/yEN4SvP8SBx7ERCt0x67Im+Icy/hGtJ7Dn/xOQ=
318+
github.com/openziti/transport/v2 v2.0.143/go.mod h1:3BxxlWa8fbhmZG1CmIOpeEHlCCY1G7DPx7v7+bAXYEQ=
319319
github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
320320
github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
321321
github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 h1:mOvehYivJ4Aqu2CPe3D3lv8jhqOI9/1o0THxJHBE0qw=

‎ziti/edge/conn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
"github.com/google/uuid"
3030
"github.com/michaelquigley/pfxlog"
31-
"github.com/openziti/channel/v2"
31+
"github.com/openziti/channel/v3"
3232
"github.com/openziti/foundation/v2/sequence"
3333
)
3434

‎ziti/edge/messages.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package edge
1818

1919
import (
2020
"encoding/binary"
21-
"github.com/openziti/channel/v2"
21+
"github.com/openziti/channel/v3"
2222
"github.com/openziti/foundation/v2/uuidz"
2323
"github.com/openziti/sdk-golang/pb/edge_client_pb"
2424
"github.com/pkg/errors"

‎ziti/edge/msg_mux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package edge
1919
import (
2020
"fmt"
2121
"github.com/michaelquigley/pfxlog"
22-
"github.com/openziti/channel/v2"
22+
"github.com/openziti/channel/v3"
2323
"github.com/pkg/errors"
2424
"github.com/sirupsen/logrus"
2525
"math"

‎ziti/edge/network/conn.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"crypto/rand"
2828
"encoding/base64"
2929
"github.com/michaelquigley/pfxlog"
30-
"github.com/openziti/channel/v2"
30+
"github.com/openziti/channel/v3"
3131
"github.com/openziti/edge-api/rest_model"
3232
"github.com/openziti/foundation/v2/info"
3333
"github.com/openziti/sdk-golang/ziti/edge"

‎ziti/edge/network/conn_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package network
22

33
import (
44
"crypto/x509"
5-
"github.com/openziti/channel/v2"
5+
"github.com/openziti/channel/v3"
66
"github.com/openziti/foundation/v2/sequencer"
77
"github.com/openziti/sdk-golang/ziti/edge"
88
"github.com/stretchr/testify/require"

‎ziti/edge/network/factory.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"time"
2222

2323
"github.com/michaelquigley/pfxlog"
24-
"github.com/openziti/channel/v2"
24+
"github.com/openziti/channel/v3"
2525
"github.com/openziti/edge-api/rest_model"
2626
"github.com/openziti/sdk-golang/ziti/edge"
2727
"github.com/openziti/secretstream/kx"

‎ziti/edge/network/seq_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package network
22

33
import (
4-
"github.com/openziti/channel/v2"
4+
"github.com/openziti/channel/v3"
55
"github.com/openziti/sdk-golang/ziti/edge"
66
"github.com/stretchr/testify/require"
77
"testing"

‎ziti/ziti.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ import (
4343

4444
"github.com/cenkalti/backoff/v4"
4545
"github.com/michaelquigley/pfxlog"
46-
"github.com/openziti/channel/v2"
47-
"github.com/openziti/channel/v2/latency"
46+
"github.com/openziti/channel/v3"
47+
"github.com/openziti/channel/v3/latency"
4848
"github.com/openziti/edge-api/rest_client_api_client/current_api_session"
4949
"github.com/openziti/edge-api/rest_model"
5050
"github.com/openziti/foundation/v2/versions"
@@ -1387,8 +1387,12 @@ func (context *ContextImpl) connectEdgeRouter(routerName, ingressUrl string) *ed
13871387
}
13881388
}
13891389

1390-
dialer := channel.NewClassicDialer(identity.NewIdentity(id), ingAddr, map[int32][]byte{
1391-
edge.SessionTokenHeader: context.CtrlClt.GetCurrentApiSession().GetToken(),
1390+
dialer := channel.NewClassicDialer(channel.DialerConfig{
1391+
Identity: identity.NewIdentity(id),
1392+
Endpoint: ingAddr,
1393+
Headers: map[int32][]byte{
1394+
edge.SessionTokenHeader: context.CtrlClt.GetCurrentApiSession().GetToken(),
1395+
},
13921396
})
13931397

13941398
start := time.Now().UnixNano()

0 commit comments

Comments
 (0)