extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-07 08:44:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format changes

Browse Source
This commit is contained in:
Cam Otts 2023-05-25 13:59:39 -05:00
parent d6d5ac65a3
commit fec0fd9e73
No known key found for this signature in database
GPG Key ID: 367B7C7EBD84A8BD
23 changed files with 46 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/zrok/testLoopPublic.go
View File

@ -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() {

7
controller/bootstrap.go
View File

@ -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)
}

1
controller/createIdentity.go
View File

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

1
controller/disable.go
View File

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

5
controller/gc.go
View File

@ -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 {

3
controller/startup.go
View File

@ -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

3
controller/unshare.go
View File

@ -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{}

1
controller/zrokEdgeSdk/client.go
View File

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

3
controller/zrokEdgeSdk/config.go
View File

@ -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) {

3
controller/zrokEdgeSdk/erp.go
View File

@ -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 {

3
controller/zrokEdgeSdk/identity.go
View File

@ -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) {

3
controller/zrokEdgeSdk/serp.go
View File

@ -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 {

3
controller/zrokEdgeSdk/service.go
View File

@ -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) {

3
controller/zrokEdgeSdk/sp.go
View File

@ -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 (

9
endpoints/proxy/backend.go
View File

@ -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 {

11
endpoints/proxy/frontend.go
View File

@ -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 {

5
endpoints/proxy/webBackend.go
View File

@ -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 {

11
endpoints/publicProxy/http.go
View File

@ -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 {

5
endpoints/tcpTunnel/backend.go
View File

@ -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 {

5
endpoints/tcpTunnel/frontend.go
View File

@ -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 {

5
endpoints/udpTunnel/backend.go
View File

@ -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 {

7
endpoints/udpTunnel/frontend.go
View File

@ -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 {

5
endpoints/util.go
View File

@ -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) {