Merge pull request #1270 from openziti/release-next

Release v0.30.2

.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:

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
 

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

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