diff --git a/controller/api_impl/base_router.go b/controller/api_impl/base_router.go index 3b9fc2d96..04b8be48f 100644 --- a/controller/api_impl/base_router.go +++ b/controller/api_impl/base_router.go @@ -24,8 +24,8 @@ import ( "github.com/openziti/fabric/controller/models" "github.com/openziti/fabric/controller/network" "github.com/openziti/fabric/rest_model" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/errorz" "net/http" "reflect" diff --git a/controller/api_impl/circuit_router.go b/controller/api_impl/circuit_router.go index b12e9fc3e..c1b0ee7cd 100644 --- a/controller/api_impl/circuit_router.go +++ b/controller/api_impl/circuit_router.go @@ -23,7 +23,7 @@ import ( "github.com/openziti/fabric/rest_model" "github.com/openziti/fabric/rest_server/operations" "github.com/openziti/fabric/rest_server/operations/circuit" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "sort" ) diff --git a/controller/api_impl/link_router.go b/controller/api_impl/link_router.go index 99a93a617..c8fd59b9a 100644 --- a/controller/api_impl/link_router.go +++ b/controller/api_impl/link_router.go @@ -23,7 +23,7 @@ import ( "github.com/openziti/fabric/rest_model" "github.com/openziti/fabric/rest_server/operations" "github.com/openziti/fabric/rest_server/operations/link" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "sort" ) diff --git a/controller/api_impl/query_options.go b/controller/api_impl/query_options.go index 94471e756..426ef38be 100644 --- a/controller/api_impl/query_options.go +++ b/controller/api_impl/query_options.go @@ -19,8 +19,8 @@ package api_impl import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/errorz" ) diff --git a/controller/db/base_store.go b/controller/db/base_store.go index b242dbd31..612168311 100644 --- a/controller/db/base_store.go +++ b/controller/db/base_store.go @@ -17,7 +17,7 @@ package db import ( - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" ) const ( diff --git a/controller/db/migration.go b/controller/db/migration.go index d10b091d8..edbbc02c2 100644 --- a/controller/db/migration.go +++ b/controller/db/migration.go @@ -2,8 +2,8 @@ package db import ( "github.com/openziti/fabric/controller/xt_smartrouting" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "github.com/pkg/errors" log "github.com/sirupsen/logrus" "strings" diff --git a/controller/db/router_store.go b/controller/db/router_store.go index 7af40f73e..d62333ca5 100644 --- a/controller/db/router_store.go +++ b/controller/db/router_store.go @@ -17,8 +17,8 @@ package db import ( - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/db/router_store_test.go b/controller/db/router_store_test.go index 2ae9a0f00..b8509428a 100644 --- a/controller/db/router_store_test.go +++ b/controller/db/router_store_test.go @@ -24,7 +24,7 @@ import ( "github.com/google/uuid" "github.com/google/go-cmp/cmp" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/db/service_store.go b/controller/db/service_store.go index 10372bbef..36403942b 100644 --- a/controller/db/service_store.go +++ b/controller/db/service_store.go @@ -19,8 +19,8 @@ package db import ( "github.com/openziti/fabric/controller/xt" "github.com/openziti/fabric/controller/xt_smartrouting" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/db/service_store_test.go b/controller/db/service_store_test.go index 17f96ecd5..503c474d2 100644 --- a/controller/db/service_store_test.go +++ b/controller/db/service_store_test.go @@ -23,7 +23,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/db/stores.go b/controller/db/stores.go index 0e6c73e3d..92b7b78b7 100644 --- a/controller/db/stores.go +++ b/controller/db/stores.go @@ -18,7 +18,7 @@ package db import ( "github.com/michaelquigley/pfxlog" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" "reflect" "sync" diff --git a/controller/db/terminator_store.go b/controller/db/terminator_store.go index 262b6b9d5..eb043282d 100644 --- a/controller/db/terminator_store.go +++ b/controller/db/terminator_store.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/xt" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/sequence" "go.etcd.io/bbolt" ) diff --git a/controller/db/terminator_store_test.go b/controller/db/terminator_store_test.go index c34864993..7d509d232 100644 --- a/controller/db/terminator_store_test.go +++ b/controller/db/terminator_store_test.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/google/uuid" "github.com/openziti/fabric/controller/xt" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/stringz" "go.etcd.io/bbolt" "math" diff --git a/controller/db/testing.go b/controller/db/testing.go index f9bab2410..9f2650f58 100644 --- a/controller/db/testing.go +++ b/controller/db/testing.go @@ -5,7 +5,7 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/xt" "github.com/openziti/fabric/controller/xt_smartrouting" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" "testing" ) diff --git a/controller/handler_ctrl/update_terminator.go b/controller/handler_ctrl/update_terminator.go index b6040f503..966f9f240 100644 --- a/controller/handler_ctrl/update_terminator.go +++ b/controller/handler_ctrl/update_terminator.go @@ -25,7 +25,7 @@ import ( "github.com/openziti/fabric/controller/xt" "github.com/openziti/fabric/pb/ctrl_pb" "github.com/openziti/channel" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" log "github.com/sirupsen/logrus" "math" ) diff --git a/controller/health.go b/controller/health.go index bac0aca0f..c80de4c61 100644 --- a/controller/health.go +++ b/controller/health.go @@ -5,7 +5,7 @@ import ( gosundheit "github.com/AppsFlyer/go-sundheit" "github.com/AppsFlyer/go-sundheit/checks" "github.com/openziti/foundation/metrics" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/concurrenz" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/controller/models/base_model.go b/controller/models/base_model.go index c58f85ba5..5109e2048 100644 --- a/controller/models/base_model.go +++ b/controller/models/base_model.go @@ -19,8 +19,8 @@ package models import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/db" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/errorz" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/controller/network/controllers.go b/controller/network/controllers.go index b0aac26ec..86ee3616c 100644 --- a/controller/network/controllers.go +++ b/controller/network/controllers.go @@ -20,8 +20,8 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/models" - "github.com/openziti/foundation/storage/ast" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/ast" + "github.com/openziti/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/network/network.go b/controller/network/network.go index d4ace35b3..e5d34d36e 100644 --- a/controller/network/network.go +++ b/controller/network/network.go @@ -38,7 +38,7 @@ import ( "github.com/openziti/foundation/identity/identity" "github.com/openziti/foundation/metrics" "github.com/openziti/foundation/metrics/metrics_pb" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/debugz" "github.com/openziti/foundation/util/errorz" "github.com/openziti/foundation/util/sequence" diff --git a/controller/network/router.go b/controller/network/router.go index ef876dba5..c8cd78ee3 100644 --- a/controller/network/router.go +++ b/controller/network/router.go @@ -26,7 +26,7 @@ import ( "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/models" "github.com/openziti/foundation/common" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/concurrenz" cmap "github.com/orcaman/concurrent-map" "github.com/pkg/errors" diff --git a/controller/network/service.go b/controller/network/service.go index b7c693bf6..28c1569f1 100644 --- a/controller/network/service.go +++ b/controller/network/service.go @@ -20,7 +20,7 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/models" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/orcaman/concurrent-map" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/controller/network/terminator.go b/controller/network/terminator.go index bde904014..e27a06659 100644 --- a/controller/network/terminator.go +++ b/controller/network/terminator.go @@ -18,7 +18,7 @@ import ( "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/models" "github.com/openziti/fabric/controller/xt" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/pkg/errors" "go.etcd.io/bbolt" "reflect" diff --git a/controller/xctrl/xctrl.go b/controller/xctrl/xctrl.go index a29720b64..8195cf0c3 100644 --- a/controller/xctrl/xctrl.go +++ b/controller/xctrl/xctrl.go @@ -19,7 +19,7 @@ package xctrl import ( "github.com/openziti/channel" "github.com/openziti/fabric/config" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" ) type Xctrl interface { diff --git a/controller/xctrl_example/example.go b/controller/xctrl_example/example.go index 13b725f00..3c756e0bd 100644 --- a/controller/xctrl_example/example.go +++ b/controller/xctrl_example/example.go @@ -23,7 +23,7 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/fabric/controller/xctrl" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/sirupsen/logrus" "time" ) diff --git a/controller/xt/registry.go b/controller/xt/registry.go index 1725ad8e4..ba56c770f 100644 --- a/controller/xt/registry.go +++ b/controller/xt/registry.go @@ -17,7 +17,7 @@ package xt import ( - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "sync" "sync/atomic" ) diff --git a/events/terminators.go b/events/terminators.go index 413dc02e9..0fa5e4521 100644 --- a/events/terminators.go +++ b/events/terminators.go @@ -6,7 +6,7 @@ import ( "github.com/openziti/fabric/controller/db" "github.com/openziti/fabric/controller/network" "github.com/openziti/fabric/controller/xt" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/openziti/foundation/util/cowslice" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/router/link_registry.go b/router/link_registry.go index 773f4a185..e33b94180 100644 --- a/router/link_registry.go +++ b/router/link_registry.go @@ -7,7 +7,7 @@ import ( "github.com/openziti/channel/protobufs" "github.com/openziti/fabric/pb/ctrl_pb" "github.com/openziti/fabric/router/xlink" - "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/storage/boltz" "github.com/sirupsen/logrus" "sync" "time"