Optimize imports

common/capabilities/check.go

@@ -17,9 +17,10 @@
 package capabilities
 
 import (
+	"math/big"
+
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"
-	"math/big"
 )
 
 func IsCapable(ch channel.Channel, capability int) bool {

common/concurrency/initialized_notifier.go

@@ -17,8 +17,9 @@
 package concurrency
 
 import (
-	"github.com/michaelquigley/pfxlog"
 	"sync/atomic"
+
+	"github.com/michaelquigley/pfxlog"
 )
 
 type InitState interface {

common/config/env.go

@@ -17,9 +17,10 @@
 package config
 
 import (
-	"github.com/michaelquigley/pfxlog"
 	"os"
 	"sync"
+
+	"github.com/michaelquigley/pfxlog"
 )
 
 var ensureTmpDirEnvOnce sync.Once
@@ -48,7 +49,7 @@ func EnsureTempDirEnv() {
 
 func InjectEnv(config map[interface{}]interface{}) {
 	ensureTmpDirEnvOnce.Do(EnsureTempDirEnv)
-	
+
 	for key, v := range config {
 		if str, ok := v.(string); ok {
 			config[key] = os.ExpandEnv(str)

common/config/value.go

@@ -17,8 +17,9 @@
 package config
 
 import (
-	"github.com/openziti/foundation/v2/concurrenz"
 	"sync"
+
+	"github.com/openziti/foundation/v2/concurrenz"
 )
 
 type Listener[T any] interface {

common/ctrl_msg/messages.go

@@ -19,6 +19,7 @@ package ctrl_msg
 import (
 	"errors"
 	"fmt"
+
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/pb/edge_ctrl_pb"
 )

common/eid/id.go

@@ -3,6 +3,7 @@ package eid
 import (
 	"crypto/rand"
 	"encoding/binary"
+
 	"github.com/teris-io/shortid"
 )
 

common/getziti/extract.go

@@ -5,11 +5,12 @@ import (
 	"archive/zip"
 	"compress/gzip"
 	"fmt"
-	"github.com/michaelquigley/pfxlog"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/michaelquigley/pfxlog"
 )
 
 func Unzip(src, dest string, filter func(path string) (string, bool)) error {

common/getziti/github.go

@@ -3,12 +3,6 @@ package getziti
 import (
 	"context"
 	"fmt"
-	"github.com/blang/semver"
-	"github.com/go-resty/resty/v2"
-	"github.com/michaelquigley/pfxlog"
-	"github.com/openziti/foundation/v2/versions"
-	c "github.com/openziti/ziti/v2/ziti/constants"
-	"github.com/pkg/errors"
 	"net/http"
 	"net/url"
 	"os"
@@ -16,6 +10,13 @@ import (
 	"sort"
 	"strings"
 	"time"
+
+	"github.com/blang/semver"
+	"github.com/go-resty/resty/v2"
+	"github.com/michaelquigley/pfxlog"
+	"github.com/openziti/foundation/v2/versions"
+	c "github.com/openziti/ziti/v2/ziti/constants"
+	"github.com/pkg/errors"
 )
 
 // GitHubReleasesData is used to parse the '/releases/latest' response from GitHub

common/getziti/install_ziti.go

@@ -2,6 +2,7 @@ package getziti
 
 import (
 	"fmt"
+
 	c "github.com/openziti/ziti/v2/ziti/constants"
 )
 

common/getziti/install_ziti_edge_tunnel.go

@@ -2,9 +2,10 @@ package getziti
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/blang/semver"
 	c "github.com/openziti/ziti/v2/ziti/constants"
-	"strings"
 )
 
 func InstallZitiEdgeTunnel(targetVersion, targetOS, targetArch, binDir string, verbose bool) error {

common/handler_common/common.go

@@ -1,10 +1,11 @@
 package handler_common
 
 import (
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/ctrl_msg"
-	"time"
 )
 
 func SendSuccess(request *channel.Message, ch channel.Channel, message string) {

common/health/handler.go

@@ -19,12 +19,13 @@ package health
 import (
 	"encoding/json"
 	"fmt"
-	gosundheit "github.com/AppsFlyer/go-sundheit"
-	"github.com/openziti/xweb/v3"
-	"github.com/sirupsen/logrus"
 	"net/http"
 	"strings"
 	"time"
+
+	gosundheit "github.com/AppsFlyer/go-sundheit"
+	"github.com/openziti/xweb/v3"
+	"github.com/sirupsen/logrus"
 )
 
 const (

common/logcontext/logcontext.go

@@ -2,6 +2,7 @@ package logcontext
 
 import (
 	"fmt"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/sirupsen/logrus"
 )

common/metrics/pool_metrics.go

@@ -17,10 +17,11 @@
 package metrics
 
 import (
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/goroutines"
 	"github.com/openziti/metrics"
-	"time"
 )
 
 func ConfigureGoroutinesPoolMetrics(config *goroutines.PoolConfig, registry metrics.Registry, poolType string) {

common/pb/cmd_pb/impl.go

@@ -2,6 +2,7 @@ package cmd_pb
 
 import (
 	"encoding/binary"
+
 	"google.golang.org/protobuf/proto"
 )
 

common/pb/cmd_pb/tags_test.go

@@ -1,8 +1,9 @@
 package cmd_pb
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTagEncodeDecode(t *testing.T) {

common/pb/edge_ctrl_pb/decoder.go

@@ -18,10 +18,11 @@ package edge_ctrl_pb
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"google.golang.org/protobuf/proto"
-	"strings"
 )
 
 type Decoder struct{}

common/runner/operation.go

@@ -17,8 +17,9 @@
 package runner
 
 import (
-	"github.com/google/uuid"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 type Operation interface {

common/runner/runner.go

@@ -18,9 +18,10 @@ package runner
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
-	"time"
 )
 
 type ErrorHandler func(error, Operation)

common/spiffehlp/spiffe.go

@@ -20,8 +20,9 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/pkg/errors"
 	"net/url"
+
+	"github.com/pkg/errors"
 )
 
 // GetSpiffeIdFromCertChain cycles through a slice of certificates that goes from leaf up CAs. Each certificate

common/trace/channel_peekhandler.go

@@ -18,16 +18,17 @@ package trace
 
 import (
 	"fmt"
+	"sync/atomic"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/channel/v4/trace/pb"
+	"github.com/openziti/foundation/v2/concurrenz"
+	"github.com/openziti/sdk-golang/xgress"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"
 	"github.com/openziti/ziti/v2/common/pb/mgmt_pb"
-	"github.com/openziti/sdk-golang/xgress"
-	"github.com/openziti/foundation/v2/concurrenz"
 	"google.golang.org/protobuf/proto"
-	"sync/atomic"
-	"time"
 )
 
 var decoders = []channel.TraceMessageDecoder{channel.Decoder{}, ctrl_pb.Decoder{}, xgress.Decoder{}, mgmt_pb.Decoder{}}

common/trace/controller.go

@@ -18,9 +18,10 @@ package trace
 
 import (
 	"fmt"
-	"github.com/openziti/channel/v4/trace/pb"
 	"regexp"
 	"strings"
+
+	"github.com/openziti/channel/v4/trace/pb"
 )
 
 type SourceType int

common/trace/xgress_peekhandler.go

@@ -18,13 +18,14 @@ package trace
 
 import (
 	"fmt"
-	"github.com/openziti/channel/v4"
-	"github.com/openziti/channel/v4/trace/pb"
-	"github.com/openziti/sdk-golang/xgress"
-	"github.com/openziti/foundation/v2/concurrenz"
-	"github.com/openziti/identity"
 	"sync/atomic"
 	"time"
+
+	"github.com/openziti/channel/v4"
+	"github.com/openziti/channel/v4/trace/pb"
+	"github.com/openziti/foundation/v2/concurrenz"
+	"github.com/openziti/identity"
+	"github.com/openziti/sdk-golang/xgress"
 )
 
 type XgressPeekHandler struct {

common/version/info.go

@@ -17,8 +17,9 @@
 package version
 
 import (
-	"github.com/openziti/foundation/v2/versions"
 	"runtime"
+
+	"github.com/openziti/foundation/v2/versions"
 )
 
 type cmdBuildInfo struct{}

controller/api/api.go

@@ -17,11 +17,12 @@
 package api
 
 import (
+	"net/http"
+
 	"github.com/go-openapi/runtime"
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/ziti/v2/controller/apierror"
 	"github.com/openziti/ziti/v2/controller/change"
-	"net/http"
 )
 
 type Responder interface {

controller/api/cors.go

@@ -17,8 +17,9 @@
 package api
 
 import (
-	"github.com/gorilla/handlers"
 	"net/http"
+
+	"github.com/gorilla/handlers"
 )
 
 const (

controller/apierror/schema.go

@@ -3,6 +3,7 @@ package apierror
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/xeipuuv/gojsonschema"
 )
 

controller/change/context.go

@@ -18,6 +18,7 @@ package change
 
 import (
 	"context"
+
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/v2/common/pb/cmd_pb"
 )

controller/command/rate_limiter.go

@@ -18,6 +18,11 @@ package command
 
 import (
 	"fmt"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/errorz"
@@ -25,10 +30,6 @@ import (
 	"github.com/openziti/metrics"
 	"github.com/openziti/ziti/v2/controller/apierror"
 	"github.com/pkg/errors"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
 )
 
 const (

controller/command/rate_limiter_test.go

@@ -21,16 +21,17 @@ package command
 import (
 	"errors"
 	"fmt"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"time"
+
 	"github.com/openziti/foundation/v2/concurrenz"
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/metrics"
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/ziti/v2/controller/apierror"
 	"github.com/stretchr/testify/assert"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
 )
 
 func Test_AdaptiveRateLimiter(t *testing.T) {

controller/command/registry.go

@@ -18,6 +18,7 @@ package command
 
 import (
 	"encoding/binary"
+
 	"github.com/openziti/foundation/v2/concurrenz"
 	"github.com/pkg/errors"
 )

controller/config/config_edge_test.go

@@ -8,12 +8,13 @@ import (
 	"crypto/rand"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"github.com/google/uuid"
-	nfpem "github.com/openziti/foundation/v2/pem"
-	"github.com/stretchr/testify/require"
 	"math/big"
 	"testing"
 	"time"
+
+	"github.com/google/uuid"
+	nfpem "github.com/openziti/foundation/v2/pem"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_validateHostPortString(t *testing.T) {

controller/db/api_session_certificate_store.go

@@ -17,9 +17,10 @@
 package db
 
 import (
+	"time"
+
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
-	"time"
 )
 
 const (

controller/db/api_session_store.go

@@ -17,6 +17,9 @@
 package db
 
 import (
+	"strings"
+	"time"
+
 	"github.com/kataras/go-events"
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/storage/ast"
@@ -27,8 +30,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
 	bolterrors "go.etcd.io/bbolt/errors"
-	"strings"
-	"time"
 )
 
 const (

controller/db/api_session_store_test.go

@@ -18,6 +18,9 @@ package db
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltz"
@@ -25,8 +28,6 @@ import (
 	"github.com/openziti/ziti/v2/common/eid"
 	"github.com/openziti/ziti/v2/controller/change"
 	"go.etcd.io/bbolt"
-	"testing"
-	"time"
 )
 
 func Test_ApiSessionStore(t *testing.T) {

controller/db/base_entity.go

@@ -17,8 +17,9 @@
 package db
 
 import (
-	"github.com/openziti/storage/boltz"
 	"strings"
+
+	"github.com/openziti/storage/boltz"
 )
 
 const (

controller/db/base_store.go

@@ -17,11 +17,12 @@
 package db
 
 import (
+	"strings"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 	"go.etcd.io/bbolt"
-	"strings"
 )
 
 type initializableStore interface {

controller/db/config_store_test.go

@@ -19,11 +19,12 @@ package db
 import (
 	"encoding/json"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/common/eid"
 	"go.etcd.io/bbolt"
-	"testing"
-	"time"
 )
 
 func Test_ConfigStore(t *testing.T) {

controller/db/config_type_store_test.go

@@ -18,11 +18,12 @@ package db
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/common/eid"
 	"go.etcd.io/bbolt"
-	"testing"
-	"time"
 )
 
 func Test_ConfigTypeStore(t *testing.T) {

controller/db/controller_store.go

@@ -17,10 +17,11 @@
 package db
 
 import (
-	"github.com/openziti/storage/ast"
-	"github.com/openziti/storage/boltz"
 	"strconv"
 	"time"
+
+	"github.com/openziti/storage/ast"
+	"github.com/openziti/storage/boltz"
 )
 
 const (

controller/db/controller_store_test.go

@@ -26,14 +26,15 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
+	"math/big"
+	"testing"
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/common/eid"
 	"go.etcd.io/bbolt"
-	"math/big"
-	"testing"
-	"time"
 )
 
 func Test_ControllerStore(t *testing.T) {

controller/db/edge_router_policy_store.go

@@ -2,12 +2,13 @@ package db
 
 import (
 	"fmt"
+	"sort"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/v2/common/eid"
-	"sort"
 )
 
 func newEdgeRouterPolicy(name string) *EdgeRouterPolicy {

controller/db/edge_router_policy_store_test.go

@@ -2,6 +2,10 @@ package db
 
 import (
 	"fmt"
+	"sort"
+	"strings"
+	"testing"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltz"
@@ -9,9 +13,6 @@ import (
 	"github.com/openziti/ziti/v2/common/eid"
 	"github.com/sirupsen/logrus"
 	"go.etcd.io/bbolt"
-	"sort"
-	"strings"
-	"testing"
 )
 
 func Test_EdgeRouterPolicyStore(t *testing.T) {

controller/db/edge_router_store_test.go

@@ -1,10 +1,11 @@
 package db
 
 import (
+	"testing"
+
 	"github.com/google/uuid"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/storage/boltztest"
-	"testing"
 )
 
 func Test_EdgeRouterEvents(t *testing.T) {

controller/db/edge_service_store_test.go

@@ -18,11 +18,12 @@ package db
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/common/eid"
 	"github.com/openziti/ziti/v2/controller/change"
-	"testing"
-	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/openziti/foundation/v2/stringz"

controller/db/eventual_eventer.go

@@ -18,6 +18,10 @@ package db
 
 import (
 	"fmt"
+	"sync"
+	"sync/atomic"
+	"time"
+
 	"github.com/kataras/go-events"
 	"github.com/lucsky/cuid"
 	"github.com/michaelquigley/pfxlog"
@@ -26,9 +30,6 @@ import (
 	cmap "github.com/orcaman/concurrent-map/v2"
 	"github.com/pkg/errors"
 	"go.etcd.io/bbolt"
-	"sync"
-	"sync/atomic"
-	"time"
 )
 
 // An EventualEventer provides a method for storing events in a persistent manner

controller/db/interface_db_model.go

@@ -19,8 +19,9 @@ package db
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/openziti/storage/boltz"
 	"net"
+
+	"github.com/openziti/storage/boltz"
 )
 
 const (

controller/db/migration_v19.go

@@ -1,11 +1,12 @@
 package db
 
 import (
+	"time"
+
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"time"
 )
 
 var identityTypesMap = map[string]string{

controller/db/migration_v23.go

@@ -1,8 +1,9 @@
 package db
 
 import (
-	"github.com/openziti/storage/boltz"
 	"time"
+
+	"github.com/openziti/storage/boltz"
 )
 
 func (m *Migrations) addProcessMultiPostureCheck(step *boltz.MigrationStep) {

controller/db/migration_v24.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"fmt"
+
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 )

controller/db/migration_v25.go

@@ -17,8 +17,9 @@
 package db
 
 import (
-	"github.com/openziti/storage/boltz"
 	"time"
+
+	"github.com/openziti/storage/boltz"
 )
 
 func (m *Migrations) addSystemAuthPolicies(step *boltz.MigrationStep) {

controller/db/migration_v37.go

@@ -18,6 +18,7 @@ package db
 
 import (
 	"fmt"
+
 	nfpem "github.com/openziti/foundation/v2/pem"
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"

controller/db/posture_check_mac.go

@@ -17,9 +17,10 @@
 package db
 
 import (
-	"github.com/openziti/storage/boltz"
 	"regexp"
 	"strings"
+
+	"github.com/openziti/storage/boltz"
 )
 
 const (

controller/db/posture_check_process.go

@@ -17,8 +17,9 @@
 package db
 
 import (
-	"github.com/openziti/storage/boltz"
 	"strings"
+
+	"github.com/openziti/storage/boltz"
 )
 
 const (

controller/db/revocation_store.go

@@ -17,9 +17,10 @@
 package db
 
 import (
+	"time"
+
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
-	"time"
 )
 
 const (

controller/db/router_store.go

@@ -17,10 +17,11 @@
 package db
 
 import (
+	"time"
+
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 	"go.etcd.io/bbolt"
-	"time"
 )
 
 const (

controller/db/router_store_test.go

@@ -18,10 +18,11 @@ package db
 
 import (
 	"fmt"
-	"github.com/openziti/storage/boltztest"
 	"testing"
 	"time"
 
+	"github.com/openziti/storage/boltztest"
+
 	"github.com/google/uuid"
 
 	"github.com/google/go-cmp/cmp"

controller/db/service_edge_router_policy_store.go

@@ -2,12 +2,13 @@ package db
 
 import (
 	"fmt"
+	"sort"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/ast"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/v2/common/eid"
-	"sort"
 )
 
 func newServiceEdgeRouterPolicy(name string) *ServiceEdgeRouterPolicy {

controller/db/service_edge_router_policy_store_test.go

@@ -2,13 +2,14 @@ package db
 
 import (
 	"fmt"
+	"sort"
+	"testing"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/common/eid"
 	"go.etcd.io/bbolt"
-	"sort"
-	"testing"
 )
 
 func Test_ServiceEdgeRouterPolicyStore(t *testing.T) {

controller/db/service_events.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"fmt"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/cowslice"
 )

controller/db/service_store_test.go

@@ -18,11 +18,12 @@ package db
 
 import (
 	"fmt"
-	"github.com/google/uuid"
-	"github.com/openziti/storage/boltztest"
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
+	"github.com/openziti/storage/boltztest"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/openziti/storage/boltz"
 	"go.etcd.io/bbolt"

controller/db/session_store_test.go

@@ -18,6 +18,9 @@ package db
 
 import (
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/openziti/foundation/v2/stringz"
@@ -26,8 +29,6 @@ import (
 	"github.com/openziti/ziti/v2/common/eid"
 	"github.com/openziti/ziti/v2/controller/change"
 	"go.etcd.io/bbolt"
-	"testing"
-	"time"
 )
 
 const apiSessionsSessionsIdxPath = "/" + RootBucket + "/" + boltz.IndexesBucket + "/" + EntityTypeApiSessions + "/" + EntityTypeSessions

controller/db/stores.go

@@ -21,6 +21,10 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
+	"reflect"
+	"sync"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/rate"
@@ -29,9 +33,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/change"
 	"go.etcd.io/bbolt"
 	"go4.org/sort"
-	"reflect"
-	"sync"
-	"time"
 )
 
 func NewStoreDefinition[E boltz.ExtEntity](strategy boltz.EntityStrategy[E]) boltz.StoreDefinition[E] {

controller/db/terminator_store.go

@@ -18,6 +18,7 @@ package db
 
 import (
 	"encoding/binary"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/sequence"
 	"github.com/openziti/storage/ast"

controller/db/terminator_store_test.go

@@ -18,15 +18,16 @@ package db
 
 import (
 	"fmt"
+	"math"
+	"testing"
+	"time"
+
 	"github.com/google/uuid"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltztest"
 	"github.com/openziti/ziti/v2/controller/fields"
 	"github.com/openziti/ziti/v2/controller/xt"
 	"go.etcd.io/bbolt"
-	"math"
-	"testing"
-	"time"
 )
 
 func Test_TerminatorStore(t *testing.T) {

controller/db/testing.go

@@ -1,6 +1,8 @@
 package db
 
 import (
+	"testing"
+
 	"github.com/google/uuid"
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/storage/boltz"
@@ -12,7 +14,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/xt_smartrouting"
 	"github.com/pkg/errors"
 	"go.etcd.io/bbolt"
-	"testing"
 )
 
 func NewTestContext(t testing.TB) *TestContext {

controller/db/transit_router_store.go

@@ -18,6 +18,7 @@ package db
 
 import (
 	"fmt"
+
 	"github.com/openziti/storage/boltz"
 )
 

controller/db/util.go

@@ -18,11 +18,12 @@ package db
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltz"
 	"github.com/pkg/errors"
-	"strings"
 )
 
 const (

controller/env/helpers.go

@@ -1,11 +1,12 @@
 package env
 
 import (
+	"net/http"
+
 	openApiErrors "github.com/go-openapi/errors"
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/errorz"
 	"github.com/openziti/ziti/v2/controller/apierror"
-	"net/http"
 )
 
 // ServeError is a wrapper for the OpenAPI REST server to allow the Edge API Error message responses to be used

controller/env/producers.go

@@ -17,8 +17,9 @@
 package env
 
 import (
-	"gopkg.in/yaml.v3"
 	"io"
+
+	"gopkg.in/yaml.v3"
 )
 
 type YamlProducer struct{}

controller/env/trace.go

@@ -2,8 +2,9 @@ package env
 
 import (
 	"fmt"
-	cmap "github.com/orcaman/concurrent-map/v2"
 	"time"
+
+	cmap "github.com/orcaman/concurrent-map/v2"
 )
 
 func NewTraceManager(shutdownNotify <-chan struct{}) *TraceManager {

controller/event/metrics.go

@@ -17,8 +17,9 @@
 package event
 
 import (
-	"github.com/openziti/metrics/metrics_pb"
 	"time"
+
+	"github.com/openziti/metrics/metrics_pb"
 )
 
 const (

controller/events/dispatcher_api_session.go

@@ -18,13 +18,14 @@ package events
 
 import (
 	"fmt"
+	"reflect"
+	"time"
+
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/v2/controller/db"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
-	"time"
 )
 
 func (self *Dispatcher) AddApiSessionEventHandler(handler event.ApiSessionEventHandler) {

controller/events/dispatcher_authentication.go

@@ -18,10 +18,11 @@ package events
 
 import (
 	"fmt"
+	"reflect"
+
 	"github.com/openziti/foundation/v2/stringz"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddAuthenticationEventHandler(handler event.AuthenticationEventHandler) {

controller/events/dispatcher_circuit.go

@@ -18,9 +18,10 @@ package events
 
 import (
 	"fmt"
+	"reflect"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddCircuitEventHandler(handler event.CircuitEventHandler) {

controller/events/dispatcher_cluster.go

@@ -17,9 +17,10 @@
 package events
 
 import (
+	"reflect"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddClusterEventHandler(handler event.ClusterEventHandler) {

controller/events/dispatcher_connect.go

@@ -17,9 +17,10 @@
 package events
 
 import (
+	"reflect"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddConnectEventHandler(handler event.ConnectEventHandler) {

controller/events/dispatcher_entity_change.go

@@ -19,6 +19,10 @@ package events
 import (
 	"context"
 	"encoding/binary"
+	"reflect"
+	"strings"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/foundation/v2/genext"
 	"github.com/openziti/storage/boltz"
@@ -28,9 +32,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/network"
 	"github.com/pkg/errors"
 	"go.etcd.io/bbolt"
-	"reflect"
-	"strings"
-	"time"
 )
 
 const (

controller/events/dispatcher_entity_counts.go

@@ -17,11 +17,12 @@
 package events
 
 import (
-	"github.com/openziti/ziti/v2/controller/event"
-	"github.com/pkg/errors"
 	"reflect"
 	"strings"
 	"time"
+
+	"github.com/openziti/ziti/v2/controller/event"
+	"github.com/pkg/errors"
 )
 
 func (self *Dispatcher) AddEntityCountEventHandler(handler event.EntityCountEventHandler, interval time.Duration, onlyLeaderEvents bool) {

controller/events/dispatcher_link.go

@@ -17,9 +17,10 @@
 package events
 
 import (
+	"reflect"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddLinkEventHandler(handler event.LinkEventHandler) {

controller/events/dispatcher_metrics.go

@@ -17,13 +17,14 @@
 package events
 
 import (
+	"reflect"
+	"regexp"
+
 	"github.com/google/uuid"
 	"github.com/openziti/metrics/metrics_pb"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/openziti/ziti/v2/controller/network"
 	"github.com/pkg/errors"
-	"reflect"
-	"regexp"
 )
 
 func (self *Dispatcher) AddMetricsEventHandler(handler event.MetricsEventHandler) {

controller/events/dispatcher_router.go

@@ -17,12 +17,13 @@
 package events
 
 import (
+	"reflect"
+	"time"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/openziti/ziti/v2/controller/model"
 	"github.com/openziti/ziti/v2/controller/network"
 	"github.com/pkg/errors"
-	"reflect"
-	"time"
 )
 
 func (self *Dispatcher) AddRouterEventHandler(handler event.RouterEventHandler) {

controller/events/dispatcher_sdk.go

@@ -17,9 +17,10 @@
 package events
 
 import (
+	"reflect"
+
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
 )
 
 func (self *Dispatcher) AddSdkEventHandler(handler event.SdkEventHandler) {

controller/events/dispatcher_service.go

@@ -17,13 +17,14 @@
 package events
 
 import (
+	"reflect"
+	"strings"
+	"time"
+
 	"github.com/openziti/metrics/metrics_pb"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/openziti/ziti/v2/controller/network"
 	"github.com/pkg/errors"
-	"reflect"
-	"strings"
-	"time"
 )
 
 func (self *Dispatcher) AddServiceEventHandler(handler event.ServiceEventHandler) {

controller/events/dispatcher_terminator.go

@@ -17,6 +17,10 @@
 package events
 
 import (
+	"reflect"
+	"strings"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/storage/boltz"
 	"github.com/openziti/ziti/v2/controller/db"
@@ -26,9 +30,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/xt"
 	"github.com/pkg/errors"
 	"go.etcd.io/bbolt"
-	"reflect"
-	"strings"
-	"time"
 )
 
 func (self *Dispatcher) AddTerminatorEventHandler(handler event.TerminatorEventHandler) {

controller/events/dispatcher_usage.go

@@ -18,11 +18,12 @@ package events
 
 import (
 	"fmt"
+	"reflect"
+	"time"
+
 	"github.com/openziti/metrics/metrics_pb"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/pkg/errors"
-	"reflect"
-	"time"
 )
 
 func (self *Dispatcher) AddUsageEventHandler(handler event.UsageEventHandler) {

controller/events/file_logger.go

@@ -18,11 +18,12 @@ package events
 
 import (
 	"fmt"
-	"github.com/natefinch/lumberjack"
-	"github.com/pkg/errors"
 	"io"
 	"os"
 	"strings"
+
+	"github.com/natefinch/lumberjack"
+	"github.com/pkg/errors"
 )
 
 type fabricFormatterFactory struct{}

controller/events/metrics_mappers.go

@@ -17,10 +17,11 @@
 package events
 
 import (
+	"strings"
+
 	"github.com/openziti/metrics/metrics_pb"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/openziti/ziti/v2/controller/network"
-	"strings"
 )
 
 type ctrlChannelMetricsMapper struct{}

controller/events/metrics_test.go

@@ -19,12 +19,13 @@ package events
 import (
 	"encoding/json"
 	"fmt"
-	metrics2 "github.com/openziti/metrics"
-	"github.com/openziti/ziti/v2/controller/event"
-	"github.com/stretchr/testify/require"
 	"regexp"
 	"testing"
 	"time"
+
+	metrics2 "github.com/openziti/metrics"
+	"github.com/openziti/ziti/v2/controller/event"
+	"github.com/stretchr/testify/require"
 )
 
 func Test_ExtractId(t *testing.T) {

controller/handler_ctrl/accept.go

@@ -17,6 +17,8 @@
 package handler_ctrl
 
 import (
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"
@@ -24,7 +26,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/xctrl"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/proto"
-	"time"
 )
 
 type CtrlAccepter struct {

controller/handler_ctrl/circuit_request.go

@@ -17,10 +17,11 @@
 package handler_ctrl
 
 import (
+	"time"
+
 	"github.com/openziti/ziti/v2/controller/model"
 	"github.com/openziti/ziti/v2/controller/xt"
 	"google.golang.org/protobuf/proto"
-	"time"
 
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"

controller/handler_ctrl/create_terminator.go

@@ -18,6 +18,8 @@ package handler_ctrl
 
 import (
 	"fmt"
+	"math"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/handler_common"
@@ -25,7 +27,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/model"
 	"github.com/openziti/ziti/v2/controller/network"
 	"google.golang.org/protobuf/proto"
-	"math"
 )
 
 type createTerminatorHandler struct {

controller/handler_ctrl/link_state.go

@@ -17,6 +17,8 @@
 package handler_ctrl
 
 import (
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"
@@ -24,7 +26,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/model"
 	"github.com/openziti/ziti/v2/controller/network"
 	"google.golang.org/protobuf/proto"
-	"time"
 )
 
 type linkStateHandler struct {

controller/handler_ctrl/metrics.go

@@ -19,9 +19,9 @@ package handler_ctrl
 import (
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
+	"github.com/openziti/metrics/metrics_pb"
 	"github.com/openziti/ziti/v2/controller/event"
 	"github.com/openziti/ziti/v2/controller/network"
-	"github.com/openziti/metrics/metrics_pb"
 	"google.golang.org/protobuf/proto"
 )
 

controller/handler_ctrl/route_result.go

@@ -19,6 +19,7 @@ package handler_ctrl
 import (
 	"bytes"
 	"encoding/binary"
+
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/ctrl_msg"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"

controller/handler_ctrl/update_router_interfaces.go

@@ -18,6 +18,7 @@ package handler_ctrl
 
 import (
 	"fmt"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/handler_common"

controller/handler_ctrl/update_terminator.go

@@ -18,6 +18,8 @@ package handler_ctrl
 
 import (
 	"fmt"
+	"math"
+
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common/handler_common"
 	"github.com/openziti/ziti/v2/common/pb/ctrl_pb"
@@ -28,7 +30,6 @@ import (
 	"github.com/openziti/ziti/v2/controller/xt"
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/proto"
-	"math"
 )
 
 type updateTerminatorHandler struct {

controller/handler_edge_ctrl/create_circuit.go

@@ -18,6 +18,7 @@ package handler_edge_ctrl
 
 import (
 	"fmt"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/sdk-golang/ziti/edge"

controller/handler_edge_ctrl/create_tunnel_terminator.go

@@ -18,6 +18,9 @@ package handler_edge_ctrl
 
 import (
 	"fmt"
+	"math"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/ziti/v2/common"
@@ -29,8 +32,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/proto"
-	"math"
-	"time"
 )
 
 type createTunnelTerminatorHandler struct {

controller/handler_edge_ctrl/create_tunnel_terminator_v2.go

@@ -18,6 +18,9 @@ package handler_edge_ctrl
 
 import (
 	"fmt"
+	"math"
+	"time"
+
 	"github.com/michaelquigley/pfxlog"
 	"github.com/openziti/channel/v4"
 	"github.com/openziti/channel/v4/protobufs"
@@ -30,8 +33,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/protobuf/proto"
-	"math"
-	"time"
 )
 
 type createTunnelTerminatorV2Handler struct {