Merge pull request openziti/fabric#346 from openziti/update-to-storage-lib

Update to use storage library

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"

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"
 )
 

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"
 )
 

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"
 )
 

controller/db/base_store.go

@@ -17,7 +17,7 @@
 package db
 
 import (
-	"github.com/openziti/foundation/storage/boltz"
+	"github.com/openziti/storage/boltz"
 )
 
 const (

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"

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"
 )

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"

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"
 )

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"
 )

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"

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"

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"
 )
 

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"

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"

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"

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"

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 {

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"
 )

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"
 )

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"

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"