Format changes

cmd/zrok/testLoopPublic.go

@@ -4,14 +4,6 @@ import (
 	"bytes"
 	"encoding/base64"
 	"fmt"
-	"io"
-	"math/rand"
-	"net/http"
-	"os"
-	"os/signal"
-	"syscall"
-	"time"
-
 	"github.com/go-openapi/runtime"
 	httptransport "github.com/go-openapi/runtime/client"
 	"github.com/openziti/sdk-golang/ziti"
@@ -25,6 +17,13 @@ import (
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"io"
+	"math/rand"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
 )
 
 func init() {

controller/bootstrap.go

@@ -5,16 +5,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/config"
-
 	"github.com/openziti/edge-api/rest_management_api_client/edge_router_policy"
 	"github.com/openziti/edge-api/rest_management_api_client/identity"
 	rest_model_edge "github.com/openziti/edge-api/rest_model"
 	"github.com/openziti/sdk-golang/ziti"
-	ziti_config "github.com/openziti/sdk-golang/ziti"
 	zrok_config "github.com/openziti/zrok/controller/config"
 	"github.com/openziti/zrok/controller/store"
 	"github.com/openziti/zrok/controller/zrokEdgeSdk"
@@ -22,6 +18,7 @@ import (
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func Bootstrap(skipCtrl, skipFrontend bool, inCfg *zrok_config.Config) error {
@@ -140,7 +137,7 @@ func getIdentityId(identityName string) (string, error) {
 	if err != nil {
 		return "", errors.Wrapf(err, "error opening identity '%v' from zrokdir", identityName)
 	}
-	zcfg, err := ziti_config.NewConfigFromFile(zif)
+	zcfg, err := ziti.NewConfigFromFile(zif)
 	if err != nil {
 		return "", errors.Wrapf(err, "error loading ziti config from file '%v'", zif)
 	}

controller/createIdentity.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"bytes"
 	"encoding/json"
-
 	"github.com/go-openapi/runtime/middleware"
 	rest_model_edge "github.com/openziti/edge-api/rest_model"
 	"github.com/openziti/zrok/controller/zrokEdgeSdk"

controller/disable.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/jmoiron/sqlx"
 	"github.com/openziti/edge-api/rest_management_api_client"

controller/gc.go

@@ -3,9 +3,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"strings"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/config"
 	"github.com/openziti/edge-api/rest_management_api_client/service"
@@ -16,6 +13,8 @@ import (
 	"github.com/openziti/zrok/controller/zrokEdgeSdk"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"strings"
+	"time"
 )
 
 func GC(inCfg *zrok_config.Config) error {

controller/startup.go

@@ -3,14 +3,13 @@ package controller
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/config"
 	"github.com/openziti/zrok/controller/zrokEdgeSdk"
 	"github.com/openziti/zrok/model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 var zrokProxyConfigId string

controller/unshare.go

@@ -3,8 +3,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/openziti/edge-api/rest_management_api_client"
 	edge_service "github.com/openziti/edge-api/rest_management_api_client/service"
@@ -14,6 +12,7 @@ import (
 	"github.com/openziti/zrok/rest_server_zrok/operations/share"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 type unshareHandler struct{}

controller/zrokEdgeSdk/client.go

@@ -2,7 +2,6 @@ package zrokEdgeSdk
 
 import (
 	"crypto/x509"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_util"
 )

controller/zrokEdgeSdk/config.go

@@ -3,13 +3,12 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/config"
 	"github.com/openziti/edge-api/rest_model"
 	"github.com/openziti/zrok/model"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func CreateConfig(cfgTypeZId, envZId, shrToken string, authSchemeStr string, authUsers []*model.AuthUser, edge *rest_management_api_client.ZitiEdgeManagement) (cfgZId string, err error) {

controller/zrokEdgeSdk/erp.go

@@ -3,12 +3,11 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/edge_router_policy"
 	rest_model_edge "github.com/openziti/edge-api/rest_model"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func CreateEdgeRouterPolicy(name, zId string, edge *rest_management_api_client.ZitiEdgeManagement) error {

controller/zrokEdgeSdk/identity.go

@@ -3,14 +3,13 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/identity"
 	rest_model_edge "github.com/openziti/edge-api/rest_model"
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/sdk-golang/ziti/enroll"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func CreateEnvironmentIdentity(uniqueToken, accountEmail, envDescription string, edge *rest_management_api_client.ZitiEdgeManagement) (*identity.CreateIdentityCreated, error) {

controller/zrokEdgeSdk/serp.go

@@ -3,13 +3,12 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/service_edge_router_policy"
 	"github.com/openziti/edge-api/rest_model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func CreateShareServiceEdgeRouterPolicy(envZId, shrToken, shrZId string, edge *rest_management_api_client.ZitiEdgeManagement) error {

controller/zrokEdgeSdk/service.go

@@ -3,13 +3,12 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	edge_service "github.com/openziti/edge-api/rest_management_api_client/service"
 	"github.com/openziti/edge-api/rest_model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 func FindShareService(svcZId string, edge *rest_management_api_client.ZitiEdgeManagement) (string, error) {

controller/zrokEdgeSdk/sp.go

@@ -3,13 +3,12 @@ package zrokEdgeSdk
 import (
 	"context"
 	"fmt"
-	"time"
-
 	"github.com/openziti/edge-api/rest_management_api_client"
 	"github.com/openziti/edge-api/rest_management_api_client/service_policy"
 	"github.com/openziti/edge-api/rest_model"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 const (

endpoints/proxy/backend.go

@@ -3,17 +3,16 @@ package proxy
 import (
 	"crypto/tls"
 	"fmt"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/sdk-golang/ziti/edge"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/openziti/zrok/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"time"
 )
 
 type BackendConfig struct {

endpoints/proxy/frontend.go

@@ -3,12 +3,6 @@ package proxy
 import (
 	"context"
 	"fmt"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/openziti/zrok/endpoints/publicProxy/notFoundUi"
@@ -17,6 +11,11 @@ import (
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"time"
 )
 
 type FrontendConfig struct {

endpoints/proxy/webBackend.go

@@ -2,13 +2,12 @@ package proxy
 
 import (
 	"fmt"
-	"net/http"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/sdk-golang/ziti/edge"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/pkg/errors"
+	"net/http"
+	"time"
 )
 
 type WebBackendConfig struct {

endpoints/publicProxy/http.go

@@ -3,12 +3,6 @@ package publicProxy
 import (
 	"context"
 	"fmt"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/openziti/zrok/endpoints/publicProxy/healthUi"
@@ -18,6 +12,11 @@ import (
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"net/http"
+	"net/http/httputil"
+	"net/url"
+	"strings"
 )
 
 type httpFrontend struct {

endpoints/tcpTunnel/backend.go

@@ -1,14 +1,13 @@
 package tcpTunnel
 
 import (
-	"net"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/sdk-golang/ziti/edge"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"time"
 )
 
 type BackendConfig struct {

endpoints/tcpTunnel/frontend.go

@@ -1,15 +1,14 @@
 package tcpTunnel
 
 import (
-	"net"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/openziti/zrok/model"
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"time"
 )
 
 type FrontendConfig struct {

endpoints/udpTunnel/backend.go

@@ -1,14 +1,13 @@
 package udpTunnel
 
 import (
-	"net"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/sdk-golang/ziti/edge"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"time"
 )
 
 type BackendConfig struct {

endpoints/udpTunnel/frontend.go

@@ -1,16 +1,15 @@
 package udpTunnel
 
 import (
-	"net"
-	"sync"
-	"time"
-
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/openziti/zrok/endpoints"
 	"github.com/openziti/zrok/model"
 	"github.com/openziti/zrok/zrokdir"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
+	"net"
+	"sync"
+	"time"
 )
 
 type FrontendConfig struct {

endpoints/util.go

@@ -1,12 +1,11 @@
 package endpoints
 
 import (
-	"net/url"
-	"strings"
-
 	"github.com/openziti/edge-api/rest_model"
 	"github.com/openziti/sdk-golang/ziti"
 	"github.com/sirupsen/logrus"
+	"net/url"
+	"strings"
 )
 
 func GetRefreshedService(name string, ctx ziti.Context) (*rest_model.ServiceDetail, bool) {