From 376c11bef35ec14fafbbd54c80a5bcf1b42f5f81 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 1 Jul 2022 16:40:44 -0400 Subject: [PATCH] Update deps. Update for foundation changes. Update CHANGELOG --- CHANGELOG.md | 31 ++++++++++- common/enrollment/enroll.go | 4 +- common/version/info.go | 12 ++--- etc/ctrl.with.edge.yml | 39 +++----------- go.mod | 27 +++++----- go.sum | 54 ++++++++++--------- test/id_test_utils.go | 2 +- test/multi-conn-test/multi-conn-test.go | 2 +- test/sdk-echo-server/sdk-echo-server.go | 2 +- .../zapp-fortio-grpc-server.go | 2 +- ziti-controller/subcmd/run.go | 2 +- ziti-fabric-test/main.go | 2 +- ziti-fabric-test/subcmd/client/http.go | 4 +- ziti-fabric-test/subcmd/client/nc.go | 6 +-- ziti-fabric-test/subcmd/loop2/dialer.go | 4 +- ziti-fabric-test/subcmd/loop2/generator.go | 2 +- ziti-fabric-test/subcmd/loop2/listener.go | 4 +- ziti-fabric-test/subcmd/loop2/protocol.go | 2 +- ziti-fabric-test/subcmd/loop3/dialer.go | 6 +-- ziti-fabric-test/subcmd/loop3/generator.go | 2 +- ziti-fabric-test/subcmd/loop3/listener.go | 6 +-- ziti-fabric-test/subcmd/loop3/messages.go | 2 +- ziti-fabric-test/subcmd/loop3/protocol.go | 2 +- ziti-probe/subcmd/root.go | 2 + ziti-probe/subcmd/run.go | 7 ++- ziti-probe/subcmd/version.go | 2 + ziti-probe/ziti-probe.go | 2 +- ziti-router/subcmd/run.go | 4 +- ziti-tunnel/cmd/ziti-tunnel/main.go | 2 +- ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go | 2 +- ziti/cmd/ziti/cmd/agent_ch_simple.go | 4 +- ziti/cmd/ziti/cmd/agent_controller_init.go | 4 +- .../ziti/cmd/agent_controller_raft_join.go | 4 +- .../ziti/cmd/agent_controller_raft_list.go | 4 +- ziti/cmd/ziti/cmd/agent_router_add_route.go | 2 +- ziti/cmd/ziti/cmd/agent_router_forget_link.go | 4 +- ziti/cmd/ziti/cmd/agent_simple.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent.go | 4 +- .../agentcli/agent_clear_channel_log_level.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_gc.go | 2 +- .../cmd/agentcli/agent_go_version_action.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_memstats.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_pprof_cpu.go | 2 +- .../cmd/ziti/cmd/agentcli/agent_pprof_heap.go | 2 +- .../agentcli/agent_set_channel_log_level.go | 2 +- .../ziti/cmd/agentcli/agent_set_log_level.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_setgc.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_stack.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_stats.go | 2 +- ziti/cmd/ziti/cmd/agentcli/agent_trace.go | 2 +- ziti/cmd/ziti/cmd/api/list.go | 2 +- ziti/cmd/ziti/cmd/api/ws.go | 2 +- ziti/cmd/ziti/cmd/demo/echo_server.go | 4 +- .../cmd/demo/echo_server_update_terminator.go | 2 +- ziti/cmd/ziti/cmd/demo/zcat.go | 2 +- .../cmd/edge/create_authenticator_updb.go | 2 +- ziti/cmd/ziti/cmd/edge/create_terminator.go | 2 +- ziti/cmd/ziti/cmd/edge/list.go | 2 +- ziti/cmd/ziti/cmd/edge/login.go | 2 +- .../cmd/edge/update_authenticator_updb.go | 2 +- ziti/cmd/ziti/cmd/edge/update_terminator.go | 2 +- ziti/cmd/ziti/cmd/edge/verify_ca.go | 4 +- ziti/cmd/ziti/cmd/fabric/create_router.go | 2 +- ziti/cmd/ziti/cmd/fabric/create_terminator.go | 2 +- ziti/cmd/ziti/cmd/fabric/inspect.go | 2 +- ziti/cmd/ziti/cmd/fabric/update_terminator.go | 2 +- .../tutorial/actions/select_edge_router.go | 2 +- ziti/cmd/ziti/cmd/unwrap_identity.go | 2 +- ziti/cmd/ziti/tutorial/exec.go | 2 +- ziti/cmd/ziti/tutorial/runner.go | 2 +- ziti/cmd/ziti/util/identities.go | 2 +- ziti/pki/pki/pki.go | 2 +- 72 files changed, 182 insertions(+), 158 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 313e90367..76f532964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ ## Breaking Changes -The fabric management terminators API has changed the name of some fields. See below for details. +* The fabric management terminators API has changed the name of some fields. See below for details. +* The management channel, which was formerly deprecated is now removed +* Support for the old metrics subsystem has been removed. ## What's New - Edge @@ -11,6 +13,10 @@ The fabric management terminators API has changed the name of some fields. See b - Terminator fields name changes - Circuit failed events - Additional circuit inspect information gathered + - Management channel has been removed + - Old metrics subsystem removed + - Circuit createdAt + - Bug Fixes - Ziti CLI - Terminator fields name changes - SDK Golang @@ -85,6 +91,29 @@ Circuit inspect will now gather more information. * payloadCount * sequence +### Management channel removed + +The management channel has been removed. The ziti-fabric cli, which used to use the management channel, +has been absorbed into the ziti CLI, and now used the fabric REST API and/or websockets where appropriate. + +The `mgmt:` stanza in configuration files, which used to be required, will now be ignored. + +### Old Metrics Subsystem removed + +Formerly metrics could be exported to file via the `metrics:` configuration stanza. This was superceded by +the events subsystem, which contains metrics as well as other events. + +This also means that we no longer support pushing metrics directly to InfluxDB. However, we now have a +Prometheus endpoint available, which can also be used to feed information to InfluxDB. + +### Circuit createdAt + +Circuits now have a createdAt field, visible via the REST API. + +### Bug Fixes + +* Fix for issue where smart routing could break a circuit if a router became unavailable while circuits were being updated + ## Ziti CLI ### Terminator Field Name Changes The `ziti fabric create terminator` operation now takes a `--instance-id` flag instead of an `--identity` flag. diff --git a/common/enrollment/enroll.go b/common/enrollment/enroll.go index 566600c94..bb513da63 100644 --- a/common/enrollment/enroll.go +++ b/common/enrollment/enroll.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/identity/certtools" - "github.com/openziti/foundation/util/term" + "github.com/openziti/identity/certtools" + "github.com/openziti/foundation/v2/term" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/enroll" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" diff --git a/common/version/info.go b/common/version/info.go index 6496a451b..56a33effa 100644 --- a/common/version/info.go +++ b/common/version/info.go @@ -17,14 +17,14 @@ package version import ( - "github.com/openziti/foundation/common" + "github.com/openziti/foundation/v2/versions" "runtime" ) type cmdBuildInfo struct{} -func (c cmdBuildInfo) EncoderDecoder() common.VersionEncDec { - return &common.StdVersionEncDec +func (c cmdBuildInfo) EncoderDecoder() versions.VersionEncDec { + return &versions.StdVersionEncDec } func (c cmdBuildInfo) Version() string { @@ -43,8 +43,8 @@ func (c cmdBuildInfo) Branch() string { return Branch } -func (c cmdBuildInfo) AsVersionInfo() *common.VersionInfo { - return &common.VersionInfo{ +func (c cmdBuildInfo) AsVersionInfo() *versions.VersionInfo { + return &versions.VersionInfo{ Version: c.Version(), Revision: c.Revision(), BuildDate: c.BuildDate(), @@ -53,7 +53,7 @@ func (c cmdBuildInfo) AsVersionInfo() *common.VersionInfo { } } -func GetCmdBuildInfo() common.VersionProvider { +func GetCmdBuildInfo() versions.VersionProvider { return cmdBuildInfo{} } diff --git a/etc/ctrl.with.edge.yml b/etc/ctrl.with.edge.yml index ee0442078..38a9eae4f 100644 --- a/etc/ctrl.with.edge.yml +++ b/etc/ctrl.with.edge.yml @@ -47,38 +47,15 @@ ctrl: # connections. The value of newListener must be resolvable both via DNS and validate via certificates #newListener: tls:localhost:6262 -# the endpoint that management tools connect to the controller over. -mgmt: - listener: tls:127.0.0.1:10000 - #options: - # (optional) settings - # set the maximum number of connect requests that are buffered and waiting to be acknowledged (1 to 5000, default 1000) - #maxQueuedConnects: 50 - # the maximum number of connects that have begun hello synchronization (1 to 1000, default 16) - #maxOutstandingConnects: 100 - # the number of milliseconds to wait before a hello synchronization fails and closes the connection (30ms to 60000ms, default: 1000ms) - #connectTimeoutMs: 3000 - - #metrics: - #file: - #path: /tmp/ziti-controller-metrics.log - #maxsizemb: 100:wq - # Supported formats: json, plain - # Defaults to json - #format: plain - #influxdb: - #url: http://localhost:8086 - #database: ziti - -events: - jsonLogger: - subscriptions: +#events: +# jsonLogger: +# subscriptions: # - type: fabric.routers # - type: fabric.terminators # - type: metrics # sourceFilter: .* # metricFilter: .*pool.* - - type: fabric.circuits +# - type: fabric.circuits # include: # - created # - type: edge.sessions @@ -89,10 +66,10 @@ events: # - type: services # - type: edge.entityCounts # interval: 5s - handler: - type: file - format: json - path: /tmp/ziti-events.log +# handler: +# type: file +# format: json +# path: /tmp/ziti-events.log # xctrl_example # diff --git a/go.mod b/go.mod index c700984ab..2312f5cf4 100644 --- a/go.mod +++ b/go.mod @@ -22,25 +22,28 @@ require ( github.com/jedib0t/go-pretty/v6 v6.2.4 github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19 github.com/michaelquigley/pfxlog v0.6.9 - github.com/openziti/channel v0.18.43 - github.com/openziti/edge v0.22.0 - github.com/openziti/fabric v0.19.3 - github.com/openziti/foundation v0.17.30 - github.com/openziti/sdk-golang v0.16.83 - github.com/openziti/storage v0.1.11 - github.com/openziti/transport/v2 v2.0.7 - github.com/openziti/xweb/v2 v2.0.0 + github.com/openziti/agent v1.0.1 + github.com/openziti/channel v0.18.49 + github.com/openziti/edge v0.22.12 + github.com/openziti/fabric v0.19.13 + github.com/openziti/foundation/v2 v2.0.1 + github.com/openziti/identity v1.0.2 + github.com/openziti/metrics v1.0.2 + github.com/openziti/sdk-golang v0.16.93 + github.com/openziti/storage v0.1.14 + github.com/openziti/transport/v2 v2.0.13 + github.com/openziti/xweb/v2 v2.0.1 github.com/openziti/ziti-db-explorer v1.1.1 github.com/pborman/uuid v1.2.0 github.com/pkg/errors v0.9.1 - github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 github.com/russross/blackfriday v1.5.2 github.com/shirou/gopsutil/v3 v3.22.5 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.10.0 - github.com/stretchr/testify v1.7.4 + github.com/stretchr/testify v1.8.0 github.com/valyala/fasttemplate v1.2.1 go.etcd.io/bbolt v1.3.6 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 @@ -155,11 +158,11 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.mongodb.org/mongo-driver v1.8.3 // indirect go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1 // indirect - golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect + golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/image v0.0.0-20191206065243-da761ea9ff43 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect + golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b // indirect golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.7 // indirect diff --git a/go.sum b/go.sum index 31bdde876..9f4798d96 100644 --- a/go.sum +++ b/go.sum @@ -665,28 +665,34 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openziti/channel v0.18.43 h1:XTQsFdNut6uGvweFrA04flfJ4n75n6jUTSLwqVwfCv8= -github.com/openziti/channel v0.18.43/go.mod h1:Y3Xmj47OlwcLrEuVlgOv7PJuxwgwyCLuMgHfH4JNvn8= +github.com/openziti/agent v1.0.1 h1:mk3M6MOyK75Qc+lOdtKHywfaxnbSES9qi4NiLZQxOMU= +github.com/openziti/agent v1.0.1/go.mod h1:ALOg74f4b4GpUOjDPusp6lezbQa/7rgo09HOrodDWAw= +github.com/openziti/channel v0.18.49 h1:q+xxEBs6bhmE8tYGNiFV6RfvzPHGoRBMqSiKuUX/XIU= +github.com/openziti/channel v0.18.49/go.mod h1:2aO16KawNL9xVz6I55FgH8QEY+Zjc4ekeuDKFcRsa+8= github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k= github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo= -github.com/openziti/edge v0.22.0 h1:HtHAh3LYRS/q/6/ciSfK9ZeDlT6Sj0ttyUcb9fiR818= -github.com/openziti/edge v0.22.0/go.mod h1:LMgpEskGxrR2ZqqAzcjL5zJxg0TV4d5TidA+Yk3DwbA= -github.com/openziti/fabric v0.19.3 h1:ZDK1/fiuZzl0qNzrTbAE4uVUtn5L3tTV3viCBFvWtLw= -github.com/openziti/fabric v0.19.3/go.mod h1:W2rUkZG8ic9aDTfeva3BEm3dRZO/29VOqZAefavIpnY= -github.com/openziti/foundation v0.17.30 h1:8B1Jlcx63/Cdiyt/rJY/nYZqFiBSzf45jIOKfQZj/Jg= -github.com/openziti/foundation v0.17.30/go.mod h1:oiyKO0ghTR2LXips05tMOreaRLYu2TwbzLVgCK6zsZg= +github.com/openziti/edge v0.22.12 h1:xjWAEkkgZW33UJVFEp14ELruqa5q43n1UMhh0MAwYAk= +github.com/openziti/edge v0.22.12/go.mod h1:sNIy+mxQMSLgegL2Wu3x6RZHrhr9vLL32h5yKJZLZ4Q= +github.com/openziti/fabric v0.19.13 h1:hgCcv/6qHa+jXnh5z9LALvvh/G89EfGDc0woCbqcF3c= +github.com/openziti/fabric v0.19.13/go.mod h1:dENRjruDfbt1FjP0R+v6Q767Pm6eG0VdQckClnLHkuU= +github.com/openziti/foundation/v2 v2.0.1 h1:HKYwAyxlZ4zmlt0t9Y/v6SWso0qUaeWapkWOlQDKPEk= +github.com/openziti/foundation/v2 v2.0.1/go.mod h1:L75kwCC5WTUPqxuAd3G+WMBompaElMb/nYlJjR1sJ9Q= +github.com/openziti/identity v1.0.2 h1:6CAgxIvhwtgm87XqJKubpXLb52UBfrSGTyl3TF/y83U= +github.com/openziti/identity v1.0.2/go.mod h1:p7Q8N7VADvtLWd9fqcjtydX+It9iHuCLPk5jE+gh1sY= github.com/openziti/jwks v1.0.1 h1:+BtBzDWFVUlJfCbBhQR0BZI3YNtoBvfhfdCUSSB0G+0= github.com/openziti/jwks v1.0.1/go.mod h1:KwO0x9FBG0aoJS5f6nH5xeHoplyR1H143SMI9kF0mC8= -github.com/openziti/sdk-golang v0.16.83 h1:iGhtVsKAVwta3OUJ0yiYK6vHe9La84nFNULW5Y0rKUQ= -github.com/openziti/sdk-golang v0.16.83/go.mod h1:o2ghlrEpAAs6qvuiF9uSAVtbmNgNyFECTKzvsLTwbg0= -github.com/openziti/storage v0.1.11 h1:VbmlHp/H8gqhmyWg04xly2tn1YfwGjMh1flFMkn9BUM= -github.com/openziti/storage v0.1.11/go.mod h1:/xsHhRqpPl5jrmYrBYUCfoquTeE1F3EmqEjiP987WCo= -github.com/openziti/transport/v2 v2.0.7 h1:zsRooC+2gE0BaTL4sSzfWxNS9oXByiVuUpyLSWKo+oU= -github.com/openziti/transport/v2 v2.0.7/go.mod h1:6jKe/L+5AoDC3YXpFOky2FpNO6E+107nQBKUD7i+Gao= +github.com/openziti/metrics v1.0.2 h1:X3ip93aDDgVeyhqxBLVwCtdG7/kILktFxcpl5N2+4+E= +github.com/openziti/metrics v1.0.2/go.mod h1:30EzUXm/VJfTVNoqPLx4x3mC/eslpCeh6wc4ejbZR/g= +github.com/openziti/sdk-golang v0.16.93 h1:2lWu2ii4Iq/wlhPRKOA3SWdX1meEtIB2XGWQF0uTSQY= +github.com/openziti/sdk-golang v0.16.93/go.mod h1:JrJIvFTQY9giAuJQXaqDDCxHg8m98jjZYWpobqOyA8c= +github.com/openziti/storage v0.1.14 h1:JZv9OP0O4d3Z5c+ebaVpNUDJWrRsqgpTPHIwdCgYud0= +github.com/openziti/storage v0.1.14/go.mod h1:PXc1iYT8m+EmZf9EGyRTFwAToY1/jd5cAV2FFxL2D/g= +github.com/openziti/transport/v2 v2.0.13 h1:uNauFwxOWImb/xS/8nX8jPD78ypJAJWWob44EuuTw+o= +github.com/openziti/transport/v2 v2.0.13/go.mod h1:5jRwFxj4H61C32mYcwBRbIIw1FrpJINq9WuQ8Wpe1a0= github.com/openziti/x509-claims v1.0.2 h1:PSv/xRfejIAcPc16A902k08rSBs3R8bjtL4qq6WEwCI= github.com/openziti/x509-claims v1.0.2/go.mod h1:Z0WIpBm6c4ecrpRKrou6Gk2wrLWxJO/+tuUwKh8VewE= -github.com/openziti/xweb/v2 v2.0.0 h1:tXYkiP55f9wOdZ/kwe28AvZotcAQJEYPtZTaWfSnnX8= -github.com/openziti/xweb/v2 v2.0.0/go.mod h1:0rV8rBgZQMAe3qAGR7csrIemBL8ZAOwhR4lwYlZTJw0= +github.com/openziti/xweb/v2 v2.0.1 h1:KF0bVCeiJ6TIJEsxdLZbnpdJKqZX095EiMTcoQynuz4= +github.com/openziti/xweb/v2 v2.0.1/go.mod h1:2+IpJFejJeJelA4QyAPluLS30hfyUP2eRTo9XD99W0Y= github.com/openziti/ziti-db-explorer v1.1.1 h1:G0eoTby+aIjjt5TxEfR+FMI2CWd4RvZFjzaIMX2lEBw= github.com/openziti/ziti-db-explorer v1.1.1/go.mod h1:h76h7Tsb+khb0v+CqYKL6ifUfJbUMjGBFU2IvupfBE4= github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -754,8 +760,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -855,8 +861,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.7.4 h1:wZRexSlwd7ZXfKINDLsO4r7WBt3gTKONc6K/VesHvHM= -github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -958,8 +964,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1170,8 +1176,8 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU= -golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/test/id_test_utils.go b/test/id_test_utils.go index 5af273e7a..562410136 100644 --- a/test/id_test_utils.go +++ b/test/id_test_utils.go @@ -17,7 +17,7 @@ package test import ( - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity" "crypto/rand" "crypto/rsa" "crypto/x509" diff --git a/test/multi-conn-test/multi-conn-test.go b/test/multi-conn-test/multi-conn-test.go index dc852e6d3..63de71475 100644 --- a/test/multi-conn-test/multi-conn-test.go +++ b/test/multi-conn-test/multi-conn-test.go @@ -21,7 +21,7 @@ package main import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/sdk-golang/ziti" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/test/sdk-echo-server/sdk-echo-server.go b/test/sdk-echo-server/sdk-echo-server.go index f794b38f3..5807e8e8b 100644 --- a/test/sdk-echo-server/sdk-echo-server.go +++ b/test/sdk-echo-server/sdk-echo-server.go @@ -21,7 +21,7 @@ package main import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/sdk-golang/ziti" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go index bd16cb7c2..8125109e0 100644 --- a/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go +++ b/test/zapp-fortio-grpc-server/zapp-fortio-grpc-server.go @@ -21,7 +21,7 @@ package main import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/edge" "github.com/sirupsen/logrus" diff --git a/ziti-controller/subcmd/run.go b/ziti-controller/subcmd/run.go index c56a7971e..b28ae8442 100644 --- a/ziti-controller/subcmd/run.go +++ b/ziti-controller/subcmd/run.go @@ -26,7 +26,7 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/edge/controller/server" "github.com/openziti/fabric/controller" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/common/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/ziti-fabric-test/main.go b/ziti-fabric-test/main.go index ef94774c7..3c8627950 100644 --- a/ziti-fabric-test/main.go +++ b/ziti-fabric-test/main.go @@ -28,7 +28,7 @@ import ( "github.com/openziti/transport/v2/transwarp" "github.com/openziti/transport/v2/transwarptls" "github.com/openziti/transport/v2/wss" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "github.com/openziti/ziti/ziti-fabric-test/subcmd" _ "github.com/openziti/ziti/ziti-fabric-test/subcmd/client" _ "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop2" diff --git a/ziti-fabric-test/subcmd/client/http.go b/ziti-fabric-test/subcmd/client/http.go index efdc459d2..c40961a21 100644 --- a/ziti-fabric-test/subcmd/client/http.go +++ b/ziti-fabric-test/subcmd/client/http.go @@ -22,8 +22,8 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/router/xgress_transport" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" "github.com/openziti/transport/v2" "github.com/openziti/ziti/ziti-fabric-test/subcmd" "github.com/spf13/cobra" diff --git a/ziti-fabric-test/subcmd/client/nc.go b/ziti-fabric-test/subcmd/client/nc.go index 2074b9f37..b8cd30dcd 100644 --- a/ziti-fabric-test/subcmd/client/nc.go +++ b/ziti-fabric-test/subcmd/client/nc.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/router/xgress_transport" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" - "github.com/openziti/foundation/util/info" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" + "github.com/openziti/foundation/v2/info" "github.com/openziti/transport/v2" "github.com/openziti/ziti/ziti-fabric-test/subcmd" "github.com/spf13/cobra" diff --git a/ziti-fabric-test/subcmd/loop2/dialer.go b/ziti-fabric-test/subcmd/loop2/dialer.go index f408565f8..0603f719c 100644 --- a/ziti-fabric-test/subcmd/loop2/dialer.go +++ b/ziti-fabric-test/subcmd/loop2/dialer.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/router/xgress_transport" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" diff --git a/ziti-fabric-test/subcmd/loop2/generator.go b/ziti-fabric-test/subcmd/loop2/generator.go index faf4fba23..51202815a 100644 --- a/ziti-fabric-test/subcmd/loop2/generator.go +++ b/ziti-fabric-test/subcmd/loop2/generator.go @@ -18,7 +18,7 @@ package loop2 import ( "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop2/pb" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "crypto/sha512" "github.com/michaelquigley/pfxlog" "math/rand" diff --git a/ziti-fabric-test/subcmd/loop2/listener.go b/ziti-fabric-test/subcmd/loop2/listener.go index b2c505cee..84e0daa95 100644 --- a/ziti-fabric-test/subcmd/loop2/listener.go +++ b/ziti-fabric-test/subcmd/loop2/listener.go @@ -18,8 +18,8 @@ package loop2 import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" diff --git a/ziti-fabric-test/subcmd/loop2/protocol.go b/ziti-fabric-test/subcmd/loop2/protocol.go index d7716356d..25014ad0d 100644 --- a/ziti-fabric-test/subcmd/loop2/protocol.go +++ b/ziti-fabric-test/subcmd/loop2/protocol.go @@ -18,7 +18,7 @@ package loop2 import ( "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop2/pb" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "bytes" "crypto/sha512" "encoding/binary" diff --git a/ziti-fabric-test/subcmd/loop3/dialer.go b/ziti-fabric-test/subcmd/loop3/dialer.go index e439e22cb..0a1160ee9 100644 --- a/ziti-fabric-test/subcmd/loop3/dialer.go +++ b/ziti-fabric-test/subcmd/loop3/dialer.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/router/xgress_transport" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" diff --git a/ziti-fabric-test/subcmd/loop3/generator.go b/ziti-fabric-test/subcmd/loop3/generator.go index b76ec7494..b5a10bc6a 100644 --- a/ziti-fabric-test/subcmd/loop3/generator.go +++ b/ziti-fabric-test/subcmd/loop3/generator.go @@ -19,7 +19,7 @@ package loop3 import ( "crypto/sha512" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "math/rand" ) diff --git a/ziti-fabric-test/subcmd/loop3/listener.go b/ziti-fabric-test/subcmd/loop3/listener.go index 640645e21..e000fb09b 100644 --- a/ziti-fabric-test/subcmd/loop3/listener.go +++ b/ziti-fabric-test/subcmd/loop3/listener.go @@ -19,9 +19,9 @@ package loop3 import ( "errors" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/dotziti" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity/dotziti" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/transport/v2" diff --git a/ziti-fabric-test/subcmd/loop3/messages.go b/ziti-fabric-test/subcmd/loop3/messages.go index e68f70908..724823abc 100644 --- a/ziti-fabric-test/subcmd/loop3/messages.go +++ b/ziti-fabric-test/subcmd/loop3/messages.go @@ -7,7 +7,7 @@ import ( "encoding/hex" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "github.com/pkg/errors" "time" ) diff --git a/ziti-fabric-test/subcmd/loop3/protocol.go b/ziti-fabric-test/subcmd/loop3/protocol.go index f5f729fe0..3e625db08 100644 --- a/ziti-fabric-test/subcmd/loop3/protocol.go +++ b/ziti-fabric-test/subcmd/loop3/protocol.go @@ -22,7 +22,7 @@ import ( "fmt" "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "github.com/openziti/ziti/ziti-fabric-test/subcmd/loop3/pb" "github.com/pkg/errors" "io" diff --git a/ziti-probe/subcmd/root.go b/ziti-probe/subcmd/root.go index ace3d814b..6dbd6128f 100644 --- a/ziti-probe/subcmd/root.go +++ b/ziti-probe/subcmd/root.go @@ -1,3 +1,5 @@ +//go:build all + /* Copyright NetFoundry Inc. diff --git a/ziti-probe/subcmd/run.go b/ziti-probe/subcmd/run.go index f1ff0d515..62d5b86a7 100644 --- a/ziti-probe/subcmd/run.go +++ b/ziti-probe/subcmd/run.go @@ -1,3 +1,5 @@ +//go:build all + package subcmd import ( @@ -5,7 +7,7 @@ import ( "fmt" influxdb "github.com/influxdata/influxdb1-client" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/metrics" + "github.com/openziti/metrics" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/edge" @@ -76,6 +78,9 @@ func (p *probe) sendMetrics() { if message == nil { continue } + //TODO: currently broken as influx support was removed from metrics + // The AsBatch function can be extraced from foundation history + // if we want to get this working again bp, err := metrics.AsBatch(message) if err != nil { logrus.Errorln(err) diff --git a/ziti-probe/subcmd/version.go b/ziti-probe/subcmd/version.go index e9600779e..0ab21e750 100644 --- a/ziti-probe/subcmd/version.go +++ b/ziti-probe/subcmd/version.go @@ -1,3 +1,5 @@ +//go:build all + /* Copyright NetFoundry Inc. diff --git a/ziti-probe/ziti-probe.go b/ziti-probe/ziti-probe.go index fac44b57d..eab23201c 100644 --- a/ziti-probe/ziti-probe.go +++ b/ziti-probe/ziti-probe.go @@ -4,7 +4,7 @@ package main import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/ziti/ziti-probe/subcmd" "github.com/sirupsen/logrus" ) diff --git a/ziti-router/subcmd/run.go b/ziti-router/subcmd/run.go index 1e791f5eb..5611f7585 100644 --- a/ziti-router/subcmd/run.go +++ b/ziti-router/subcmd/run.go @@ -27,8 +27,8 @@ import ( "github.com/openziti/edge/router/xgress_edge_tunnel" "github.com/openziti/fabric/router" "github.com/openziti/fabric/router/xgress" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/agent" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/ziti/common/version" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/ziti-tunnel/cmd/ziti-tunnel/main.go b/ziti-tunnel/cmd/ziti-tunnel/main.go index 02a288d0b..f70c3f392 100644 --- a/ziti-tunnel/cmd/ziti-tunnel/main.go +++ b/ziti-tunnel/cmd/ziti-tunnel/main.go @@ -18,7 +18,7 @@ package main import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/debugz" + "github.com/openziti/foundation/v2/debugz" "github.com/openziti/ziti/ziti-tunnel/cmd/ziti-tunnel/subcmd" "github.com/sirupsen/logrus" ) diff --git a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go index 5f4bf1718..c26acceab 100644 --- a/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go +++ b/ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go @@ -27,7 +27,7 @@ import ( "github.com/openziti/edge/tunnel/dns" "github.com/openziti/edge/tunnel/entities" "github.com/openziti/edge/tunnel/intercept" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/ziti/common/enrollment" diff --git a/ziti/cmd/ziti/cmd/agent_ch_simple.go b/ziti/cmd/ziti/cmd/agent_ch_simple.go index 91388b657..558c1637d 100644 --- a/ziti/cmd/ziti/cmd/agent_ch_simple.go +++ b/ziti/cmd/ziti/cmd/agent_ch_simple.go @@ -19,8 +19,8 @@ package cmd import ( "fmt" "github.com/openziti/channel" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_controller_init.go b/ziti/cmd/ziti/cmd/agent_controller_init.go index 357d5355b..efdcad3c6 100644 --- a/ziti/cmd/ziti/cmd/agent_controller_init.go +++ b/ziti/cmd/ziti/cmd/agent_controller_init.go @@ -21,8 +21,8 @@ import ( "github.com/openziti/channel" "github.com/openziti/channel/protobufs" "github.com/openziti/edge/pb/edge_mgmt_pb" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_controller_raft_join.go b/ziti/cmd/ziti/cmd/agent_controller_raft_join.go index 970d423cb..7590ee10b 100644 --- a/ziti/cmd/ziti/cmd/agent_controller_raft_join.go +++ b/ziti/cmd/ziti/cmd/agent_controller_raft_join.go @@ -21,8 +21,8 @@ import ( "github.com/openziti/channel" "github.com/openziti/fabric/controller" "github.com/openziti/fabric/pb/mgmt_pb" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_controller_raft_list.go b/ziti/cmd/ziti/cmd/agent_controller_raft_list.go index effde7cf5..1b92841fa 100644 --- a/ziti/cmd/ziti/cmd/agent_controller_raft_list.go +++ b/ziti/cmd/ziti/cmd/agent_controller_raft_list.go @@ -21,8 +21,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/fabric/pb/mgmt_pb" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_router_add_route.go b/ziti/cmd/ziti/cmd/agent_router_add_route.go index 94d8fa60f..5277ae8b4 100644 --- a/ziti/cmd/ziti/cmd/agent_router_add_route.go +++ b/ziti/cmd/ziti/cmd/agent_router_add_route.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/proto" "github.com/openziti/fabric/pb/ctrl_pb" "github.com/openziti/fabric/router" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_router_forget_link.go b/ziti/cmd/ziti/cmd/agent_router_forget_link.go index 9be1ce539..3be92f2c8 100644 --- a/ziti/cmd/ziti/cmd/agent_router_forget_link.go +++ b/ziti/cmd/ziti/cmd/agent_router_forget_link.go @@ -21,8 +21,8 @@ import ( "github.com/openziti/channel" "github.com/openziti/fabric/pb/mgmt_pb" "github.com/openziti/fabric/router" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agent_simple.go b/ziti/cmd/ziti/cmd/agent_simple.go index 763bdffea..7aa4e20ad 100644 --- a/ziti/cmd/ziti/cmd/agent_simple.go +++ b/ziti/cmd/ziti/cmd/agent_simple.go @@ -17,7 +17,7 @@ package cmd import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent.go b/ziti/cmd/ziti/cmd/agentcli/agent.go index da9955e3d..06000d0ff 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent.go @@ -2,8 +2,8 @@ package agentcli import ( "github.com/openziti/channel" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_clear_channel_log_level.go b/ziti/cmd/ziti/cmd/agentcli/agent_clear_channel_log_level.go index 49d6bb9c7..33a433bfa 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_clear_channel_log_level.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_clear_channel_log_level.go @@ -19,7 +19,7 @@ package agentcli import ( "bytes" "encoding/binary" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_gc.go b/ziti/cmd/ziti/cmd/agentcli/agent_gc.go index 4e512615f..4c3bc4d51 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_gc.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_gc.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_go_version_action.go b/ziti/cmd/ziti/cmd/agentcli/agent_go_version_action.go index 9db58d51e..46a18e16c 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_go_version_action.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_go_version_action.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_memstats.go b/ziti/cmd/ziti/cmd/agentcli/agent_memstats.go index 44af829f2..7a0e8168f 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_memstats.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_memstats.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_pprof_cpu.go b/ziti/cmd/ziti/cmd/agentcli/agent_pprof_cpu.go index 8d0e16bf4..23519c3fb 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_pprof_cpu.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_pprof_cpu.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_pprof_heap.go b/ziti/cmd/ziti/cmd/agentcli/agent_pprof_heap.go index db5234a4b..79a817a2f 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_pprof_heap.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_pprof_heap.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_set_channel_log_level.go b/ziti/cmd/ziti/cmd/agentcli/agent_set_channel_log_level.go index 0a8c63f01..9b44f896c 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_set_channel_log_level.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_set_channel_log_level.go @@ -19,7 +19,7 @@ package agentcli import ( "bytes" "encoding/binary" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/pkg/errors" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_set_log_level.go b/ziti/cmd/ziti/cmd/agentcli/agent_set_log_level.go index 7652daf69..d9148b3e4 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_set_log_level.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_set_log_level.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/pkg/errors" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_setgc.go b/ziti/cmd/ziti/cmd/agentcli/agent_setgc.go index 7adda9d4f..513571a6a 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_setgc.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_setgc.go @@ -18,7 +18,7 @@ package agentcli import ( "encoding/binary" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_stack.go b/ziti/cmd/ziti/cmd/agentcli/agent_stack.go index c38804dba..81e584df5 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_stack.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_stack.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_stats.go b/ziti/cmd/ziti/cmd/agentcli/agent_stats.go index 07976b647..9f68d56a3 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_stats.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_stats.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/agentcli/agent_trace.go b/ziti/cmd/ziti/cmd/agentcli/agent_trace.go index 1c9c6de7f..1e5bf7031 100644 --- a/ziti/cmd/ziti/cmd/agentcli/agent_trace.go +++ b/ziti/cmd/ziti/cmd/agentcli/agent_trace.go @@ -17,7 +17,7 @@ package agentcli import ( - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/api/list.go b/ziti/cmd/ziti/cmd/api/list.go index fc9ac0f7a..58987d2dc 100644 --- a/ziti/cmd/ziti/cmd/api/list.go +++ b/ziti/cmd/ziti/cmd/api/list.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/Jeffail/gabs" "github.com/jedib0t/go-pretty/v6/table" - "github.com/openziti/foundation/util/errorz" + "github.com/openziti/foundation/v2/errorz" "github.com/openziti/ziti/ziti/cmd/ziti/util" "github.com/pkg/errors" "io" diff --git a/ziti/cmd/ziti/cmd/api/ws.go b/ziti/cmd/ziti/cmd/api/ws.go index cb8c7be7f..2e56c1ec2 100644 --- a/ziti/cmd/ziti/cmd/api/ws.go +++ b/ziti/cmd/ziti/cmd/api/ws.go @@ -22,7 +22,7 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/websockets" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/ziti/util" "io" "net/http" diff --git a/ziti/cmd/ziti/cmd/demo/echo_server.go b/ziti/cmd/ziti/cmd/demo/echo_server.go index 3bfc26c77..6bf79da4c 100644 --- a/ziti/cmd/ziti/cmd/demo/echo_server.go +++ b/ziti/cmd/ziti/cmd/demo/echo_server.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" - "github.com/openziti/foundation/agent" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/agent" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/edge" diff --git a/ziti/cmd/ziti/cmd/demo/echo_server_update_terminator.go b/ziti/cmd/ziti/cmd/demo/echo_server_update_terminator.go index 157a9fd15..7023f5927 100644 --- a/ziti/cmd/ziti/cmd/demo/echo_server_update_terminator.go +++ b/ziti/cmd/ziti/cmd/demo/echo_server_update_terminator.go @@ -19,7 +19,7 @@ package demo import ( "fmt" "github.com/openziti/channel" - "github.com/openziti/foundation/agent" + "github.com/openziti/agent" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/agentcli" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/demo/zcat.go b/ziti/cmd/ziti/cmd/demo/zcat.go index 0681674b3..8715cb181 100644 --- a/ziti/cmd/ziti/cmd/demo/zcat.go +++ b/ziti/cmd/ziti/cmd/demo/zcat.go @@ -18,7 +18,7 @@ package demo import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/v2/info" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/sirupsen/logrus" diff --git a/ziti/cmd/ziti/cmd/edge/create_authenticator_updb.go b/ziti/cmd/ziti/cmd/edge/create_authenticator_updb.go index 78a4493a5..3b5894ab9 100644 --- a/ziti/cmd/ziti/cmd/edge/create_authenticator_updb.go +++ b/ziti/cmd/ziti/cmd/edge/create_authenticator_updb.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/Jeffail/gabs" "github.com/openziti/edge/rest_management_api_client/authenticator" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" "github.com/openziti/ziti/ziti/cmd/ziti/util" diff --git a/ziti/cmd/ziti/cmd/edge/create_terminator.go b/ziti/cmd/ziti/cmd/edge/create_terminator.go index d5362b1ab..7a1a610a1 100644 --- a/ziti/cmd/ziti/cmd/edge/create_terminator.go +++ b/ziti/cmd/ziti/cmd/edge/create_terminator.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/Jeffail/gabs" "github.com/openziti/edge/router/xgress_edge_transport" - "github.com/openziti/foundation/util/stringz" + "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/edge/list.go b/ziti/cmd/ziti/cmd/edge/list.go index 30ee47b79..a55d3149e 100644 --- a/ziti/cmd/ziti/cmd/edge/list.go +++ b/ziti/cmd/ziti/cmd/edge/list.go @@ -30,7 +30,7 @@ import ( "github.com/Jeffail/gabs" "github.com/openziti/edge/rest_management_api_client/certificate_authority" "github.com/openziti/edge/rest_model" - "github.com/openziti/foundation/util/errorz" + "github.com/openziti/foundation/v2/errorz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/edge/login.go b/ziti/cmd/ziti/cmd/edge/login.go index 9956b448f..0a9902678 100644 --- a/ziti/cmd/ziti/cmd/edge/login.go +++ b/ziti/cmd/ziti/cmd/edge/login.go @@ -19,7 +19,7 @@ package edge import ( "fmt" "github.com/Jeffail/gabs" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/edge/update_authenticator_updb.go b/ziti/cmd/ziti/cmd/edge/update_authenticator_updb.go index 4b71d05d2..60ea8f008 100644 --- a/ziti/cmd/ziti/cmd/edge/update_authenticator_updb.go +++ b/ziti/cmd/ziti/cmd/edge/update_authenticator_updb.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/Jeffail/gabs" "github.com/openziti/edge/rest_management_api_client/authenticator" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/util" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/edge/update_terminator.go b/ziti/cmd/ziti/cmd/edge/update_terminator.go index 0d0f9dc76..11ef41eed 100644 --- a/ziti/cmd/ziti/cmd/edge/update_terminator.go +++ b/ziti/cmd/ziti/cmd/edge/update_terminator.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" "github.com/Jeffail/gabs" - "github.com/openziti/foundation/util/stringz" + "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/edge/verify_ca.go b/ziti/cmd/ziti/cmd/edge/verify_ca.go index 37eb79ac9..505a17003 100644 --- a/ziti/cmd/ziti/cmd/edge/verify_ca.go +++ b/ziti/cmd/ziti/cmd/edge/verify_ca.go @@ -26,8 +26,8 @@ import ( "encoding/pem" "errors" "fmt" - nfpem "github.com/openziti/foundation/util/pem" - "github.com/openziti/foundation/util/term" + nfpem "github.com/openziti/foundation/v2/pem" + "github.com/openziti/foundation/v2/term" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/fabric/create_router.go b/ziti/cmd/ziti/cmd/fabric/create_router.go index 786e08739..c4a49feb2 100644 --- a/ziti/cmd/ziti/cmd/fabric/create_router.go +++ b/ziti/cmd/ziti/cmd/fabric/create_router.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/Jeffail/gabs" - "github.com/openziti/foundation/identity/certtools" + "github.com/openziti/identity/certtools" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" "github.com/spf13/cobra" diff --git a/ziti/cmd/ziti/cmd/fabric/create_terminator.go b/ziti/cmd/ziti/cmd/fabric/create_terminator.go index f42478626..704b2ed7d 100644 --- a/ziti/cmd/ziti/cmd/fabric/create_terminator.go +++ b/ziti/cmd/ziti/cmd/fabric/create_terminator.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/Jeffail/gabs" "github.com/openziti/edge/router/xgress_edge_transport" - "github.com/openziti/foundation/util/stringz" + "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/fabric/inspect.go b/ziti/cmd/ziti/cmd/fabric/inspect.go index 3e87394f6..2ae7cef49 100644 --- a/ziti/cmd/ziti/cmd/fabric/inspect.go +++ b/ziti/cmd/ziti/cmd/fabric/inspect.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/openziti/fabric/rest_client/inspect" "github.com/openziti/fabric/rest_model" - "github.com/openziti/foundation/util/stringz" + "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" "github.com/openziti/ziti/ziti/cmd/ziti/util" diff --git a/ziti/cmd/ziti/cmd/fabric/update_terminator.go b/ziti/cmd/ziti/cmd/fabric/update_terminator.go index a38c1a50c..84ad1b14d 100644 --- a/ziti/cmd/ziti/cmd/fabric/update_terminator.go +++ b/ziti/cmd/ziti/cmd/fabric/update_terminator.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" "github.com/Jeffail/gabs" - "github.com/openziti/foundation/util/stringz" + "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/ziti/cmd/helpers" diff --git a/ziti/cmd/ziti/cmd/tutorial/actions/select_edge_router.go b/ziti/cmd/ziti/cmd/tutorial/actions/select_edge_router.go index 96b583425..11e4e8f22 100644 --- a/ziti/cmd/ziti/cmd/tutorial/actions/select_edge_router.go +++ b/ziti/cmd/ziti/cmd/tutorial/actions/select_edge_router.go @@ -18,7 +18,7 @@ package actions import ( "fmt" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/edge" "github.com/openziti/ziti/ziti/cmd/ziti/tutorial" "github.com/pkg/errors" diff --git a/ziti/cmd/ziti/cmd/unwrap_identity.go b/ziti/cmd/ziti/cmd/unwrap_identity.go index 7a39c049d..2917a9c74 100644 --- a/ziti/cmd/ziti/cmd/unwrap_identity.go +++ b/ziti/cmd/ziti/cmd/unwrap_identity.go @@ -3,7 +3,7 @@ package cmd import ( "encoding/json" "fmt" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity" "github.com/spf13/cobra" "io" "io/ioutil" diff --git a/ziti/cmd/ziti/tutorial/exec.go b/ziti/cmd/ziti/tutorial/exec.go index fbaa5cb81..d6ec21732 100644 --- a/ziti/cmd/ziti/tutorial/exec.go +++ b/ziti/cmd/ziti/tutorial/exec.go @@ -3,7 +3,7 @@ package tutorial import ( "fmt" "github.com/fatih/color" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "io" "os" "os/exec" diff --git a/ziti/cmd/ziti/tutorial/runner.go b/ziti/cmd/ziti/tutorial/runner.go index 6290e4f41..d21633975 100644 --- a/ziti/cmd/ziti/tutorial/runner.go +++ b/ziti/cmd/ziti/tutorial/runner.go @@ -5,7 +5,7 @@ import ( "fmt" markdown "github.com/MichaelMure/go-term-markdown" "github.com/fatih/color" - "github.com/openziti/foundation/util/term" + "github.com/openziti/foundation/v2/term" "github.com/pkg/errors" "github.com/valyala/fasttemplate" "io" diff --git a/ziti/cmd/ziti/util/identities.go b/ziti/cmd/ziti/util/identities.go index 0e5f99e02..7011d54ce 100644 --- a/ziti/cmd/ziti/util/identities.go +++ b/ziti/cmd/ziti/util/identities.go @@ -8,7 +8,7 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/openziti/edge/rest_management_api_client" fabric_rest_client "github.com/openziti/fabric/rest_client" - "github.com/openziti/foundation/identity/identity" + "github.com/openziti/identity" "github.com/openziti/sdk-golang/ziti/constants" "github.com/openziti/ziti/ziti/cmd/ziti/cmd/common" "github.com/pkg/errors" diff --git a/ziti/pki/pki/pki.go b/ziti/pki/pki/pki.go index 3585c82c0..4b6143488 100644 --- a/ziti/pki/pki/pki.go +++ b/ziti/pki/pki/pki.go @@ -29,7 +29,7 @@ import ( "github.com/openziti/ziti/ziti/pki/certificate" "github.com/openziti/ziti/ziti/pki/store" - "github.com/openziti/foundation/identity/certtools" + "github.com/openziti/identity/certtools" ) const (