From c006d16a5b568cf88cca6d133c050512eedf8dce Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Sat, 12 Aug 2023 10:29:17 -0400 Subject: [PATCH 1/2] Update to use default identity type --- ziti/cmd/edge/create_identity.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/ziti/cmd/edge/create_identity.go b/ziti/cmd/edge/create_identity.go index 869a19d8e..e6a675b12 100644 --- a/ziti/cmd/edge/create_identity.go +++ b/ziti/cmd/edge/create_identity.go @@ -21,8 +21,6 @@ import ( "github.com/openziti/ziti/ziti/cmd/api" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" "github.com/pkg/errors" - "golang.org/x/text/cases" - "golang.org/x/text/language" "io" "math" "os" @@ -56,11 +54,7 @@ func newCreateIdentityCmd(out io.Writer, errOut io.Writer) *cobra.Command { } } - cmd := &cobra.Command{ - Use: "identity", - Short: "creates a new identity managed by the Ziti Edge Controller", - Long: "creates a new identity managed by the Ziti Edge Controller", - } + cmd := newCreateIdentityOfTypeCmd("identity", newOptions()) cmd.AddCommand(newCreateIdentityOfTypeCmd("device", newOptions())) cmd.AddCommand(newCreateIdentityOfTypeCmd("user", newOptions())) @@ -69,21 +63,26 @@ func newCreateIdentityCmd(out io.Writer, errOut io.Writer) *cobra.Command { return cmd } -func newCreateIdentityOfTypeCmd(idType string, options *createIdentityOptions) *cobra.Command { +func newCreateIdentityOfTypeCmd(name string, options *createIdentityOptions) *cobra.Command { cmd := &cobra.Command{ - Use: idType + " ", - Short: "creates a new " + idType + " identity managed by the Ziti Edge Controller", - Long: "creates a new " + idType + " identity managed by the Ziti Edge Controller", + Use: name + " ", + Short: "creates a new identity managed by the Ziti Edge Controller", + Long: "creates a new identity managed by the Ziti Edge Controller", Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { options.Cmd = cmd options.Args = args - err := runCreateIdentity(idType, options) + err := runCreateIdentity(options) cmdhelper.CheckErr(err) }, SuggestFor: []string{}, } + if name != "identity" { + cmd.Hidden = true + cmd.Deprecated = "this command is deprecated, specifying identity type is no longer required" + } + // allow interspersing positional args and flags cmd.Flags().SetInterspersed(true) cmd.Flags().BoolVarP(&options.isAdmin, "admin", "A", false, "Give the new identity admin privileges") @@ -103,11 +102,10 @@ func newCreateIdentityOfTypeCmd(idType string, options *createIdentityOptions) * return cmd } -func runCreateIdentity(idType string, o *createIdentityOptions) error { +func runCreateIdentity(o *createIdentityOptions) error { entityData := gabs.New() api.SetJSONValue(entityData, o.Args[0], "name") - idType = cases.Title(language.English).String(idType) - api.SetJSONValue(entityData, idType, "type") + api.SetJSONValue(entityData, "Default", "type") o.username = strings.TrimSpace(o.username) if o.username != "" { From ae0380399402099bf2f749bff963a28ecc7ea824 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 24 Aug 2023 00:25:37 -0400 Subject: [PATCH 2/2] Update for fabic/edge package changes --- CHANGELOG.md | 61 +++++++++++++++++++ go.mod | 24 ++++---- go.sum | 42 +++++++------ ziti/cmd/agentcli/agent.go | 2 +- ziti/cmd/agentcli/agent_cluster_add.go | 2 +- ziti/cmd/agentcli/agent_cluster_list.go | 2 +- ziti/cmd/agentcli/agent_cluster_remove.go | 2 +- .../agent_cluster_transfer_leadership.go | 2 +- .../agentcli/agent_controller_init_from_db.go | 2 +- ziti/cmd/agentcli/agent_router_add_route.go | 4 +- ziti/cmd/agentcli/agent_router_forget_link.go | 2 +- .../agent_router_toggle_ctrl_channel.go | 2 +- ziti/cmd/agentcli/agent_router_unroute.go | 4 +- ziti/cmd/create_config.go | 1 - ziti/cmd/fabric/inspect.go | 4 +- ziti/cmd/fabric/list.go | 14 ++--- ziti/cmd/fabric/raft.go | 2 +- ziti/cmd/fabric/root.go | 2 +- ziti/cmd/fabric/stream_events.go | 4 +- ziti/cmd/fabric/stream_toggle_pipe_traces.go | 2 +- ziti/cmd/fabric/stream_traces.go | 4 +- ziti/main.go | 2 +- ziti/util/identities.go | 2 +- ziti/util/rest.go | 2 +- zititest/go.mod | 22 +++---- zititest/go.sum | 42 +++++++------ .../terraform/ondemand_instance/main.tf | 4 ++ .../ziti-fabric-test/subcmd/loop3/metrics.go | 2 +- .../runlevel/5_operation/circuit_metrics.go | 4 +- .../runlevel/5_operation/client_metrics.go | 2 +- .../runlevel/5_operation/model_metrics.go | 4 +- 31 files changed, 169 insertions(+), 101 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59216931d..05c5894a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,64 @@ +# Release 0.30.2 + +## What's New + +* Identity type consolidation +* HTTP Connect Proxy support for control channel and links + +## Identity Type Consolidation + +Prior to this release there were four identity types: + +* User +* Service +* Device +* Router + +Of these four types, only Router has any functional purpose. Given that, the other three have been merged into +a single `Default` identity type. Since Router identities can only be created by the system, it's no longer +necesary to specify the identity type when creating identities. + +The identity type may still be provided, but a deprecation warning will be emitted. + +**Backwards Compatibility** + +Existing non-Router identities will be migrated to the `Default` identity type. If an identity type other +than `Default` is provided when creating an identity, it will be coerced to the `Default` type. Existing +code may have issues with the new identity type being returned. + + +## HTTP Connect Proxy support + +Routers may now specify a proxy configuation which will be used when establishing connections to controllers +and data links to other routers. At this point only HTTP Connect Proxies with no authentication required are +supported. + +Example router config: + +```yaml +proxy: + type: http + address: localhost:3128 + +``` + +## Component Updates and Bug Fixes + +* github.com/openziti/channel/v2: [v2.0.91 -> v2.0.92](https://github.com/openziti/channel/compare/v2.0.91...v2.0.92) +* github.com/openziti/edge: [v0.24.381 -> v0.24.387](https://github.com/openziti/edge/compare/v0.24.381...v0.24.387) + * [Issue #1428](https://github.com/openziti/edge/issues/1428) - Make identity type optional. Consolidate User/Service/Device to 'Default'. + * [Issue #1584](https://github.com/openziti/edge/issues/1584) - AuthPolicyDetail is incompatible with API response + +* github.com/openziti/edge-api: [v0.25.31 -> v0.25.33](https://github.com/openziti/edge-api/compare/v0.25.31...v0.25.33) +* github.com/openziti/fabric: [v0.24.2 -> v0.24.14](https://github.com/openziti/fabric/compare/v0.24.2...v0.24.14) + * [Issue #775](https://github.com/openziti/fabric/issues/775) - Add support for proxies for control channel and links + +* github.com/openziti/sdk-golang: [v0.20.90 -> v0.20.93](https://github.com/openziti/sdk-golang/compare/v0.20.90...v0.20.93) +* github.com/openziti/transport/v2: [v2.0.99 -> v2.0.100](https://github.com/openziti/transport/compare/v2.0.99...v2.0.100) + * [Issue #54](https://github.com/openziti/transport/issues/54) - Support HTTP Connect proxying for TLS connections + +* github.com/openziti/ziti: [v0.30.1 -> v0.30.2](https://github.com/openziti/ziti/compare/v0.30.1...v0.30.2) + # Release 0.30.1 ## What's New diff --git a/go.mod b/go.mod index 01c73c05f..b6d2ad25a 100644 --- a/go.mod +++ b/go.mod @@ -17,16 +17,16 @@ require ( github.com/jedib0t/go-pretty/v6 v6.4.0 github.com/michaelquigley/pfxlog v0.6.10 github.com/openziti/agent v1.0.15 - github.com/openziti/channel/v2 v2.0.91 - github.com/openziti/edge v0.24.381 - github.com/openziti/edge-api v0.25.31 - github.com/openziti/fabric v0.24.2 + github.com/openziti/channel/v2 v2.0.92 + github.com/openziti/edge v0.24.387 + github.com/openziti/edge-api v0.25.33 + github.com/openziti/fabric v0.24.14 github.com/openziti/foundation/v2 v2.0.29 github.com/openziti/identity v1.0.60 github.com/openziti/runzmd v1.0.29 - github.com/openziti/sdk-golang v0.20.90 + github.com/openziti/sdk-golang v0.20.93 github.com/openziti/storage v0.2.12 - github.com/openziti/transport/v2 v2.0.99 + github.com/openziti/transport/v2 v2.0.100 github.com/openziti/xweb/v2 v2.1.0 github.com/openziti/ziti-db-explorer v1.1.3 github.com/pkg/errors v0.9.1 @@ -39,7 +39,6 @@ require ( github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.7 golang.org/x/net v0.14.0 - golang.org/x/text v0.12.0 google.golang.org/protobuf v1.31.0 gopkg.in/AlecAivazis/survey.v1 v1.8.7 gopkg.in/resty.v1 v1.12.0 @@ -76,7 +75,7 @@ require ( github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.4 // indirect github.com/go-openapi/jsonpointer v0.20.0 // indirect @@ -89,7 +88,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/schema v1.2.0 // indirect @@ -171,14 +170,15 @@ require ( go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/image v0.11.0 // indirect - golang.org/x/mod v0.11.0 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/term v0.11.0 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/text v0.12.0 // indirect + golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect diff --git a/go.sum b/go.sum index a8edee572..7d45dcbf6 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,9 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= @@ -418,8 +419,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -705,16 +706,16 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/agent v1.0.15 h1:NW4egpS3Mw1RQBZWfUEvrmBh9kn/SU/dU5fndsyyhZ4= github.com/openziti/agent v1.0.15/go.mod h1:zfm53+PVWoGFzjGGgQdKby5749G6VRYHe+eQJmoVKy4= -github.com/openziti/channel/v2 v2.0.91 h1:HKD7uniGOfiQfbzaP1AJ0JGvls7oejC+fMj6gLJOlW8= -github.com/openziti/channel/v2 v2.0.91/go.mod h1:2uJzEV3pX4soPPl07l8ScONNGuSQTQzUqAYkgATA3Rk= +github.com/openziti/channel/v2 v2.0.92 h1:dKrVy3SYgMcea977lW/So2zvDoFrWfrMi4YSlvjr1LE= +github.com/openziti/channel/v2 v2.0.92/go.mod h1:2g704N/sfNzf9kcbPyUOZOFrpCHaWxQi0d8rVgXHeKE= 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.24.381 h1:8Uklh0w9+EFMhBkzDC7kFm0c09NAZbUHuLuWZekZY0M= -github.com/openziti/edge v0.24.381/go.mod h1:sFJbZLfBU2kFsc70LkzUW4eizZye9ejVMOtu8iI8pq8= -github.com/openziti/edge-api v0.25.31 h1:KiM4pQVIqy/0CN/FW2AgoN7PcejB+y8FdgjN86Jn83Q= -github.com/openziti/edge-api v0.25.31/go.mod h1:7fyXLqNcyC5IG29GuI8danhhppAaxRV6HiCLwN1Kk64= -github.com/openziti/fabric v0.24.2 h1:fb7fE/d3it6OrwhJqfr0RKQ41VUV9VKFsOOl98zdoRY= -github.com/openziti/fabric v0.24.2/go.mod h1:rXhb73v5rgoUV1AbRDXF8gAcbualabJU9YyLMkiB0yw= +github.com/openziti/edge v0.24.387 h1:EJ3cqiDLFc+9LU4S/CW6FuYOJX2VVBAOjPn0tdJ91VY= +github.com/openziti/edge v0.24.387/go.mod h1:fUzXeYKOe6Je/3qeoXsWSWs6r1q7IYmezBpZKs79kXU= +github.com/openziti/edge-api v0.25.33 h1:5XaQvUKeG8ZZ3WLhr/8xqZn56p53ZxWmFooR6I/xrvQ= +github.com/openziti/edge-api v0.25.33/go.mod h1:T+g7OHoj2KQi3SrSdgbbFoQdknLrehEIlZRGxpTYObI= +github.com/openziti/fabric v0.24.14 h1:kZKmPt4n5IlAfZVG4I31Dkt2SR8+u1OFngsN8fz1xxU= +github.com/openziti/fabric v0.24.14/go.mod h1:BNWokYd8w6bMXq40TvR3yLM5rbYnY219kify9Q4wgww= github.com/openziti/foundation/v2 v2.0.29 h1:E63p5/esqOJ/OSMePR3fKYHb3Wq2BR4PLkDFynESij8= github.com/openziti/foundation/v2 v2.0.29/go.mod h1:MpXSCSn4MABvtIXzfTBFqhK5pNsNXHWnR8xxVrfxn0g= github.com/openziti/identity v1.0.60 h1:6gvBXY9J6F7SbuksdxsUA1t1WmtsFfY61Oqm/00ijGU= @@ -725,14 +726,14 @@ github.com/openziti/metrics v1.2.31 h1:nEO9FAqCnpfuvxGYfy9/W46p2SaEcZ6vlRyz4fcip github.com/openziti/metrics v1.2.31/go.mod h1:SU2w3WW36O+ocVy+ka2UHA0cweTg3T8CQiqz4ZT4Umc= github.com/openziti/runzmd v1.0.29 h1:skS9Ea8TIYZ28V4yEz3KoWafnto4RAOwv8M2Z4bM8Wo= github.com/openziti/runzmd v1.0.29/go.mod h1:rAvUIRGlIWYsHtWRX7lbV8LZPUjsifjZd72xUEfEuTw= -github.com/openziti/sdk-golang v0.20.90 h1:QXWa1Ti1Sky9D2uv3kAxmybwicZLJH6hgyDpXkdZcYc= -github.com/openziti/sdk-golang v0.20.90/go.mod h1:IorK7wik0unGAGBuYjdb9ZPFX7ENACtxFpWuTBPOT9Q= +github.com/openziti/sdk-golang v0.20.93 h1:8PZ1eFhEapfjNHN7EPWzoZuF9UBywrw7xLhuvI4Yv0I= +github.com/openziti/sdk-golang v0.20.93/go.mod h1:bDZlSB4ZSUEsSWJZU9pTjO1t/5TSGajon3659M9WbrM= github.com/openziti/secretstream v0.1.10 h1:aLheoP6vVAv96mItwkXxWr9Ym0tTooJ5o9H1j2fAh04= github.com/openziti/secretstream v0.1.10/go.mod h1:HrS6P9G0jjHNHuKESMaybNdxBHjD1b0SzxSi0rDzshY= github.com/openziti/storage v0.2.12 h1:ghQkt3SCLwRuiTeRLOUWgNL69XQNp9Gx8K3eVw0QTQY= github.com/openziti/storage v0.2.12/go.mod h1:RxWIe9FyQg9LZQFZ4FuUROf0lhnfUW2XeWfTbHAMGeY= -github.com/openziti/transport/v2 v2.0.99 h1:+/DYNzaUrzSSaoKEBNFumXJsXMDEUNiWbWZfX48Z2vc= -github.com/openziti/transport/v2 v2.0.99/go.mod h1:bV9XKtxnmqW8crReZB2z+cJhSNLl6EsyoouTkyUY8mk= +github.com/openziti/transport/v2 v2.0.100 h1:RAJoquVuHATdLp4aA9zIxp5IbGbr4VROAymB7ZviuHM= +github.com/openziti/transport/v2 v2.0.100/go.mod h1:TJ40/WVvFGYlrKoJd4euK38Ay5wQ0rkiR1OxQ0IYLxI= 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.1.0 h1:Xhh3C2pZkq/Prr65V+SfFSibLDYteoc4f62KQCcTZF4= @@ -1055,8 +1056,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1089,8 +1090,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1361,8 +1362,9 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/ziti/cmd/agentcli/agent.go b/ziti/cmd/agentcli/agent.go index 5db2a301d..6b84f31cb 100644 --- a/ziti/cmd/agentcli/agent.go +++ b/ziti/cmd/agentcli/agent.go @@ -12,7 +12,7 @@ import ( "github.com/openziti/channel/v2" "github.com/openziti/edge/router/debugops" "github.com/openziti/fabric/controller" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router" "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/common" diff --git a/ziti/cmd/agentcli/agent_cluster_add.go b/ziti/cmd/agentcli/agent_cluster_add.go index ff363aebc..d1fd0a0fc 100644 --- a/ziti/cmd/agentcli/agent_cluster_add.go +++ b/ziti/cmd/agentcli/agent_cluster_add.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/openziti/channel/v2" "github.com/openziti/fabric/controller" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/agentcli/agent_cluster_list.go b/ziti/cmd/agentcli/agent_cluster_list.go index f186420e1..16c694f3e 100644 --- a/ziti/cmd/agentcli/agent_cluster_list.go +++ b/ziti/cmd/agentcli/agent_cluster_list.go @@ -22,7 +22,7 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" "github.com/spf13/cobra" diff --git a/ziti/cmd/agentcli/agent_cluster_remove.go b/ziti/cmd/agentcli/agent_cluster_remove.go index cc7a55419..3b871d611 100644 --- a/ziti/cmd/agentcli/agent_cluster_remove.go +++ b/ziti/cmd/agentcli/agent_cluster_remove.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/openziti/channel/v2" "github.com/openziti/fabric/controller" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/agentcli/agent_cluster_transfer_leadership.go b/ziti/cmd/agentcli/agent_cluster_transfer_leadership.go index ae3531b3f..0705bc470 100644 --- a/ziti/cmd/agentcli/agent_cluster_transfer_leadership.go +++ b/ziti/cmd/agentcli/agent_cluster_transfer_leadership.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/openziti/channel/v2" "github.com/openziti/fabric/controller" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" "github.com/spf13/cobra" diff --git a/ziti/cmd/agentcli/agent_controller_init_from_db.go b/ziti/cmd/agentcli/agent_controller_init_from_db.go index 2ecc68dfc..c4ca96a5a 100644 --- a/ziti/cmd/agentcli/agent_controller_init_from_db.go +++ b/ziti/cmd/agentcli/agent_controller_init_from_db.go @@ -19,7 +19,7 @@ package agentcli import ( "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/common" "github.com/spf13/cobra" ) diff --git a/ziti/cmd/agentcli/agent_router_add_route.go b/ziti/cmd/agentcli/agent_router_add_route.go index d88bcc11f..ce546a1d8 100644 --- a/ziti/cmd/agentcli/agent_router_add_route.go +++ b/ziti/cmd/agentcli/agent_router_add_route.go @@ -19,8 +19,8 @@ package agentcli import ( "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/ctrl_pb" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/ctrl_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router" "github.com/openziti/ziti/ziti/cmd/common" "github.com/spf13/cobra" diff --git a/ziti/cmd/agentcli/agent_router_forget_link.go b/ziti/cmd/agentcli/agent_router_forget_link.go index e4cab0e1e..eb24923db 100644 --- a/ziti/cmd/agentcli/agent_router_forget_link.go +++ b/ziti/cmd/agentcli/agent_router_forget_link.go @@ -19,7 +19,7 @@ package agentcli import ( "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" diff --git a/ziti/cmd/agentcli/agent_router_toggle_ctrl_channel.go b/ziti/cmd/agentcli/agent_router_toggle_ctrl_channel.go index 57870f6a4..0f487b9b3 100644 --- a/ziti/cmd/agentcli/agent_router_toggle_ctrl_channel.go +++ b/ziti/cmd/agentcli/agent_router_toggle_ctrl_channel.go @@ -19,7 +19,7 @@ package agentcli import ( "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" diff --git a/ziti/cmd/agentcli/agent_router_unroute.go b/ziti/cmd/agentcli/agent_router_unroute.go index 777ec5b3b..b82dd476e 100644 --- a/ziti/cmd/agentcli/agent_router_unroute.go +++ b/ziti/cmd/agentcli/agent_router_unroute.go @@ -19,8 +19,8 @@ package agentcli import ( "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/pb/ctrl_pb" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/ctrl_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router" "github.com/openziti/ziti/ziti/cmd/common" "github.com/spf13/cobra" diff --git a/ziti/cmd/create_config.go b/ziti/cmd/create_config.go index 51048870f..02077bc8b 100644 --- a/ziti/cmd/create_config.go +++ b/ziti/cmd/create_config.go @@ -305,7 +305,6 @@ func (data *ConfigTemplateValues) populateConfigValues() { data.Router.Wss.ReadBufferSize = foundation.DefaultWsReadBufferSize data.Router.Wss.WriteBufferSize = foundation.DefaultWsWriteBufferSize data.Router.Wss.EnableCompression = foundation.DefaultWsEnableCompression - data.Router.Forwarder.LatencyProbeInterval = fabForwarder.DefaultLatencyProbeInterval data.Router.Forwarder.XgressDialQueueLength = fabForwarder.DefaultXgressDialWorkerQueueLength data.Router.Forwarder.XgressDialWorkerCount = fabForwarder.DefaultXgressDialWorkerCount data.Router.Forwarder.LinkDialQueueLength = fabForwarder.DefaultLinkDialQueueLength diff --git a/ziti/cmd/fabric/inspect.go b/ziti/cmd/fabric/inspect.go index 3923b4c6a..8dc8e8955 100644 --- a/ziti/cmd/fabric/inspect.go +++ b/ziti/cmd/fabric/inspect.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" "github.com/fatih/color" - "github.com/openziti/fabric/rest_client/inspect" - "github.com/openziti/fabric/rest_model" + "github.com/openziti/fabric/controller/rest_client/inspect" + "github.com/openziti/fabric/controller/rest_model" "github.com/openziti/foundation/v2/errorz" "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/api" diff --git a/ziti/cmd/fabric/list.go b/ziti/cmd/fabric/list.go index b6cfbd0fc..f00ce2c58 100644 --- a/ziti/cmd/fabric/list.go +++ b/ziti/cmd/fabric/list.go @@ -18,13 +18,13 @@ package fabric import ( "fmt" - fabric_rest_client "github.com/openziti/fabric/rest_client" - "github.com/openziti/fabric/rest_client/circuit" - "github.com/openziti/fabric/rest_client/link" - "github.com/openziti/fabric/rest_client/router" - "github.com/openziti/fabric/rest_client/service" - "github.com/openziti/fabric/rest_client/terminator" - "github.com/openziti/fabric/rest_model" + fabric_rest_client "github.com/openziti/fabric/controller/rest_client" + "github.com/openziti/fabric/controller/rest_client/circuit" + "github.com/openziti/fabric/controller/rest_client/link" + "github.com/openziti/fabric/controller/rest_client/router" + "github.com/openziti/fabric/controller/rest_client/service" + "github.com/openziti/fabric/controller/rest_client/terminator" + "github.com/openziti/fabric/controller/rest_model" "github.com/openziti/foundation/v2/stringz" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" diff --git a/ziti/cmd/fabric/raft.go b/ziti/cmd/fabric/raft.go index 548634c2b..7defc57d2 100644 --- a/ziti/cmd/fabric/raft.go +++ b/ziti/cmd/fabric/raft.go @@ -4,7 +4,7 @@ import ( "context" "github.com/jedib0t/go-pretty/v6/table" - "github.com/openziti/fabric/rest_client/raft" + "github.com/openziti/fabric/controller/rest_client/raft" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" diff --git a/ziti/cmd/fabric/root.go b/ziti/cmd/fabric/root.go index 16a6dfaa3..21593eb9f 100644 --- a/ziti/cmd/fabric/root.go +++ b/ziti/cmd/fabric/root.go @@ -18,7 +18,7 @@ package fabric import ( "github.com/Jeffail/gabs" - fabric_rest_client "github.com/openziti/fabric/rest_client" + fabric_rest_client "github.com/openziti/fabric/controller/rest_client" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" diff --git a/ziti/cmd/fabric/stream_events.go b/ziti/cmd/fabric/stream_events.go index d0eb76ec1..bc21b24db 100644 --- a/ziti/cmd/fabric/stream_events.go +++ b/ziti/cmd/fabric/stream_events.go @@ -20,8 +20,8 @@ import ( "encoding/json" "fmt" "github.com/openziti/channel/v2" - "github.com/openziti/fabric/event" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/controller/event" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" "github.com/pkg/errors" diff --git a/ziti/cmd/fabric/stream_toggle_pipe_traces.go b/ziti/cmd/fabric/stream_toggle_pipe_traces.go index 7113bee60..4fc07a01a 100644 --- a/ziti/cmd/fabric/stream_toggle_pipe_traces.go +++ b/ziti/cmd/fabric/stream_toggle_pipe_traces.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/openziti/channel/v2" "github.com/openziti/channel/v2/trace/pb" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" "github.com/spf13/cobra" diff --git a/ziti/cmd/fabric/stream_traces.go b/ziti/cmd/fabric/stream_traces.go index f6cc40134..eb4cc24ed 100644 --- a/ziti/cmd/fabric/stream_traces.go +++ b/ziti/cmd/fabric/stream_traces.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/openziti/channel/v2" "github.com/openziti/channel/v2/trace/pb" - "github.com/openziti/fabric/pb/ctrl_pb" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/ctrl_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/fabric/router/xgress" "github.com/openziti/ziti/ziti/cmd/api" "github.com/openziti/ziti/ziti/cmd/common" diff --git a/ziti/main.go b/ziti/main.go index b49542760..5719051d8 100644 --- a/ziti/main.go +++ b/ziti/main.go @@ -18,7 +18,7 @@ package main import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/fabric/build" + "github.com/openziti/fabric/common/build" "github.com/openziti/transport/v2" "github.com/openziti/transport/v2/tcp" "github.com/openziti/transport/v2/tls" diff --git a/ziti/util/identities.go b/ziti/util/identities.go index 22d233359..a9c1dc6a1 100644 --- a/ziti/util/identities.go +++ b/ziti/util/identities.go @@ -8,7 +8,7 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/openziti/edge-api/rest_management_api_client" "github.com/openziti/edge/controller/env" - fabric_rest_client "github.com/openziti/fabric/rest_client" + fabric_rest_client "github.com/openziti/fabric/controller/rest_client" "github.com/openziti/identity" "github.com/openziti/ziti/ziti/cmd/common" "github.com/pkg/errors" diff --git a/ziti/util/rest.go b/ziti/util/rest.go index d638a18bb..ac694155e 100644 --- a/ziti/util/rest.go +++ b/ziti/util/rest.go @@ -28,7 +28,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/openziti/edge-api/rest_management_api_client" "github.com/openziti/edge-api/rest_model" - fabric_rest_client "github.com/openziti/fabric/rest_client" + fabric_rest_client "github.com/openziti/fabric/controller/rest_client" "github.com/openziti/ziti/common/version" cmdhelper "github.com/openziti/ziti/ziti/cmd/helpers" c "github.com/openziti/ziti/ziti/constants" diff --git a/zititest/go.mod b/zititest/go.mod index 0b7312e15..d3cf12f42 100644 --- a/zititest/go.mod +++ b/zititest/go.mod @@ -8,18 +8,18 @@ require ( github.com/Jeffail/gabs v1.4.0 github.com/Jeffail/gabs/v2 v2.7.0 github.com/google/go-cmp v0.5.9 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.3.1 github.com/michaelquigley/pfxlog v0.6.10 github.com/openziti/agent v1.0.15 - github.com/openziti/channel/v2 v2.0.91 - github.com/openziti/edge v0.24.381 + github.com/openziti/channel/v2 v2.0.92 + github.com/openziti/edge v0.24.387 github.com/openziti/fablab v0.5.5 - github.com/openziti/fabric v0.24.2 + github.com/openziti/fabric v0.24.14 github.com/openziti/foundation/v2 v2.0.29 github.com/openziti/identity v1.0.60 - github.com/openziti/sdk-golang v0.20.90 + github.com/openziti/sdk-golang v0.20.93 github.com/openziti/storage v0.2.12 - github.com/openziti/transport/v2 v2.0.99 + github.com/openziti/transport/v2 v2.0.100 github.com/openziti/ziti v0.28.3 github.com/pkg/errors v0.9.1 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 @@ -65,7 +65,7 @@ require ( github.com/go-acme/lego/v4 v4.2.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.4 // indirect github.com/go-openapi/jsonpointer v0.20.0 // indirect @@ -130,7 +130,7 @@ require ( github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openziti/dilithium v0.3.3 // indirect - github.com/openziti/edge-api v0.25.31 // indirect + github.com/openziti/edge-api v0.25.33 // indirect github.com/openziti/jwks v1.0.3 // indirect github.com/openziti/metrics v1.2.31 // indirect github.com/openziti/runzmd v1.0.29 // indirect @@ -176,15 +176,15 @@ require ( go.opentelemetry.io/otel/metric v1.16.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect + golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect golang.org/x/image v0.11.0 // indirect - golang.org/x/mod v0.11.0 // indirect + golang.org/x/mod v0.12.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/term v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/AlecAivazis/survey.v1 v1.8.7 // indirect gopkg.in/ini.v1 v1.66.2 // indirect diff --git a/zititest/go.sum b/zititest/go.sum index 58153ad3a..70dd2b1c1 100644 --- a/zititest/go.sum +++ b/zititest/go.sum @@ -249,8 +249,9 @@ github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= github.com/go-openapi/analysis v0.21.4 h1:ZDFLvSNxpDaomuCueM0BlSXxpANBlFYiBvr+GXrvIHc= github.com/go-openapi/analysis v0.21.4/go.mod h1:4zQ35W4neeZTqh3ol0rv/O8JBbka9QyAgQRPp9y3pfo= @@ -418,8 +419,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -717,18 +718,18 @@ github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/openziti/agent v1.0.15 h1:NW4egpS3Mw1RQBZWfUEvrmBh9kn/SU/dU5fndsyyhZ4= github.com/openziti/agent v1.0.15/go.mod h1:zfm53+PVWoGFzjGGgQdKby5749G6VRYHe+eQJmoVKy4= -github.com/openziti/channel/v2 v2.0.91 h1:HKD7uniGOfiQfbzaP1AJ0JGvls7oejC+fMj6gLJOlW8= -github.com/openziti/channel/v2 v2.0.91/go.mod h1:2uJzEV3pX4soPPl07l8ScONNGuSQTQzUqAYkgATA3Rk= +github.com/openziti/channel/v2 v2.0.92 h1:dKrVy3SYgMcea977lW/So2zvDoFrWfrMi4YSlvjr1LE= +github.com/openziti/channel/v2 v2.0.92/go.mod h1:2g704N/sfNzf9kcbPyUOZOFrpCHaWxQi0d8rVgXHeKE= 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.24.381 h1:8Uklh0w9+EFMhBkzDC7kFm0c09NAZbUHuLuWZekZY0M= -github.com/openziti/edge v0.24.381/go.mod h1:sFJbZLfBU2kFsc70LkzUW4eizZye9ejVMOtu8iI8pq8= -github.com/openziti/edge-api v0.25.31 h1:KiM4pQVIqy/0CN/FW2AgoN7PcejB+y8FdgjN86Jn83Q= -github.com/openziti/edge-api v0.25.31/go.mod h1:7fyXLqNcyC5IG29GuI8danhhppAaxRV6HiCLwN1Kk64= +github.com/openziti/edge v0.24.387 h1:EJ3cqiDLFc+9LU4S/CW6FuYOJX2VVBAOjPn0tdJ91VY= +github.com/openziti/edge v0.24.387/go.mod h1:fUzXeYKOe6Je/3qeoXsWSWs6r1q7IYmezBpZKs79kXU= +github.com/openziti/edge-api v0.25.33 h1:5XaQvUKeG8ZZ3WLhr/8xqZn56p53ZxWmFooR6I/xrvQ= +github.com/openziti/edge-api v0.25.33/go.mod h1:T+g7OHoj2KQi3SrSdgbbFoQdknLrehEIlZRGxpTYObI= github.com/openziti/fablab v0.5.5 h1:wz5rkuGhdDbmNPXC8XtsyHhWk6WJtxCgfhXt5XVWXmY= github.com/openziti/fablab v0.5.5/go.mod h1:xkvaXX6C+bGHH5R4G8/vkz1pbBlwS1EzghF37wcNetM= -github.com/openziti/fabric v0.24.2 h1:fb7fE/d3it6OrwhJqfr0RKQ41VUV9VKFsOOl98zdoRY= -github.com/openziti/fabric v0.24.2/go.mod h1:rXhb73v5rgoUV1AbRDXF8gAcbualabJU9YyLMkiB0yw= +github.com/openziti/fabric v0.24.14 h1:kZKmPt4n5IlAfZVG4I31Dkt2SR8+u1OFngsN8fz1xxU= +github.com/openziti/fabric v0.24.14/go.mod h1:BNWokYd8w6bMXq40TvR3yLM5rbYnY219kify9Q4wgww= github.com/openziti/foundation/v2 v2.0.29 h1:E63p5/esqOJ/OSMePR3fKYHb3Wq2BR4PLkDFynESij8= github.com/openziti/foundation/v2 v2.0.29/go.mod h1:MpXSCSn4MABvtIXzfTBFqhK5pNsNXHWnR8xxVrfxn0g= github.com/openziti/identity v1.0.60 h1:6gvBXY9J6F7SbuksdxsUA1t1WmtsFfY61Oqm/00ijGU= @@ -739,14 +740,14 @@ github.com/openziti/metrics v1.2.31 h1:nEO9FAqCnpfuvxGYfy9/W46p2SaEcZ6vlRyz4fcip github.com/openziti/metrics v1.2.31/go.mod h1:SU2w3WW36O+ocVy+ka2UHA0cweTg3T8CQiqz4ZT4Umc= github.com/openziti/runzmd v1.0.29 h1:skS9Ea8TIYZ28V4yEz3KoWafnto4RAOwv8M2Z4bM8Wo= github.com/openziti/runzmd v1.0.29/go.mod h1:rAvUIRGlIWYsHtWRX7lbV8LZPUjsifjZd72xUEfEuTw= -github.com/openziti/sdk-golang v0.20.90 h1:QXWa1Ti1Sky9D2uv3kAxmybwicZLJH6hgyDpXkdZcYc= -github.com/openziti/sdk-golang v0.20.90/go.mod h1:IorK7wik0unGAGBuYjdb9ZPFX7ENACtxFpWuTBPOT9Q= +github.com/openziti/sdk-golang v0.20.93 h1:8PZ1eFhEapfjNHN7EPWzoZuF9UBywrw7xLhuvI4Yv0I= +github.com/openziti/sdk-golang v0.20.93/go.mod h1:bDZlSB4ZSUEsSWJZU9pTjO1t/5TSGajon3659M9WbrM= github.com/openziti/secretstream v0.1.10 h1:aLheoP6vVAv96mItwkXxWr9Ym0tTooJ5o9H1j2fAh04= github.com/openziti/secretstream v0.1.10/go.mod h1:HrS6P9G0jjHNHuKESMaybNdxBHjD1b0SzxSi0rDzshY= github.com/openziti/storage v0.2.12 h1:ghQkt3SCLwRuiTeRLOUWgNL69XQNp9Gx8K3eVw0QTQY= github.com/openziti/storage v0.2.12/go.mod h1:RxWIe9FyQg9LZQFZ4FuUROf0lhnfUW2XeWfTbHAMGeY= -github.com/openziti/transport/v2 v2.0.99 h1:+/DYNzaUrzSSaoKEBNFumXJsXMDEUNiWbWZfX48Z2vc= -github.com/openziti/transport/v2 v2.0.99/go.mod h1:bV9XKtxnmqW8crReZB2z+cJhSNLl6EsyoouTkyUY8mk= +github.com/openziti/transport/v2 v2.0.100 h1:RAJoquVuHATdLp4aA9zIxp5IbGbr4VROAymB7ZviuHM= +github.com/openziti/transport/v2 v2.0.100/go.mod h1:TJ40/WVvFGYlrKoJd4euK38Ay5wQ0rkiR1OxQ0IYLxI= 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.1.0 h1:Xhh3C2pZkq/Prr65V+SfFSibLDYteoc4f62KQCcTZF4= @@ -1072,8 +1073,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 h1:EDuYyU/MkFXllv9QF9819VlI9a4tzGuCbhG0ExK9o1U= -golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ= +golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1106,8 +1107,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1380,8 +1381,9 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 h1:Vve/L0v7CXXuxUmaMGIEK/dEeq7uiqb5qBgQrZzIE7E= +golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/zititest/models/test_resources/terraform/ondemand_instance/main.tf b/zititest/models/test_resources/terraform/ondemand_instance/main.tf index c87424bd5..caeb33acc 100644 --- a/zititest/models/test_resources/terraform/ondemand_instance/main.tf +++ b/zititest/models/test_resources/terraform/ondemand_instance/main.tf @@ -41,5 +41,9 @@ resource "aws_instance" "fablab" { tags = { Name = var.name + cost_environment = "non-production" + cost_category = "CICD" + cost_team_owner = "ADVDEV" + source = "fablab" } } diff --git a/zititest/ziti-fabric-test/subcmd/loop3/metrics.go b/zititest/ziti-fabric-test/subcmd/loop3/metrics.go index b538fb48d..e41973051 100644 --- a/zititest/ziti-fabric-test/subcmd/loop3/metrics.go +++ b/zititest/ziti-fabric-test/subcmd/loop3/metrics.go @@ -3,7 +3,7 @@ package loop3 import ( "encoding/binary" "github.com/michaelquigley/pfxlog" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/sdk-golang/ziti" "github.com/pkg/errors" "github.com/rcrowley/go-metrics" diff --git a/zititest/zitilab/runlevel/5_operation/circuit_metrics.go b/zititest/zitilab/runlevel/5_operation/circuit_metrics.go index 93ed07568..653446e9b 100644 --- a/zititest/zitilab/runlevel/5_operation/circuit_metrics.go +++ b/zititest/zitilab/runlevel/5_operation/circuit_metrics.go @@ -7,8 +7,8 @@ import ( "github.com/openziti/channel/v2" "github.com/openziti/channel/v2/protobufs" "github.com/openziti/fablab/kernel/model" - "github.com/openziti/fabric/event" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/controller/event" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/api" "github.com/sirupsen/logrus" "time" diff --git a/zititest/zitilab/runlevel/5_operation/client_metrics.go b/zititest/zitilab/runlevel/5_operation/client_metrics.go index 9a482a4d7..2ab191e35 100644 --- a/zititest/zitilab/runlevel/5_operation/client_metrics.go +++ b/zititest/zitilab/runlevel/5_operation/client_metrics.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "github.com/michaelquigley/pfxlog" "github.com/openziti/fablab/kernel/model" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/sdk-golang/ziti" zitilib_actions "github.com/openziti/ziti/zititest/zitilab/actions" "github.com/openziti/ziti/zititest/zitilab/cli" diff --git a/zititest/zitilab/runlevel/5_operation/model_metrics.go b/zititest/zitilab/runlevel/5_operation/model_metrics.go index 55608842b..07d386499 100644 --- a/zititest/zitilab/runlevel/5_operation/model_metrics.go +++ b/zititest/zitilab/runlevel/5_operation/model_metrics.go @@ -20,8 +20,8 @@ import ( "encoding/json" "github.com/openziti/channel/v2" "github.com/openziti/fablab/kernel/model" - "github.com/openziti/fabric/event" - "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/controller/event" + "github.com/openziti/fabric/common/pb/mgmt_pb" "github.com/openziti/ziti/ziti/cmd/api" "github.com/sirupsen/logrus" "time"