diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b5098230..ac4fbe551 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ on: # cancel older, redundant runs of same workflow on same branch concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} + group: ${{ github.workflow }}-${{github.event_name}}-${{ github.head_ref || github.ref_name }} cancel-in-progress: true env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 59216931d..1eaaa10a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,88 @@ +# 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.95](https://github.com/openziti/channel/compare/v2.0.91...v2.0.95) +* github.com/openziti/edge: [v0.24.381 -> v0.24.401](https://github.com/openziti/edge/compare/v0.24.381...v0.24.401) + * [Issue #1597](https://github.com/openziti/edge/issues/1597) - ER/T cached API sessions aren't remembered when pulled from cache + * [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.20](https://github.com/openziti/fabric/compare/v0.24.2...v0.24.20) + * [Issue #775](https://github.com/openziti/fabric/issues/775) - Add support for proxies for control channel and links + +* github.com/openziti/foundation/v2: [v2.0.29 -> v2.0.30](https://github.com/openziti/foundation/compare/v2.0.29...v2.0.30) +* github.com/openziti/identity: [v1.0.60 -> v1.0.61](https://github.com/openziti/identity/compare/v1.0.60...v1.0.61) +* github.com/openziti/runzmd: [v1.0.29 -> v1.0.30](https://github.com/openziti/runzmd/compare/v1.0.29...v1.0.30) +* github.com/openziti/sdk-golang: [v0.20.90 -> v0.20.101](https://github.com/openziti/sdk-golang/compare/v0.20.90...v0.20.101) +* github.com/openziti/storage: [v0.2.12 -> v0.2.14](https://github.com/openziti/storage/compare/v0.2.12...v0.2.14) +* github.com/openziti/transport/v2: [v2.0.99 -> v2.0.103](https://github.com/openziti/transport/compare/v2.0.99...v2.0.103) + * [Issue #54](https://github.com/openziti/transport/issues/54) - Support HTTP Connect proxying for TLS connections + +* github.com/openziti/metrics: [v1.2.31 -> v1.2.33](https://github.com/openziti/metrics/compare/v1.2.31...v1.2.33) +* github.com/openziti/secretstream: [v0.1.10 -> v0.1.11](https://github.com/openziti/secretstream/compare/v0.1.10...v0.1.11) +* github.com/openziti/ziti: [v0.30.1 -> v0.30.2](https://github.com/openziti/ziti/compare/v0.30.1...v0.30.2) + * [Issue #1266](https://github.com/openziti/ziti/issues/1266) - Outdated README.md: Some links return "Page Not Found" + +# Release 0.30.1 + +## What's New + +## Component Updates and Bug Fixes + +* github.com/openziti/ziti: [v0.30.1 -> v0.30.2](https://github.com/openziti/ziti/compare/v0.30.1...v0.30.2) + * [Issue #1266](https://github.com/openziti/ziti/issues/1266) - Updated dead links in README + # Release 0.30.1 ## What's New ## Component Updates and Bug Fixes -* github.com/openziti/ziti: [v0.30.0 -> v0.30.1](https://github.com/openziti/ziti/compare/v0.28.4...v0.29.0) +* github.com/openziti/ziti: [v0.30.0 -> v0.30.1](https://github.com/openziti/ziti/compare/v0.30.0...v0.30.1) * [Issue #1225](https://github.com/openziti/ziti/issues/1225) - Updated ZITI_ROUTER_ADVERTISED_HOST to use the more common naming convention of ZITI_ROUTER_ADVERTISED_ADDRESS * [Issue #1233](https://github.com/openziti/ziti/issues/1233) - Added `lsof` to the list of prerequisites to be checked during quickstart diff --git a/README.md b/README.md index 44d565a1d..38222991f 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ OpenZiti represents the next generation of secure, open-source networking for yo ## Quick Reference -* [Documentation](https://openziti.github.io/) +* [Documentation](https://openziti.io/docs/learn/introduction/) * [Developer Overview](./doc/001-overview.md) * [Local Development Tutorial](./doc/002-local-dev.md) * [Local Deployment Tutorial](./doc/003-local-deploy.md) @@ -39,8 +39,8 @@ OpenZiti represents the next generation of secure, open-source networking for yo * [Open source code, available with the Apache 2.0 license](https://github.com/openziti) * Fully programmable REST management APIs -* [SDKs for a variety of programming languages](https://openziti.github.io/ziti/clients/sdks) -* [Application specific configuration store allowing centralized management of configuration allowing you to add structured configuration specific to your application](https://openziti.github.io/ziti/config-store/overview) +* [SDKs for a variety of programming languages](https://openziti.io/docs/reference/developer/sdk) +* [Application specific configuration store allowing centralized management of configuration allowing you to add structured configuration specific to your application](https://openziti.io/docs/learn/core-concepts/config-store/overview) * An extensible fabric, allowing you to add your own * load balancing algorithms * interconnect protocols @@ -50,9 +50,9 @@ OpenZiti represents the next generation of secure, open-source networking for yo ### Easy Management -* [A flexible and expressive policy model for managing access to services and edge routers](https://openziti.github.io/ziti/policies/overview) +* [A flexible and expressive policy model for managing access to services and edge routers](https://openziti.io/docs/learn/core-concepts/security/authorization/policies/overview) * A web based admin console -* [Pre-built tunnelers and proxies for a variety of operating systems, including mobile](https://openziti.github.io/ziti/clients/tunneler) +* [Pre-built tunnelers and proxies for a variety of operating systems, including mobile](https://openziti.io/docs/reference/tunnelers) Let's break some of these buzzwords down. @@ -95,7 +95,7 @@ End-to-end encryption means that even if systems between the client and server a ## Getting started with OpenZiti If you are looking to jump right in feet first you can follow along with one of our [up-and-running quickstart -guides](https://openziti.github.io/ziti/quickstarts/quickstart-overview.html). These guides are designed to get an +guides](https://openziti.io/docs/learn/quickstarts/). These guides are designed to get an overlay network quickly and allow you to run it all locally, use Docker or host it anywhere. This environment is perfect for evaluators to get to know OpenZiti and the capabilities it offers. The environment was not diff --git a/go.mod b/go.mod index 01c73c05f..8f75fc3ae 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/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/storage v0.2.12 - github.com/openziti/transport/v2 v2.0.99 + github.com/openziti/channel/v2 v2.0.95 + github.com/openziti/edge v0.24.401 + github.com/openziti/edge-api v0.25.33 + github.com/openziti/fabric v0.24.20 + github.com/openziti/foundation/v2 v2.0.30 + github.com/openziti/identity v1.0.61 + github.com/openziti/runzmd v1.0.30 + github.com/openziti/sdk-golang v0.20.101 + github.com/openziti/storage v0.2.14 + github.com/openziti/transport/v2 v2.0.103 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 @@ -98,13 +97,13 @@ require ( github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect - github.com/hashicorp/golang-lru/v2 v2.0.4 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.6 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/raft v1.5.0 // indirect github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect - github.com/jinzhu/copier v0.3.5 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/josharian/native v1.1.0 // indirect github.com/kataras/go-events v0.0.3 // indirect @@ -134,8 +133,8 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/openziti/dilithium v0.3.3 // indirect github.com/openziti/jwks v1.0.3 // indirect - github.com/openziti/metrics v1.2.31 // indirect - github.com/openziti/secretstream v0.1.10 // indirect + github.com/openziti/metrics v1.2.33 // indirect + github.com/openziti/secretstream v0.1.11 // indirect github.com/openziti/x509-claims v1.0.3 // indirect github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect github.com/parallaxsecond/parsec-client-go v0.0.0-20221025095442-f0a77d263cf9 // indirect @@ -167,18 +166,19 @@ require ( github.com/zitadel/oidc/v2 v2.7.0 // indirect go.mongodb.org/mongo-driver v1.12.1 // indirect go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.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..6f9b6dee5 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= @@ -480,8 +481,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru/v2 v2.0.4 h1:7GHuZcgid37q8o5i3QI9KMT4nCWQQ3Kx3Ov6bb9MfK0= -github.com/hashicorp/golang-lru/v2 v2.0.4/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/golang-lru/v2 v2.0.6 h1:3xi/Cafd1NaoEnS/yDssIiuVeDVywU0QdFGl3aQaQHM= +github.com/hashicorp/golang-lru/v2 v2.0.6/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -509,8 +510,8 @@ github.com/jedib0t/go-pretty/v6 v6.4.0/go.mod h1:MgmISkTWDSFu0xOqiZ0mKNntMQ2mDgO github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= -github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -705,34 +706,34 @@ 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.95 h1:MQfIr8tAEoDIlPByRMeWYlYAhULML0yyxDeuXxLS6xc= +github.com/openziti/channel/v2 v2.0.95/go.mod h1:m/PXLXgNvwOJAtjXRXjWF8vqCa/aExYBZcRr/Q5/cq8= 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/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= -github.com/openziti/identity v1.0.60/go.mod h1:pUfQ1Rf6TJvpBULXKPAO4014Qd6g+uf6V/vqjUscipU= +github.com/openziti/edge v0.24.401 h1:R/V76tFoHcJStNyvRwB7eMe6+i8JcYFlk/mQVoePl1o= +github.com/openziti/edge v0.24.401/go.mod h1:N+EdTegPrRYtYAEcuE2n8BLDuJr+D6uFSGnM55wgzYA= +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.20 h1:LaulSXD3V8iodGnxN+ZgkdSA1LA1NFpnTWVSfn0gjSE= +github.com/openziti/fabric v0.24.20/go.mod h1:wgNcf1OtwsxrUhLuzzNMJVMqdLAW+Yng+syEdHq6ZoM= +github.com/openziti/foundation/v2 v2.0.30 h1:k6mZ9pkmJgrrM5ogHvmyaRecyASHDhAv9ifZAIzuJ2s= +github.com/openziti/foundation/v2 v2.0.30/go.mod h1:MpXSCSn4MABvtIXzfTBFqhK5pNsNXHWnR8xxVrfxn0g= +github.com/openziti/identity v1.0.61 h1:qrYT5wBSht6CbwSfw7fnT/cVDVVsOGaaJ/IfmWT+zDc= +github.com/openziti/identity v1.0.61/go.mod h1:JcCEiaBe5zu0eOH+J0/Q1xH5Bl9VOaxHwTApYX2JjBU= github.com/openziti/jwks v1.0.3 h1:hf8wkb+Cg4nH/HM0KROFd7u+C3DkRVcFZJ7tDV+4icc= github.com/openziti/jwks v1.0.3/go.mod h1:t4xxq8vlXGsPn29kiQVnZBBDDnEoOFqtJoHibkJunQQ= -github.com/openziti/metrics v1.2.31 h1:nEO9FAqCnpfuvxGYfy9/W46p2SaEcZ6vlRyz4fcipoY= -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/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/metrics v1.2.33 h1:H8YNswYARY4HipPs9mPwrbt0XQJH+n2/SZ8WUPY4z2Q= +github.com/openziti/metrics v1.2.33/go.mod h1:Xr+fvHK9yFPW4op/fsp8OJFHRPSOZdlqjoF1KRpTRNQ= +github.com/openziti/runzmd v1.0.30 h1:Yd00Z+gSwE9emw+LvK3vhXJfoV2T/cUM7IIxNHiVw6I= +github.com/openziti/runzmd v1.0.30/go.mod h1:gmy8V6ROO5Q4EO2CTXfzjar4mS8jWgzgOJeulpJjHTs= +github.com/openziti/sdk-golang v0.20.101 h1:jgWPM/E+xF3PeKPdW21ZmSFd2mBWLWnFhPehPtBA/OI= +github.com/openziti/sdk-golang v0.20.101/go.mod h1:emiUoNTEju5aYrFKsPPgZ2oUVXroGptlDbonPThszC0= +github.com/openziti/secretstream v0.1.11 h1:Q73qSV84AW0EA4wqJ7dAKv8uZuvy3L6mPl3k9cYNRPA= +github.com/openziti/secretstream v0.1.11/go.mod h1:hjHVY/1d7n2TcIaXtHZOuBYz0k7cXKI3v2+VBGtCqpI= +github.com/openziti/storage v0.2.14 h1:J/DZLrlwnVNvyVOhVuBz3qHNQ6/KcMVAuMbtzF0Hm3M= +github.com/openziti/storage v0.2.14/go.mod h1:UyQboOzxDa1FBMu+0smFvD88RbAR3JkK6HivLY1sRWw= +github.com/openziti/transport/v2 v2.0.103 h1:zs3h9liTxUG9+IhpZFMA79HxNaiudkP5V5zA6yKz578= +github.com/openziti/transport/v2 v2.0.103/go.mod h1:IWwjBMIs/xdozHCfXK2Gg27IDhr4fKyHm+7PuT+k6TM= 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= @@ -999,13 +1000,13 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -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/quickstart/docker/.env b/quickstart/docker/.env index fab7f04a2..da4ebbea1 100644 --- a/quickstart/docker/.env +++ b/quickstart/docker/.env @@ -7,6 +7,8 @@ ZITI_VERSION=latest ZITI_USER=admin ZITI_PWD= +ZITI_INTERFACE=0.0.0.0 +# ZITI_GO_VERSION= # controller name, address/port information ZITI_CTRL_NAME=ziti-controller ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=ziti-edge-controller diff --git a/quickstart/docker/README.md b/quickstart/docker/README.md index b6ebbf772..6cc3bf4bb 100644 --- a/quickstart/docker/README.md +++ b/quickstart/docker/README.md @@ -1,4 +1,5 @@ # Building and Deploying the Latest Quickstart Docker Image + ========================== First, decide what you are trying to do. Are you trying to: @@ -8,41 +9,34 @@ First, decide what you are trying to do. Are you trying to: * build an 'older' version of `ziti` into a docker image to run ## Build Docker Image for Local Dev + ------------------ -1. build the `ziti` CLI somewhere + 1. change to this directory from checkout root: `cd quickstart/docker` -1. make a directory named `ziti-bin`: `mkdir ./ziti-bin` -1. copy the `ziti` CLI to `./ziti-bin`: `cp /path/to/ziti ./ziti-bin` -1. run the script `./createLocalImage.sh` which will create a `openziti/quickstart:latest` tag - using the `ziti` CLI located in `./ziti-bin` - 1. Optionally, you may provide an argument for the image tag. `./createLocalImage.sh ` +1. run the script `./createLocalImage.sh --build` which will create a `openziti/quickstart:latest` tag + using the `ziti` CLI located in `./image/ziti-bin` + 1. Optionally, you may provide an argument for the image tag. `./createLocalImage.sh --build ` ## Build Docker Image for Docker-related Changes + 1. change to this directory from checkout root: `cd quickstart/docker` 1. run the script `./createLocalImage.sh` which will create a `openziti/quickstart:latest` tag using the latest `ziti` [release from GitHub](https://github.com/openziti/ziti/releases/latest) - 1. Optionally, you may provide an argument for the image tag. `./createLocalImage.sh ` + 1. Optionally, you may provide an argument, e.g., `./createLocalImage.sh `, to create a tag + other than `latest`. ## Build Docker Image with Specific ziti Version -1. change to this directory from checkout root: `cd quickstart/docker` -1. set `ZITI_VERSION_OVERRIDE` to desired version: `export ZITI_VERSION_OVERRIDE=v0.28.4` -1. run the script `./createLocalImage.sh` which will create a `openziti/quickstart:latest` tag - using the specified version of `ziti` [from GitHub](https://github.com/openziti/ziti/releases/tag/v0.28.4) - 1. Optionally, you may provide an argument for the image tag. `./createLocalImage.sh ` - -## ERROR: existing instance for "ziti-builder" -When running the `./createLocalImage.sh` script, you might get this error: -``` -ERROR: existing instance for "ziti-builder" but no append mode, specify --node to make changes for existing instances -``` -It's probably safest to just remove the buildx builder using: -``` -docker buildx rm ziti-builder -``` +1. change to this directory from checkout root: `cd quickstart/docker` +1. set `ZITI_VERSION_OVERRIDE` to a version >= 0.29.0 (prior versions used a different build path) +1. run the script `ZITI_VERSION_OVERRIDE=0.29.0 ./createLocalImage.sh` which will create a `openziti/quickstart:latest` tag + using the specified version of `ziti` [from GitHub](https://github.com/openziti/ziti/releases/tag/v0.29.0) + 1. Optionally, you may provide an argument, e.g., `ZITI_VERSION_OVERRIDE=0.29.0 ./createLocalImage.sh `, to create a tag + other than `latest`. ## Build Docker Image For Publication + To publish the latest `ziti` CLI, use [the GitHub Action](https://github.com/openziti/ziti/actions/workflows/push-quickstart.yml). -It's preferable to use `main` as the branch to create the docker image from, but it's +It's preferable to use `main` as the branch to create the docker image from, but it's perfectly fine to use 'release-next' as the source if there are script-related changes that need to be pushed out faster than waiting for a merge to main. diff --git a/quickstart/docker/createLocalImage.sh b/quickstart/docker/createLocalImage.sh index 42fa9489b..21f155ada 100755 --- a/quickstart/docker/createLocalImage.sh +++ b/quickstart/docker/createLocalImage.sh @@ -1,7 +1,16 @@ #!/usr/bin/env bash -set -eo pipefail +set -euo pipefail SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +ZITI_BIN="${SCRIPT_DIR}/image/ziti-bin" + +case "${1:-}" in + --build) + mkdir -p "${ZITI_BIN}" + go build -o "${ZITI_BIN}" "${SCRIPT_DIR}/../../..." + shift + ;; +esac ### ### This script will recreate the *LATEST* quickstart image locally from *PUBLISHED* binaries @@ -9,12 +18,24 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" ### to quickly/easily recreate the image for local dev use that CI will publish ### echo "CREATING latest quickstart containers LOCALLY" -if [ -d != "${SCRIPT_DIR}/ziti-bin" ]; then - echo "rebuilding quickstart using latest ziti from github: no image/ziti-bin directory found" +if [ -d "${ZITI_BIN}" ]; then + echo "rebuilding quickstart using locally built ziti located in ${ZITI_BIN} directory" echo "" else - echo "rebuilding quickstart using locally built ziti located in image/ziti-bin directory" + echo "rebuilding quickstart using latest ziti from github: no ${ZITI_BIN} directory found" echo "" fi -$SCRIPT_DIR/pushLatestDocker.sh local "${1}" \ No newline at end of file +# optionally, configure ZITI_VERSION for pushLatestDocker.sh +if [[ -n "${ZITI_VERSION_OVERRIDE:-}" && -n "${ZITI_VERSION:-}" ]]; then + echo "WARN: both ZITI_VERSION and ZITI_VERSION_OVERRIDE are set, overriding $ZITI_VERSION with $ZITI_OVERRIDE_VERSION" >&2 + export ZITI_VERSION="${ZITI_VERSION_OVERRIDE#v}" +elif [[ -n "${ZITI_VERSION_OVERRIDE:-}" ]]; then + echo "INFO: ZITI_VERSION_OVERRIDE is set, setting ZITI_VERSION=${ZITI_OVERRIDE_VERSION#v}" + export ZITI_VERSION="${ZITI_VERSION_OVERRIDE#v}" +elif [[ -n "${ZITI_VERSION:-}" ]]; then + echo "INFO: ZITI_VERSION is set, using ZITI_VERSION=${ZITI_VERSION#v}" + export ZITI_VERSION="${ZITI_VERSION#v}" +fi + +"${SCRIPT_DIR}/pushLatestDocker.sh" local "${1:-}" diff --git a/quickstart/docker/docker-compose.yml b/quickstart/docker/docker-compose.yml index 200fc3457..e1071188b 100644 --- a/quickstart/docker/docker-compose.yml +++ b/quickstart/docker/docker-compose.yml @@ -5,8 +5,8 @@ services: env_file: - ./.env ports: - - ${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} - - ${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} environment: - ZITI_CTRL_NAME=${ZITI_CTRL_NAME:-ziti-edge-controller} - ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS:-ziti-edge-controller} @@ -59,8 +59,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -86,8 +86,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_WSS_PORT:-3023}:${ZITI_ROUTER_WSS_PORT:-3023} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10081}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_WSS_PORT:-3023}:${ZITI_ROUTER_WSS_PORT:-3023} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10081} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -175,7 +175,7 @@ services: web-test-blue: image: crccheck/hello-world ports: - - 80:8000 + - ${ZITI_INTERFACE:-0.0.0.0}:80:8000 networks: zitiblue: aliases: @@ -196,7 +196,7 @@ services: depends_on: - ziti-controller ports: - - 8443:8443 + - ${ZITI_INTERFACE:-0.0.0.0}:8443:8443 volumes: - ziti-fs:/persistent networks: diff --git a/quickstart/docker/image/fetch-ziti-bins.sh b/quickstart/docker/image/fetch-ziti-bins.sh index 22792cfa7..0b20e3eec 100644 --- a/quickstart/docker/image/fetch-ziti-bins.sh +++ b/quickstart/docker/image/fetch-ziti-bins.sh @@ -7,7 +7,7 @@ dest="${1}" if [ -d /docker.build.context/ziti-bin ]; then mv /docker.build.context/ziti-bin/ "${dest}" else - source /docker.build.context/ziti-cli-functions.sh - getZiti - mv "${ZITI_BIN_DIR}" "${dest}" + source /docker.build.context/ziti-cli-functions.sh + getZiti + mv "${ZITI_BIN_DIR}" "${dest}" fi diff --git a/quickstart/docker/image/ziti-cli-functions.sh b/quickstart/docker/image/ziti-cli-functions.sh index 315ddba0d..b992e9574 100644 --- a/quickstart/docker/image/ziti-cli-functions.sh +++ b/quickstart/docker/image/ziti-cli-functions.sh @@ -315,7 +315,7 @@ function setupEnvironment { if [[ "${ZITI_PKI_SIGNER_CERT_NAME-}" == "" ]]; then export ZITI_PKI_SIGNER_CERT_NAME="${ZITI_NETWORK}-signing"; else echo "ZITI_PKI_SIGNER_CERT_NAME overridden: ${ZITI_PKI_SIGNER_CERT_NAME}"; fi if [[ "${ZITI_PKI_SIGNER_ROOTCA_NAME-}" == "" ]]; then export ZITI_PKI_SIGNER_ROOTCA_NAME="${ZITI_PKI_SIGNER_CERT_NAME}-root-ca"; else echo "ZITI_PKI_SIGNER_ROOTCA_NAME overridden: ${ZITI_PKI_SIGNER_ROOTCA_NAME}"; fi if [[ "${ZITI_PKI_SIGNER_INTERMEDIATE_NAME-}" == "" ]]; then export ZITI_PKI_SIGNER_INTERMEDIATE_NAME="${ZITI_PKI_SIGNER_CERT_NAME}-intermediate"; else echo "ZITI_PKI_SIGNER_INTERMEDIATE_NAME overridden: ${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}"; fi - if [[ "${ZITI_PKI_SIGNER_CERT}" == "" ]]; then export ZITI_PKI_SIGNER_CERT="${ZITI_PKI}/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}/certs/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}.cert"; else echo "ZITI_PKI_SIGNER_CERT overridden: ${ZITI_PKI_SIGNER_CERT}"; fi + if [[ "${ZITI_PKI_SIGNER_CERT}" == "" ]]; then export ZITI_PKI_SIGNER_CERT="${ZITI_PKI}/signing.pem"; else echo "ZITI_PKI_SIGNER_CERT overridden: ${ZITI_PKI_SIGNER_CERT}"; fi if [[ "${ZITI_PKI_SIGNER_KEY}" == "" ]]; then export ZITI_PKI_SIGNER_KEY="${ZITI_PKI}/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}/keys/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}.key"; else echo "ZITI_PKI_SIGNER_KEY overridden: ${ZITI_PKI_SIGNER_KEY}"; fi # Run these functions to populate other pertinent environment values @@ -720,7 +720,7 @@ function getZiti { # Create a custom PKI function createPki { - local retVal pki_allow_list pki_allow_list_ip ZITI_SPURIOUS_INTERMEDIATE + local retVal pki_allow_list pki_allow_list_ip ZITI_GRANDPARENT_INTERMEDIATE _check_env_variable ZITI_PKI_CTRL_ROOTCA_NAME ZITI_PKI_CTRL_EDGE_ROOTCA_NAME ZITI_PKI_SIGNER_ROOTCA_NAME \ ZITI_PKI_SIGNER_INTERMEDIATE_NAME ZITI_PKI_CTRL_INTERMEDIATE_NAME \ ZITI_PKI_CTRL_EDGE_INTERMEDIATE_NAME @@ -734,11 +734,11 @@ function createPki { _pki_create_ca "${ZITI_PKI_CTRL_EDGE_ROOTCA_NAME}" _pki_create_ca "${ZITI_PKI_SIGNER_ROOTCA_NAME}" - ZITI_SPURIOUS_INTERMEDIATE="${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}_spurious_intermediate" + ZITI_GRANDPARENT_INTERMEDIATE="${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}_grandparent_intermediate" _pki_create_intermediate "${ZITI_PKI_CTRL_ROOTCA_NAME}" "${ZITI_PKI_CTRL_INTERMEDIATE_NAME}" 1 _pki_create_intermediate "${ZITI_PKI_CTRL_EDGE_ROOTCA_NAME}" "${ZITI_PKI_CTRL_EDGE_INTERMEDIATE_NAME}" 1 - _pki_create_intermediate "${ZITI_PKI_SIGNER_ROOTCA_NAME}" "${ZITI_SPURIOUS_INTERMEDIATE}" 2 - _pki_create_intermediate "${ZITI_SPURIOUS_INTERMEDIATE}" "${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}" 1 + _pki_create_intermediate "${ZITI_PKI_SIGNER_ROOTCA_NAME}" "${ZITI_GRANDPARENT_INTERMEDIATE}" 2 + _pki_create_intermediate "${ZITI_GRANDPARENT_INTERMEDIATE}" "${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}" 1 echo " " pki_allow_list="localhost,${ZITI_NETWORK}" @@ -819,14 +819,15 @@ function createControllerConfig { echo "adding controller root CA to ca bundle: $ZITI_PKI/$ZITI_PKI_CTRL_ROOTCA_NAME/certs/$ZITI_PKI_CTRL_ROOTCA_NAME.cert" cat "$ZITI_PKI/$ZITI_PKI_CTRL_ROOTCA_NAME/certs/$ZITI_PKI_CTRL_ROOTCA_NAME.cert" > "${ZITI_PKI_CTRL_CA}" - - echo "adding signing root CA to ca bundle: $ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/$ZITI_PKI_SIGNER_ROOTCA_NAME.cert" - cat "$ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/$ZITI_PKI_SIGNER_ROOTCA_NAME.cert" >>"${ZITI_PKI_CTRL_CA}" - - echo "adding secondary signing intermediate into ca bundle: $ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}_spurious_intermediate.cert" - cat "$ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}_spurious_intermediate.cert" >> "${ZITI_PKI_CTRL_CA}" - + echo "adding signing root CA to ZITI_PKI_CTRL_CA: $ZITI_PKI_CTRL_CA" + cat "$ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/$ZITI_PKI_SIGNER_ROOTCA_NAME.cert" >> "${ZITI_PKI_CTRL_CA}" echo -e "wrote CA file to: $(BLUE "${ZITI_PKI_CTRL_CA}")" + + echo "adding parent intermediate CA to ZITI_PKI_SIGNER_CERT: $ZITI_PKI_SIGNER_CERT" + cat "$ZITI_PKI/$ZITI_PKI_SIGNER_INTERMEDIATE_NAME/certs/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}.cert" > "${ZITI_PKI_SIGNER_CERT}" + echo "adding grandparent intermediate CA to ZITI_PKI_SIGNER_CERT: $ZITI_PKI_SIGNER_CERT" + cat "$ZITI_PKI/$ZITI_PKI_SIGNER_ROOTCA_NAME/certs/${ZITI_PKI_SIGNER_INTERMEDIATE_NAME}_grandparent_intermediate.cert" >> "${ZITI_PKI_SIGNER_CERT}" + echo -e "wrote signer cert file to: $(BLUE "${ZITI_PKI_SIGNER_CERT}")" output_file="${file_path}/${controller_name}.yaml" diff --git a/quickstart/docker/pushLatestDocker.sh b/quickstart/docker/pushLatestDocker.sh index d93d1780b..557fc26a5 100755 --- a/quickstart/docker/pushLatestDocker.sh +++ b/quickstart/docker/pushLatestDocker.sh @@ -21,8 +21,6 @@ if [ -z "${IMAGE_TAG}" ]; then echo "image tag name was not provided, using default '${IMAGE_TAG}'" fi -docker buildx create --use --name=ziti-builder - if [ "local" == "${1}" ]; then echo "LOADING LOCALLY instead of pushing to dockerhub" _BUILDX_PLATFORM="" @@ -31,8 +29,13 @@ else _BUILDX_PLATFORM="--platform linux/amd64,linux/arm64" _BUILDX_ACTION="--push" fi -docker buildx build ${_BUILDX_PLATFORM} "${SCRIPT_DIR}/image" \ + +docker buildx create \ + --use --name=ziti-builder --driver docker-container 2>/dev/null \ + || docker buildx use --default ziti-builder + +eval docker buildx build "${_BUILDX_PLATFORM}" "${SCRIPT_DIR}/image" \ --build-arg ZITI_VERSION_OVERRIDE="v${ZITI_VERSION}" \ --tag "openziti/quickstart:${ZITI_VERSION}" \ --tag "openziti/quickstart:${IMAGE_TAG}" \ - ${_BUILDX_ACTION} \ No newline at end of file + "${_BUILDX_ACTION}" diff --git a/quickstart/docker/simplified-docker-compose.yml b/quickstart/docker/simplified-docker-compose.yml index b0a101e3b..a4399cda5 100644 --- a/quickstart/docker/simplified-docker-compose.yml +++ b/quickstart/docker/simplified-docker-compose.yml @@ -1,12 +1,11 @@ -version: '2.4' services: ziti-controller: image: "${ZITI_IMAGE}:${ZITI_VERSION}" env_file: - ./.env ports: - - ${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} - - ${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_ADVERTISED_PORT:-6262}:${ZITI_CTRL_ADVERTISED_PORT:-6262} environment: - ZITI_CTRL_NAME=${ZITI_CTRL_NAME:-ziti-edge-controller} - ZITI_CTRL_EDGE_ADVERTISED_ADDRESS=${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS:-ziti-edge-controller} @@ -51,8 +50,8 @@ services: depends_on: - ziti-controller ports: - - ${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} - - ${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022} + - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080}:${ZITI_ROUTER_LISTENER_BIND_PORT:-10080} environment: - ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-ziti-controller} - ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-6262} @@ -83,7 +82,7 @@ services: depends_on: - ziti-controller ports: - - 8443:8443 + - ${ZITI_INTERFACE:-0.0.0.0}:8443:8443 volumes: - ziti-fs:/persistent networks: 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/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 != "" { 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..ff8331cac 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.95 + github.com/openziti/edge v0.24.401 github.com/openziti/fablab v0.5.5 - github.com/openziti/fabric v0.24.2 - 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/storage v0.2.12 - github.com/openziti/transport/v2 v2.0.99 + github.com/openziti/fabric v0.24.20 + github.com/openziti/foundation/v2 v2.0.30 + github.com/openziti/identity v1.0.61 + github.com/openziti/sdk-golang v0.20.101 + github.com/openziti/storage v0.2.14 + github.com/openziti/transport/v2 v2.0.103 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 @@ -89,7 +89,7 @@ require ( github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-msgpack v0.5.5 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect - github.com/hashicorp/golang-lru/v2 v2.0.4 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.6 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/raft v1.5.0 // indirect github.com/hashicorp/raft-boltdb v0.0.0-20220329195025-15018e9b97e0 // indirect @@ -97,7 +97,7 @@ require ( github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d // indirect github.com/jedib0t/go-pretty/v6 v6.4.6 // indirect github.com/jessevdk/go-flags v1.5.0 // indirect - github.com/jinzhu/copier v0.3.5 // indirect + github.com/jinzhu/copier v0.4.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/josharian/native v1.1.0 // indirect @@ -130,11 +130,11 @@ 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 - github.com/openziti/secretstream v0.1.10 // indirect + github.com/openziti/metrics v1.2.33 // indirect + github.com/openziti/runzmd v1.0.30 // indirect + github.com/openziti/secretstream v0.1.11 // indirect github.com/openziti/x509-claims v1.0.3 // indirect github.com/openziti/xweb/v2 v2.1.0 // indirect github.com/openziti/ziti-db-explorer v1.1.3 // indirect @@ -172,19 +172,19 @@ require ( github.com/zitadel/oidc/v2 v2.7.0 // indirect go.mongodb.org/mongo-driver v1.12.1 // indirect go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.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..2877d381f 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= @@ -480,8 +481,8 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/golang-lru/v2 v2.0.4 h1:7GHuZcgid37q8o5i3QI9KMT4nCWQQ3Kx3Ov6bb9MfK0= -github.com/hashicorp/golang-lru/v2 v2.0.4/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/hashicorp/golang-lru/v2 v2.0.6 h1:3xi/Cafd1NaoEnS/yDssIiuVeDVywU0QdFGl3aQaQHM= +github.com/hashicorp/golang-lru/v2 v2.0.6/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -511,8 +512,8 @@ github.com/jedib0t/go-pretty/v6 v6.4.6/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVf github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= -github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= +github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8= +github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -717,36 +718,36 @@ 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.95 h1:MQfIr8tAEoDIlPByRMeWYlYAhULML0yyxDeuXxLS6xc= +github.com/openziti/channel/v2 v2.0.95/go.mod h1:m/PXLXgNvwOJAtjXRXjWF8vqCa/aExYBZcRr/Q5/cq8= 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.401 h1:R/V76tFoHcJStNyvRwB7eMe6+i8JcYFlk/mQVoePl1o= +github.com/openziti/edge v0.24.401/go.mod h1:N+EdTegPrRYtYAEcuE2n8BLDuJr+D6uFSGnM55wgzYA= +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/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= -github.com/openziti/identity v1.0.60/go.mod h1:pUfQ1Rf6TJvpBULXKPAO4014Qd6g+uf6V/vqjUscipU= +github.com/openziti/fabric v0.24.20 h1:LaulSXD3V8iodGnxN+ZgkdSA1LA1NFpnTWVSfn0gjSE= +github.com/openziti/fabric v0.24.20/go.mod h1:wgNcf1OtwsxrUhLuzzNMJVMqdLAW+Yng+syEdHq6ZoM= +github.com/openziti/foundation/v2 v2.0.30 h1:k6mZ9pkmJgrrM5ogHvmyaRecyASHDhAv9ifZAIzuJ2s= +github.com/openziti/foundation/v2 v2.0.30/go.mod h1:MpXSCSn4MABvtIXzfTBFqhK5pNsNXHWnR8xxVrfxn0g= +github.com/openziti/identity v1.0.61 h1:qrYT5wBSht6CbwSfw7fnT/cVDVVsOGaaJ/IfmWT+zDc= +github.com/openziti/identity v1.0.61/go.mod h1:JcCEiaBe5zu0eOH+J0/Q1xH5Bl9VOaxHwTApYX2JjBU= github.com/openziti/jwks v1.0.3 h1:hf8wkb+Cg4nH/HM0KROFd7u+C3DkRVcFZJ7tDV+4icc= github.com/openziti/jwks v1.0.3/go.mod h1:t4xxq8vlXGsPn29kiQVnZBBDDnEoOFqtJoHibkJunQQ= -github.com/openziti/metrics v1.2.31 h1:nEO9FAqCnpfuvxGYfy9/W46p2SaEcZ6vlRyz4fcipoY= -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/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/metrics v1.2.33 h1:H8YNswYARY4HipPs9mPwrbt0XQJH+n2/SZ8WUPY4z2Q= +github.com/openziti/metrics v1.2.33/go.mod h1:Xr+fvHK9yFPW4op/fsp8OJFHRPSOZdlqjoF1KRpTRNQ= +github.com/openziti/runzmd v1.0.30 h1:Yd00Z+gSwE9emw+LvK3vhXJfoV2T/cUM7IIxNHiVw6I= +github.com/openziti/runzmd v1.0.30/go.mod h1:gmy8V6ROO5Q4EO2CTXfzjar4mS8jWgzgOJeulpJjHTs= +github.com/openziti/sdk-golang v0.20.101 h1:jgWPM/E+xF3PeKPdW21ZmSFd2mBWLWnFhPehPtBA/OI= +github.com/openziti/sdk-golang v0.20.101/go.mod h1:emiUoNTEju5aYrFKsPPgZ2oUVXroGptlDbonPThszC0= +github.com/openziti/secretstream v0.1.11 h1:Q73qSV84AW0EA4wqJ7dAKv8uZuvy3L6mPl3k9cYNRPA= +github.com/openziti/secretstream v0.1.11/go.mod h1:hjHVY/1d7n2TcIaXtHZOuBYz0k7cXKI3v2+VBGtCqpI= +github.com/openziti/storage v0.2.14 h1:J/DZLrlwnVNvyVOhVuBz3qHNQ6/KcMVAuMbtzF0Hm3M= +github.com/openziti/storage v0.2.14/go.mod h1:UyQboOzxDa1FBMu+0smFvD88RbAR3JkK6HivLY1sRWw= +github.com/openziti/transport/v2 v2.0.103 h1:zs3h9liTxUG9+IhpZFMA79HxNaiudkP5V5zA6yKz578= +github.com/openziti/transport/v2 v2.0.103/go.mod h1:IWwjBMIs/xdozHCfXK2Gg27IDhr4fKyHm+7PuT+k6TM= 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= @@ -1015,13 +1016,13 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= go.opentelemetry.io/otel/sdk v1.14.0 h1:PDCppFRDq8A1jL9v6KMI6dYesaq+DFcDZvjsoGvxGzY= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -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"