Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Update for moved packages in fabric #1582

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Update for moved packages in fabric #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controller/env/appenv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import (
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/fabric/controller/xmgmt"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/foundation/v2/stringz"
"github.com/openziti/identity"
Expand Down
2 changes: 1 addition & 1 deletion controller/env/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/storage/boltz"
"go.etcd.io/bbolt"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/env/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/foundation/v2/versions"
"sync"
)
Expand Down
4 changes: 2 additions & 2 deletions controller/events/dispatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package events
import (
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/events"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/fabric/controller/events"
"github.com/openziti/foundation/v2/concurrenz"
"github.com/openziti/storage/boltz"
"io"
Expand Down
2 changes: 1 addition & 1 deletion controller/events/formatter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package events

import (
"github.com/openziti/fabric/events"
"github.com/openziti/fabric/controller/events"
"github.com/pkg/errors"
"io"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_edge_ctrl/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/foundation/v2/stringz"
"github.com/openziti/identity"
"github.com/openziti/sdk-golang/ziti/edge"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_edge_ctrl/common_tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/foundation/v2/concurrenz"
"github.com/openziti/storage/boltz"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_edge_mgmt/init_edge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/openziti/channel/v2"
"github.com/openziti/edge/common/pb/edge_mgmt_pb"
"github.com/openziti/edge/controller/env"
"github.com/openziti/fabric/handler_common"
"github.com/openziti/fabric/common/handler_common"
"google.golang.org/protobuf/proto"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/identity_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/openziti/edge/controller/response"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/foundation/v2/stringz"
"github.com/openziti/storage/ast"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/spec_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/common/build"
"github.com/openziti/fabric/controller/models"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/version_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/common/build"
"github.com/openziti/xweb/v2"
"runtime"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/create_terminator_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/command"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/cmd_pb"
"github.com/openziti/fabric/common/pb/cmd_pb"
"github.com/openziti/storage/boltz"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/edge_router_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/openziti/fabric/controller/command"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/cmd_pb"
"github.com/openziti/fabric/common/pb/cmd_pb"
"google.golang.org/protobuf/proto"
"strconv"

Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/cmd_pb"
"github.com/openziti/fabric/common/pb/cmd_pb"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/storage/boltz"
"go.etcd.io/bbolt"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/identity_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/cmd_pb"
"github.com/openziti/fabric/common/pb/cmd_pb"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/metrics"
"github.com/openziti/sdk-golang/ziti"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/transit_router_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/cmd_pb"
"github.com/openziti/fabric/common/pb/cmd_pb"
"github.com/openziti/storage/boltz"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
Expand Down
4 changes: 2 additions & 2 deletions controller/persistence/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/events"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/fabric/controller/events"
tests "github.com/openziti/fabric/tests"
"github.com/openziti/foundation/v2/versions"
"github.com/openziti/identity"
Expand Down
2 changes: 1 addition & 1 deletion controller/response/headers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package response

import (
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/common/build"
"strconv"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/server/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/openziti/edge/controller/handler_edge_ctrl"
_ "github.com/openziti/edge/controller/internal/routes"
"github.com/openziti/edge/controller/model"
"github.com/openziti/fabric/config"
"github.com/openziti/fabric/common/config"
"github.com/openziti/storage/boltz"
)

Expand Down
4 changes: 2 additions & 2 deletions controller/sync_strats/sync_instant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"github.com/openziti/edge/controller/handler_edge_ctrl"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/common/build"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/foundation/v2/debugz"
"github.com/openziti/foundation/v2/genext"
"github.com/openziti/storage/ast"
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/golang-jwt/jwt/v5 v5.0.0
github.com/google/go-cmp v0.5.9
github.com/google/gopacket v1.1.19
github.com/google/uuid v1.3.0
github.com/google/uuid v1.3.1
github.com/gorilla/mux v1.8.0
github.com/hashicorp/golang-lru/v2 v2.0.4
github.com/jinzhu/copier v0.3.5
Expand All @@ -30,7 +30,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0
github.com/openziti/channel/v2 v2.0.92
github.com/openziti/edge-api v0.25.33
github.com/openziti/fabric v0.24.2
github.com/openziti/fabric v0.24.14
github.com/openziti/foundation/v2 v2.0.29
github.com/openziti/identity v1.0.60
github.com/openziti/jwks v1.0.3
Expand Down Expand Up @@ -81,7 +81,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/jsonpointer v0.20.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -135,12 +135,12 @@ require (
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
golang.org/x/exp v0.0.0-20230807204917-050eac23e9de // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/term v0.11.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
nhooyr.io/websocket v1.8.7 // indirect
)
23 changes: 12 additions & 11 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,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=
Expand Down Expand Up @@ -305,8 +306,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 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
Expand Down Expand Up @@ -494,8 +495,8 @@ github.com/openziti/channel/v2 v2.0.92 h1:dKrVy3SYgMcea977lW/So2zvDoFrWfrMi4YSlv
github.com/openziti/channel/v2 v2.0.92/go.mod h1:2g704N/sfNzf9kcbPyUOZOFrpCHaWxQi0d8rVgXHeKE=
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.2 h1:fb7fE/d3it6OrwhJqfr0RKQ41VUV9VKFsOOl98zdoRY=
github.com/openziti/fabric v0.24.2/go.mod h1:rXhb73v5rgoUV1AbRDXF8gAcbualabJU9YyLMkiB0yw=
github.com/openziti/fabric v0.24.14 h1:kZKmPt4n5IlAfZVG4I31Dkt2SR8+u1OFngsN8fz1xxU=
github.com/openziti/fabric v0.24.14/go.mod h1:BNWokYd8w6bMXq40TvR3yLM5rbYnY219kify9Q4wgww=
github.com/openziti/foundation/v2 v2.0.29 h1:E63p5/esqOJ/OSMePR3fKYHb3Wq2BR4PLkDFynESij8=
github.com/openziti/foundation/v2 v2.0.29/go.mod h1:MpXSCSn4MABvtIXzfTBFqhK5pNsNXHWnR8xxVrfxn0g=
github.com/openziti/identity v1.0.60 h1:6gvBXY9J6F7SbuksdxsUA1t1WmtsFfY61Oqm/00ijGU=
Expand Down Expand Up @@ -711,8 +712,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-20230807204917-050eac23e9de h1:l5Za6utMv/HsBWWqzt4S8X17j+kt1uVETUX5UFhn2rE=
golang.org/x/exp v0.0.0-20230807204917-050eac23e9de/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/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Expand All @@ -739,8 +740,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
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.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=
Expand Down Expand Up @@ -972,8 +973,8 @@ 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=
Expand Down
2 changes: 1 addition & 1 deletion router/handler_edge_ctrl/hello.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/router/fabric"
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/common/build"
"google.golang.org/protobuf/proto"
"strconv"
)
Expand Down
2 changes: 1 addition & 1 deletion router/xgress_edge/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/sdk-golang/ziti/edge"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion router/xgress_edge/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
fabricMetrics "github.com/openziti/fabric/metrics"
fabricMetrics "github.com/openziti/fabric/common/metrics"
"github.com/pkg/errors"
"google.golang.org/protobuf/proto"
"time"
Expand Down
4 changes: 2 additions & 2 deletions router/xgress_edge/perf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"crypto/x509"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/fabric/inspect"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/common/inspect"
"github.com/openziti/fabric/common/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/handler_xgress"
metrics2 "github.com/openziti/fabric/router/metrics"
Expand Down
4 changes: 2 additions & 2 deletions router/xgress_edge_transport/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
package xgress_edge_transport

import (
"github.com/openziti/fabric/ctrl_msg"
"github.com/openziti/fabric/common/ctrl_msg"
"github.com/pkg/errors"
"time"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/router/xgress_common"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/sdk-golang/ziti/edge"
"github.com/openziti/transport/v2"
Expand Down
4 changes: 2 additions & 2 deletions router/xgress_edge_tunnel/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/openziti/edge/router/xgress_common"
"github.com/openziti/edge/tunnel"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/ctrl_msg"
"github.com/openziti/fabric/logcontext"
"github.com/openziti/fabric/common/ctrl_msg"
"github.com/openziti/fabric/common/logcontext"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/sdk-golang/ziti/edge"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions router/xgress_edge_tunnel/fabric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
"github.com/openziti/edge/router/xgress_common"
"github.com/openziti/edge/tunnel"
"github.com/openziti/fabric/build"
"github.com/openziti/fabric/ctrl_msg"
"github.com/openziti/fabric/common/build"
"github.com/openziti/fabric/common/ctrl_msg"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/v2/concurrenz"
"github.com/openziti/foundation/v2/errorz"
Expand Down
2 changes: 1 addition & 1 deletion tests/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
events2 "github.com/openziti/edge/controller/events"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/fabric/event"
"github.com/openziti/fabric/controller/event"
"github.com/openziti/foundation/v2/stringz"
"reflect"
"sync"
Expand Down
Loading