From 0c6f66f47c07d950569a78026925fc54b04ebbfe Mon Sep 17 00:00:00 2001 From: Eugene K Date: Mon, 24 Jul 2023 11:57:02 -0400 Subject: [PATCH] update dependencies and tests --- go.mod | 4 ++-- go.sum | 8 ++++---- tests/enrollment_router_test.go | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index cd70876ab..4cc2641c8 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/openziti/channel/v2 v2.0.87 github.com/openziti/edge-api v0.25.30 - github.com/openziti/fabric v0.23.48 + github.com/openziti/fabric v0.23.52 github.com/openziti/foundation/v2 v2.0.28 github.com/openziti/identity v1.0.59 github.com/openziti/jwks v1.0.3 @@ -39,7 +39,7 @@ require ( github.com/openziti/storage v0.2.11 github.com/openziti/transport/v2 v2.0.96 github.com/openziti/x509-claims v1.0.3 - github.com/openziti/xweb/v2 v2.0.2 + github.com/openziti/xweb/v2 v2.1.0 github.com/orcaman/concurrent-map/v2 v2.0.1 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 diff --git a/go.sum b/go.sum index a1c37dfa9..c743d3e2a 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ github.com/openziti/channel/v2 v2.0.87 h1:+54diAb1NjwnQ3qADptq76gq3IFF+hW+uLD5st github.com/openziti/channel/v2 v2.0.87/go.mod h1:GggAVKAlOf2ezo8VvgQ2yRK5Gokp6wlvS4kBhmoKn1g= github.com/openziti/edge-api v0.25.30 h1:40pAcd3Y2yT8hYYHTJTkSTLA0pvbDCw4prt72JdQMuI= github.com/openziti/edge-api v0.25.30/go.mod h1:ODMG0fB9Dj1pL0UqDC8jzSUAlUZy8aYhzF3xHPg6Xm0= -github.com/openziti/fabric v0.23.48 h1:ZWJdIUNrPpQZKE/5FZ37jPbKpZWIzYKJV+bMNJIJcZo= -github.com/openziti/fabric v0.23.48/go.mod h1:MiSRLBjXd/cSKbyWb7IDY4GMTSaEubOLHxpueA/4OwU= +github.com/openziti/fabric v0.23.52 h1:8F4jt00RDrZJz6YiKliJ8UGnknE3jSuWwxsK3641ehE= +github.com/openziti/fabric v0.23.52/go.mod h1:wLYKhlnhthLR7FBqfGlfdCZ0hbQCcSnr5b2wpjA4/vM= github.com/openziti/foundation/v2 v2.0.28 h1:AAdHhtUj1tCIXollSpbDlKwPKRasNAgADpTZAF1WCOQ= github.com/openziti/foundation/v2 v2.0.28/go.mod h1:psKxxQw/zRo5+oKN7AR+MKYaeR3mbBPhb65qq8rqB0U= github.com/openziti/identity v1.0.59 h1:YShXqxa9nTbCnPtIAji10hx7BG1nQukg4ddUJExNXa8= @@ -505,8 +505,8 @@ github.com/openziti/transport/v2 v2.0.96 h1:onLHb0oNS+xzmqnAVYHDGb00qtLODzyPVubq github.com/openziti/transport/v2 v2.0.96/go.mod h1:L0MZ3LZsJ9Jheg05Bp6QYJBfuq4fDtjoL9stcTSmtko= github.com/openziti/x509-claims v1.0.3 h1:HNdQ8Nf1agB3lBs1gahcO6zfkeS4S5xoQ2/PkY4HRX0= github.com/openziti/x509-claims v1.0.3/go.mod h1:Z0WIpBm6c4ecrpRKrou6Gk2wrLWxJO/+tuUwKh8VewE= -github.com/openziti/xweb/v2 v2.0.2 h1:XYlVFriTq/U1wcUrc+XPnWJGhXh9NJPhtQ7+r3aC0cU= -github.com/openziti/xweb/v2 v2.0.2/go.mod h1:KQOOlnJk08EZT3TWkvDj/pbIUEVbgG0IrrNzl8gsi40= +github.com/openziti/xweb/v2 v2.1.0 h1:Xhh3C2pZkq/Prr65V+SfFSibLDYteoc4f62KQCcTZF4= +github.com/openziti/xweb/v2 v2.1.0/go.mod h1:wPkjm5y45RYCV8AafjcAXP/ZM4DBOofXhRwSGgjF8w8= github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c= github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM= github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 h1:mOvehYivJ4Aqu2CPe3D3lv8jhqOI9/1o0THxJHBE0qw= diff --git a/tests/enrollment_router_test.go b/tests/enrollment_router_test.go index b9fea9c71..1b7f58157 100644 --- a/tests/enrollment_router_test.go +++ b/tests/enrollment_router_test.go @@ -30,6 +30,7 @@ import ( "github.com/Jeffail/gabs" "github.com/google/uuid" "github.com/openziti/channel/v2" + "github.com/openziti/transport/v2" identity2 "github.com/openziti/identity" "github.com/pkg/errors" @@ -367,7 +368,9 @@ func Test_RouterEnrollment(t *testing.T) { id := identity2.NewClientTokenIdentity(certs, privateKey, caCerts) ctx.Req.NotNil(id) - ch, err := channel.NewChannel("apitest", channel.NewClassicDialer(id, ctx.ControllerConfig.Ctrl.Listener, nil), nil, nil) + tcfg := transport.Configuration{"protocol": "ziti-ctrl"} + ch, err := channel.NewChannelWithTransportConfiguration("apitest", + channel.NewClassicDialer(id, ctx.ControllerConfig.Ctrl.Listener, nil), nil, nil, tcfg) defer func() { if ch != nil { @@ -567,7 +570,8 @@ func Test_RouterEnrollment(t *testing.T) { id := identity2.NewClientTokenIdentity(extensionClientCerts, extensionPrivateKey, caCerts) ctx.Req.NotNil(id) - ch, err := channel.NewChannel("apitestextension", channel.NewClassicDialer(id, ctx.ControllerConfig.Ctrl.Listener, nil), nil, nil) + tcfg := transport.Configuration{"protocol": "ziti-ctrl"} + ch, err := channel.NewChannelWithTransportConfiguration("apitestextension", channel.NewClassicDialer(id, ctx.ControllerConfig.Ctrl.Listener, nil), nil, nil, tcfg) defer func() { if ch != nil {