Skip to content

Commit

Permalink
Merge pull request #2391 from openziti/channel-v3
Browse files Browse the repository at this point in the history 
Update to channel/v3. Fixes #2390
  • Loading branch information
@plorenz
plorenz authored Sep 10, 2024
2 parents 6690ef6 + cccf0c0 commit eb18c12
Show file tree
Hide file tree
Showing 234 changed files with 498 additions and 451 deletions.
29 changes: 29 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
# Release 1.1.12

## What's New

* Bug fixes, enhancements and continuing progress on controller HA

## Component Updates and Bug Fixes

* github.com/openziti/agent: [v1.0.17 -> v1.0.18](https://github.com/openziti/agent/compare/v1.0.17...v1.0.18)
* github.com/openziti/channel/v3: [v2.0.143 -> v3.0.3](https://github.com/openziti/channel/compare/v2.0.143...v3.0.3)
* [Issue #138](https://github.com/openziti/channel/issues/138) - Allow custom message serialization. Add support for a 'raw' message type.
* [Issue #82](https://github.com/openziti/channel/issues/82) - Remove transport.Configuration from UnderlayFactory.Create

* github.com/openziti/edge-api: [v0.26.29 -> v0.26.30](https://github.com/openziti/edge-api/compare/v0.26.29...v0.26.30)
* github.com/openziti/foundation/v2: [v2.0.48 -> v2.0.49](https://github.com/openziti/foundation/compare/v2.0.48...v2.0.49)
* github.com/openziti/identity: [v1.0.84 -> v1.0.85](https://github.com/openziti/identity/compare/v1.0.84...v1.0.85)
* github.com/openziti/metrics: [v1.2.57 -> v1.2.58](https://github.com/openziti/metrics/compare/v1.2.57...v1.2.58)
* github.com/openziti/runzmd: [v1.0.50 -> v1.0.51](https://github.com/openziti/runzmd/compare/v1.0.50...v1.0.51)
* github.com/openziti/sdk-golang: [v0.23.40 -> v0.23.41](https://github.com/openziti/sdk-golang/compare/v0.23.40...v0.23.41)
* github.com/openziti/secretstream: [v0.1.21 -> v0.1.24](https://github.com/openziti/secretstream/compare/v0.1.21...v0.1.24)
* github.com/openziti/storage: [v0.3.0 -> v0.3.1](https://github.com/openziti/storage/compare/v0.3.0...v0.3.1)
* github.com/openziti/transport/v2: [v2.0.143 -> v2.0.146](https://github.com/openziti/transport/compare/v2.0.143...v2.0.146)
* [Issue #92](https://github.com/openziti/transport/issues/92) - Implement simple traffic shaper

* github.com/openziti-incubator/cf: v0.0.3 (new)
* github.com/openziti/dilithium: [v0.3.3 -> v0.3.5](https://github.com/openziti/dilithium/compare/v0.3.3...v0.3.5)
* github.com/openziti/ziti: [v1.1.11 -> v1.1.12](https://github.com/openziti/ziti/compare/v1.1.11...v1.1.12)
* [Issue #2390](https://github.com/openziti/ziti/issues/2390) - Update to github.com/openziti/channel/v3

# Release 1.1.11

# What's New
Expand Down
2 changes: 1 addition & 1 deletion common/capabilities/check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package capabilities

import (
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"math/big"
)
Expand Down
2 changes: 1 addition & 1 deletion common/ctrl_msg/messages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package ctrl_msg
import (
"errors"
"fmt"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/pb/edge_ctrl_pb"
)

Expand Down
2 changes: 1 addition & 1 deletion common/handler_common/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package handler_common

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/ctrl_msg"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion common/metrics/ctrl_reporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package metrics

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/router/env"
"github.com/openziti/metrics"
"github.com/openziti/metrics/metrics_pb"
Expand Down
2 changes: 1 addition & 1 deletion common/pb/ctrl_pb/decoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package ctrl_pb
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/metrics/metrics_pb"
"github.com/openziti/ziti/common/ctrl_msg"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion common/pb/edge_ctrl_pb/decoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package edge_ctrl_pb
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"google.golang.org/protobuf/proto"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion common/pb/mgmt_pb/decoder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
)

type Decoder struct{}
Expand Down
4 changes: 2 additions & 2 deletions common/trace/channel_peekhandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package trace
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/trace/pb"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/trace/pb"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/common/pb/mgmt_pb"
"github.com/openziti/ziti/router/xgress"
Expand Down
2 changes: 1 addition & 1 deletion common/trace/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package trace

import (
"fmt"
"github.com/openziti/channel/v2/trace/pb"
"github.com/openziti/channel/v3/trace/pb"
"regexp"
"strings"
)
Expand Down
2 changes: 1 addition & 1 deletion common/trace/event_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package trace

import (
"github.com/openziti/channel/v2/trace/pb"
"github.com/openziti/channel/v3/trace/pb"
"github.com/openziti/foundation/v2/concurrenz"
)

Expand Down
2 changes: 1 addition & 1 deletion common/trace/filter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package trace

import "github.com/openziti/channel/v2/trace/pb"
import "github.com/openziti/channel/v3/trace/pb"

type Filter interface {
Accept(event *trace_pb.ChannelMessage) bool
Expand Down
4 changes: 2 additions & 2 deletions common/trace/xgress_peekhandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package trace

import (
"fmt"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/trace/pb"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/trace/pb"
"github.com/openziti/ziti/router/xgress"
"github.com/openziti/foundation/v2/concurrenz"
"github.com/openziti/identity"
Expand Down
4 changes: 2 additions & 2 deletions controller/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/protobufs"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/protobufs"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/mgmt_pb"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/change/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package change

import "github.com/openziti/channel/v2"
import "github.com/openziti/channel/v3"

func NewControlChannelChange(routerId, routerName, method string, ch channel.Channel) *Context {
return New().
Expand Down
2 changes: 1 addition & 1 deletion controller/command/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package command

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/foundation/v2/debugz"
"github.com/openziti/foundation/v2/rate"
"github.com/openziti/storage/boltz"
Expand Down
2 changes: 1 addition & 1 deletion controller/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"fmt"
"github.com/hashicorp/go-hclog"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/identity"
"github.com/openziti/storage/boltz"
"github.com/openziti/transport/v2"
Expand Down
5 changes: 2 additions & 3 deletions controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import (
"github.com/pkg/errors"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/protobufs"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/protobufs"
"github.com/openziti/foundation/v2/versions"
"github.com/openziti/identity"
"github.com/openziti/metrics"
Expand Down Expand Up @@ -387,7 +387,6 @@ func (c *Controller) Run() error {
underlayDispatcher := channel.NewUnderlayDispatcher(channel.UnderlayDispatcherConfig{
Listener: ctrlListener,
ConnectTimeout: c.config.Ctrl.Options.ConnectTimeout,
TransportConfig: nil,
Acceptors: ctrlAcceptors,
DefaultAcceptor: ctrlAccepter,
})
Expand Down
2 changes: 1 addition & 1 deletion controller/env/appenv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/google/uuid"
"github.com/lucsky/cuid"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
clientServer "github.com/openziti/edge-api/rest_client_api_server"
clientOperations "github.com/openziti/edge-api/rest_client_api_server/operations"
managementServer "github.com/openziti/edge-api/rest_management_api_server"
Expand Down
2 changes: 1 addition & 1 deletion controller/env/broker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"crypto"
"crypto/x509"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/storage/boltz"
"github.com/openziti/ziti/common/pb/edge_ctrl_pb"
"github.com/openziti/ziti/controller/db"
Expand Down
2 changes: 1 addition & 1 deletion controller/env/sync.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package env

import (
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/foundation/v2/versions"
"github.com/openziti/ziti/common/pb/edge_ctrl_pb"
"github.com/openziti/ziti/controller/db"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/accept.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/network"
"github.com/openziti/ziti/controller/xctrl"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package handler_ctrl

import (
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/controller/change"
"github.com/openziti/ziti/controller/model"
"github.com/openziti/ziti/controller/network"
Expand Down
4 changes: 2 additions & 2 deletions controller/handler_ctrl/bind.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/latency"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/latency"
"github.com/openziti/foundation/v2/concurrenz"
"github.com/openziti/metrics"
"github.com/openziti/ziti/common/trace"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/circuit_confirmation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
"github.com/openziti/ziti/controller/network"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/circuit_request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/identity"
"github.com/openziti/ziti/common/ctrl_msg"
"github.com/openziti/ziti/common/logcontext"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/close.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/controller/model"
"github.com/openziti/ziti/controller/network"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/connect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"crypto/x509"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/controller/network"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/foundation/v2/stringz"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/create_terminator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package handler_ctrl
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/decommission.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/dequiesce_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
Expand Down
4 changes: 2 additions & 2 deletions controller/handler_ctrl/fault.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package handler_ctrl
import (
"errors"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v2/protobufs"
"github.com/openziti/channel/v3"
"github.com/openziti/channel/v3/protobufs"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/event"
"github.com/openziti/ziti/controller/model"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/inspect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/controller/network"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/link_connected.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
"github.com/openziti/ziti/controller/network"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/controller/event"
"github.com/openziti/ziti/controller/network"
"github.com/openziti/metrics/metrics_pb"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/ping.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package handler_ctrl

import (
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/quiesce_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/remove_terminator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/model"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_ctrl/remove_terminators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package handler_ctrl

import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/channel/v3"
"github.com/openziti/ziti/common/handler_common"
"github.com/openziti/ziti/common/pb/ctrl_pb"
"github.com/openziti/ziti/controller/command"
Expand Down
Loading

0 comments on commit eb18c12

Please sign in to comment.