extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-12-22 14:50:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

let's try embracing more camel case

Browse Source
This commit is contained in:
Michael Quigley 2022-12-14 14:40:45 -05:00
parent 856cf45ddc
commit 65ff0f4f23
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
57 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zrok/access_private.go → cmd/zrok/accessPrivate.go
View File

@ -3,7 +3,7 @@ package main
import (
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints/private_frontend"
"github.com/openziti-test-kitchen/zrok/endpoints/privateFrontend"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/service"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
@ -78,7 +78,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
}
logrus.Infof("allocated frontend '%v'", accessResp.Payload.FrontendToken)
cfg := private_frontend.DefaultConfig("backend")
cfg := privateFrontend.DefaultConfig("backend")
cfg.SvcToken = svcToken
cfg.Address = cmd.bindAddress
@ -90,7 +90,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
os.Exit(0)
}()
frontend, err := private_frontend.NewHTTP(cfg)
frontend, err := privateFrontend.NewHTTP(cfg)
if err != nil {
if !panicInstead {
showError("unable to create private frontend", err)

6
cmd/zrok/access_public.go → cmd/zrok/accessPublic.go
View File

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/endpoints/public_frontend"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)
@ -29,7 +29,7 @@ func newAccessPublicCommand() *accessPublicCommand {
}
func (self *accessPublicCommand) run(_ *cobra.Command, args []string) {
cfg := public_frontend.DefaultConfig()
cfg := publicFrontend.DefaultConfig()
if len(args) == 1 {
if err := cfg.Load(args[0]); err != nil {
if !panicInstead {
@ -39,7 +39,7 @@ func (self *accessPublicCommand) run(_ *cobra.Command, args []string) {
}
}
logrus.Infof(cf.Dump(cfg, cf.DefaultOptions()))
frontend, err := public_frontend.NewHTTP(cfg)
frontend, err := publicFrontend.NewHTTP(cfg)
if err != nil {
if !panicInstead {
showError("unable to create http frontend", err)

0
cmd/zrok/admin_bootstrap.go → cmd/zrok/adminBootstrap.go
View File

0
cmd/zrok/admin_create_frontend.go → cmd/zrok/adminCreateFrontend.go
View File

0
cmd/zrok/admin_create_identity.go → cmd/zrok/adminCreateIdentity.go
View File

0
cmd/zrok/admin_delete_frontend.go → cmd/zrok/adminDeleteFrontend.go
View File

0
cmd/zrok/admin_gc.go → cmd/zrok/adminGc.go
View File

0
cmd/zrok/admin_list_frontends.go → cmd/zrok/adminListFrontends.go
View File

0
cmd/zrok/admin_update_frontend.go → cmd/zrok/adminUpdateFrontend.go
View File

2
cmd/zrok/endpoint_ui/embed.go → cmd/zrok/endpointUi/embed.go
View File

@ -1,4 +1,4 @@
package endpoint_ui
package endpointUi
import "embed"

0
cmd/zrok/endpoint_ui/index.gohtml → cmd/zrok/endpointUi/index.gohtml
View File

16
cmd/zrok/share_private.go → cmd/zrok/sharePrivate.go
View File

@ -5,8 +5,8 @@ import (
ui "github.com/gizak/termui/v3"
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints/proxy_backend"
"github.com/openziti-test-kitchen/zrok/endpoints/web_backend"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/endpoints/webBackend"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/service"
@ -133,7 +133,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
switch cmd.backendMode {
case "proxy":
cfg := &proxy_backend.Config{
cfg := &proxyBackend.Config{
IdentityPath: zif,
EndpointAddress: target,
Service: resp.Payload.SvcToken,
@ -148,7 +148,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
}
case "web":
cfg := &web_backend.Config{
cfg := &webBackend.Config{
IdentityPath: zif,
WebRoot: target,
Service: resp.Payload.SvcToken,
@ -174,8 +174,8 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
}
}
func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxy_backend.Config) (backendHandler, error) {
be, err := proxy_backend.NewBackend(cfg)
func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxyBackend.Config) (backendHandler, error) {
be, err := proxyBackend.NewBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
@ -189,8 +189,8 @@ func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxy_backend.Config) (bac
return be, nil
}
func (cmd *sharePrivateCommand) webBackendMode(cfg *web_backend.Config) (backendHandler, error) {
be, err := web_backend.NewBackend(cfg)
func (cmd *sharePrivateCommand) webBackendMode(cfg *webBackend.Config) (backendHandler, error) {
be, err := webBackend.NewBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http web backend")
}

16
cmd/zrok/share_public.go → cmd/zrok/sharePublic.go
View File

@ -7,8 +7,8 @@ import (
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
tb "github.com/nsf/termbox-go"
"github.com/openziti-test-kitchen/zrok/endpoints/proxy_backend"
"github.com/openziti-test-kitchen/zrok/endpoints/web_backend"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/endpoints/webBackend"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/service"
@ -154,7 +154,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
var bh backendHandler
switch cmd.backendMode {
case "proxy":
cfg := &proxy_backend.Config{
cfg := &proxyBackend.Config{
IdentityPath: zif,
EndpointAddress: target,
Service: resp.Payload.SvcToken,
@ -169,7 +169,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
}
case "web":
cfg := &web_backend.Config{
cfg := &webBackend.Config{
IdentityPath: zif,
WebRoot: target,
Service: resp.Payload.SvcToken,
@ -256,8 +256,8 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
}
}
func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxy_backend.Config) (backendHandler, error) {
be, err := proxy_backend.NewBackend(cfg)
func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxyBackend.Config) (backendHandler, error) {
be, err := proxyBackend.NewBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
@ -271,8 +271,8 @@ func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxy_backend.Config) (back
return be, nil
}
func (cmd *sharePublicCommand) webBackendMode(cfg *web_backend.Config) (backendHandler, error) {
be, err := web_backend.NewBackend(cfg)
func (cmd *sharePublicCommand) webBackendMode(cfg *webBackend.Config) (backendHandler, error) {
be, err := webBackend.NewBackend(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http web backend")
}

6
cmd/zrok/share_reserved.go → cmd/zrok/shareReserved.go
View File

@ -3,7 +3,7 @@ package main
import (
ui "github.com/gizak/termui/v3"
httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints/proxy_backend"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/service"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir"
@ -91,7 +91,7 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
}
panic(err)
}
cfg := &proxy_backend.Config{
cfg := &proxyBackend.Config{
IdentityPath: zif,
EndpointAddress: targetEndpoint,
Service: svcToken,
@ -115,7 +115,7 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
logrus.Infof("using existing backend proxy endpoint: %v", targetEndpoint)
}
httpProxy, err := proxy_backend.NewBackend(cfg)
httpProxy, err := proxyBackend.NewBackend(cfg)
if err != nil {
ui.Close()
if !panicInstead {

4
cmd/zrok/test_endpoint.go → cmd/zrok/testEndpoint.go
View File

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/opentracing/opentracing-go/log"
"github.com/openziti-test-kitchen/zrok/cmd/zrok/endpoint_ui"
"github.com/openziti-test-kitchen/zrok/cmd/zrok/endpointUi"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"html/template"
@ -31,7 +31,7 @@ func newTestEndpointCommand() *testEndpointCommand {
}
command := &testEndpointCommand{cmd: cmd}
var err error
if command.t, err = template.ParseFS(endpoint_ui.FS, "index.gohtml"); err != nil {
if command.t, err = template.ParseFS(endpointUi.FS, "index.gohtml"); err != nil {
if !panicInstead {
showError("unable to parse index template", err)
}

4
controller/access.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/service"
"github.com/openziti/edge/rest_management_api_client"
@ -96,7 +96,7 @@ func (h *accessHandler) Handle(params service.AccessParams, principal *rest_mode
}
func createServicePolicyDialForEnvironment(envZId, svcToken, svcZId string, edge *rest_management_api_client.ZitiEdgeManagement, tags ...*rest_model.Tags) error {
allTags := zrok_edge_sdk.ZrokServiceTags(svcToken)
allTags := zrokEdgeSdk.ZrokServiceTags(svcToken)
for _, t := range tags {
for k, v := range t.SubTags {
allTags.SubTags[k] = v

16
controller/bootstrap.go
View File

@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/edge/rest_management_api_client"
@ -196,13 +196,13 @@ func assertIdentity(zId string, edge *rest_management_api_client.ZitiEdgeManagem
}
func bootstrapIdentity(name string, edge *rest_management_api_client.ZitiEdgeManagement) (string, error) {
idc, err := zrok_edge_sdk.CreateIdentity(name, rest_model_edge.IdentityTypeDevice, nil, edge)
idc, err := zrokEdgeSdk.CreateIdentity(name, rest_model_edge.IdentityTypeDevice, nil, edge)
if err != nil {
return "", errors.Wrapf(err, "error creating '%v' identity", name)
}
zId := idc.Payload.Data.ID
cfg, err := zrok_edge_sdk.EnrollIdentity(zId, edge)
cfg, err := zrokEdgeSdk.EnrollIdentity(zId, edge)
if err != nil {
return "", errors.Wrapf(err, "error enrolling '%v' identity", name)
}
@ -236,7 +236,7 @@ func assertErpForIdentity(name, zId string, edge *rest_management_api_client.Zit
}
if len(listResp.Payload.Data) != 1 {
logrus.Infof("creating erp for '%v' (%v)", name, zId)
if err := zrok_edge_sdk.CreateEdgeRouterPolicy(name, zId, edge); err != nil {
if err := zrokEdgeSdk.CreateEdgeRouterPolicy(name, zId, edge); err != nil {
return errors.Wrapf(err, "error creating erp for '%v' (%v)", name, zId)
}
}
@ -261,7 +261,7 @@ func assertMetricsService(cfg *Config, edge *rest_management_api_client.ZitiEdge
var svcZId string
if len(listResp.Payload.Data) != 1 {
logrus.Infof("creating '%v' service", cfg.Metrics.ServiceName)
svcZId, err = zrok_edge_sdk.CreateService("metrics", nil, nil, edge)
svcZId, err = zrokEdgeSdk.CreateService("metrics", nil, nil, edge)
if err != nil {
return "", errors.Wrapf(err, "error creating '%v' service", cfg.Metrics.ServiceName)
}
@ -289,7 +289,7 @@ func assertMetricsSerp(metricsSvcZId string, cfg *Config, edge *rest_management_
}
if len(listResp.Payload.Data) != 1 {
logrus.Infof("creating '%v' serp", cfg.Metrics.ServiceName)
_, err := zrok_edge_sdk.CreateServiceEdgeRouterPolicy(cfg.Metrics.ServiceName, metricsSvcZId, nil, edge)
_, err := zrokEdgeSdk.CreateServiceEdgeRouterPolicy(cfg.Metrics.ServiceName, metricsSvcZId, nil, edge)
if err != nil {
return errors.Wrapf(err, "error creating '%v' serp", cfg.Metrics.ServiceName)
}
@ -314,7 +314,7 @@ func assertCtrlMetricsBind(ctrlZId, metricsSvcZId string, edge *rest_management_
}
if len(listResp.Payload.Data) != 1 {
logrus.Info("creating 'ctrl-metrics-bind' service policy")
if err := zrok_edge_sdk.CreateNamedBindServicePolicy("ctrl-metrics-bind", metricsSvcZId, ctrlZId, edge, zrok_edge_sdk.ZrokTags()); err != nil {
if err := zrokEdgeSdk.CreateNamedBindServicePolicy("ctrl-metrics-bind", metricsSvcZId, ctrlZId, edge, zrokEdgeSdk.ZrokTags()); err != nil {
return errors.Wrap(err, "error creating 'ctrl-metrics-bind' service policy")
}
}
@ -338,7 +338,7 @@ func assertFrontendMetricsDial(frontendZId, metricsSvcZId string, edge *rest_man
}
if len(listResp.Payload.Data) != 1 {
logrus.Info("creating 'frontend-metrics-dial' service policy")
if err := zrok_edge_sdk.CreateNamedDialServicePolicy("frontend-metrics-dial", metricsSvcZId, frontendZId, edge, zrok_edge_sdk.ZrokTags()); err != nil {
if err := zrokEdgeSdk.CreateNamedDialServicePolicy("frontend-metrics-dial", metricsSvcZId, frontendZId, edge, zrokEdgeSdk.ZrokTags()); err != nil {
return errors.Wrap(err, "error creating 'frontend-metrics-dial' service policy")
}
}

4
controller/create_frontend.go → controller/createFrontend.go
View File

@ -3,7 +3,7 @@ package controller
import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus"
@ -28,7 +28,7 @@ func (h *createFrontendHandler) Handle(params admin.CreateFrontendParams, princi
}
zId := params.Body.ZID
detail, err := zrok_edge_sdk.GetIdentity(zId, client)
detail, err := zrokEdgeSdk.GetIdentity(zId, client)
if err != nil {
logrus.Errorf("error getting identity details for '%v': %v", zId, err)
return admin.NewCreateFrontendInternalServerError()

10
controller/create_identity.go → controller/createIdentity.go
View File

@ -5,7 +5,7 @@ import (
"encoding/json"
"fmt"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin"
"github.com/openziti/edge/rest_management_api_client/service"
@ -34,20 +34,20 @@ func (h *createIdentityHandler) Handle(params admin.CreateIdentityParams, princi
return admin.NewCreateIdentityInternalServerError()
}
idc, err := zrok_edge_sdk.CreateIdentity(name, rest_model_edge.IdentityTypeService, nil, edge)
idc, err := zrokEdgeSdk.CreateIdentity(name, rest_model_edge.IdentityTypeService, nil, edge)
if err != nil {
logrus.Errorf("error creating identity: %v", err)
return admin.NewCreateIdentityInternalServerError()
}
zId := idc.Payload.Data.ID
idCfg, err := zrok_edge_sdk.EnrollIdentity(zId, edge)
idCfg, err := zrokEdgeSdk.EnrollIdentity(zId, edge)
if err != nil {
logrus.Errorf("error enrolling identity: %v", err)
return admin.NewCreateIdentityInternalServerError()
}
if err := zrok_edge_sdk.CreateEdgeRouterPolicy(name, zId, edge); err != nil {
if err := zrokEdgeSdk.CreateEdgeRouterPolicy(name, zId, edge); err != nil {
logrus.Errorf("error creating edge router policy for identity: %v", err)
return admin.NewCreateIdentityInternalServerError()
}
@ -73,7 +73,7 @@ func (h *createIdentityHandler) Handle(params admin.CreateIdentityParams, princi
svcZId := *listSvcResp.Payload.Data[0].ID
spName := fmt.Sprintf("%v-%v-dial", name, cfg.Metrics.ServiceName)
if err := zrok_edge_sdk.CreateNamedDialServicePolicy(spName, svcZId, zId, edge); err != nil {
if err := zrokEdgeSdk.CreateNamedDialServicePolicy(spName, svcZId, zId, edge); err != nil {
logrus.Errorf("error creating named dial service policy '%v': %v", spName, err)
return admin.NewCreateIdentityInternalServerError()
}

0
controller/delete_frontend.go → controller/deleteFrontend.go
View File

16
controller/disable.go
View File

@ -3,7 +3,7 @@ package controller
import (
"github.com/go-openapi/runtime/middleware"
"github.com/jmoiron/sqlx"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/environment"
"github.com/openziti/edge/rest_management_api_client"
@ -48,11 +48,11 @@ func (h *disableHandler) Handle(params environment.DisableParams, principal *res
logrus.Errorf("error removing environment: %v", err)
return environment.NewDisableInternalServerError()
}
if err := zrok_edge_sdk.DeleteEdgeRouterPolicy(env.ZId, edge); err != nil {
if err := zrokEdgeSdk.DeleteEdgeRouterPolicy(env.ZId, edge); err != nil {
logrus.Errorf("error deleting edge router policy: %v", err)
return environment.NewDisableInternalServerError()
}
if err := zrok_edge_sdk.DeleteIdentity(params.Body.Identity, edge); err != nil {
if err := zrokEdgeSdk.DeleteIdentity(params.Body.Identity, edge); err != nil {
logrus.Errorf("error deleting identity: %v", err)
return environment.NewDisableInternalServerError()
}
@ -87,19 +87,19 @@ func (h *disableHandler) removeServicesForEnvironment(envId int, tx *sqlx.Tx, ed
for _, svc := range svcs {
svcToken := svc.Token
logrus.Infof("garbage collecting service '%v' for environment '%v'", svcToken, env.ZId)
if err := zrok_edge_sdk.DeleteServiceEdgeRouterPolicy(env.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy(env.ZId, svcToken, edge); err != nil {
logrus.Error(err)
}
if err := zrok_edge_sdk.DeleteServicePolicyDial(env.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyDial(env.ZId, svcToken, edge); err != nil {
logrus.Error(err)
}
if err := zrok_edge_sdk.DeleteServicePolicyBind(env.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyBind(env.ZId, svcToken, edge); err != nil {
logrus.Error(err)
}
if err := zrok_edge_sdk.DeleteConfig(env.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteConfig(env.ZId, svcToken, edge); err != nil {
logrus.Error(err)
}
if err := zrok_edge_sdk.DeleteService(env.ZId, svc.ZId, edge); err != nil {
if err := zrokEdgeSdk.DeleteService(env.ZId, svc.ZId, edge); err != nil {
logrus.Error(err)
}
logrus.Infof("removed service '%v' for environment '%v'", svc.Token, env.ZId)

2
controller/email_ui/embed.go → controller/emailUi/embed.go
View File

@ -1,4 +1,4 @@
package email_ui
package emailUi
import "embed"

0
controller/email_ui/verify.gohtml → controller/emailUi/verify.gohtml
View File

0
controller/email_ui/verify.gotext → controller/emailUi/verify.gotext
View File

8
controller/enable.go
View File

@ -5,7 +5,7 @@ import (
"encoding/json"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/environment"
"github.com/sirupsen/logrus"
@ -36,18 +36,18 @@ func (h *enableHandler) Handle(params environment.EnableParams, principal *rest_
logrus.Errorf("error creating account token: %v", err)
return environment.NewEnableInternalServerError()
}
ident, err := zrok_edge_sdk.CreateEnvironmentIdentity(principal.Email, accountToken, client)
ident, err := zrokEdgeSdk.CreateEnvironmentIdentity(principal.Email, accountToken, client)
if err != nil {
logrus.Error(err)
return environment.NewEnableInternalServerError()
}
envZId := ident.Payload.Data.ID
cfg, err := zrok_edge_sdk.EnrollIdentity(envZId, client)
cfg, err := zrokEdgeSdk.EnrollIdentity(envZId, client)
if err != nil {
logrus.Error(err)
return environment.NewEnableInternalServerError()
}
if err := zrok_edge_sdk.CreateEdgeRouterPolicy(envZId, envZId, client); err != nil {
if err := zrokEdgeSdk.CreateEdgeRouterPolicy(envZId, envZId, client); err != nil {
logrus.Error(err)
return environment.NewEnableInternalServerError()
}

18
controller/gc.go
View File

@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/edge/rest_management_api_client/service"
@ -72,19 +72,19 @@ func gcServices(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map
for _, svc := range listResp.Payload.Data {
if _, found := liveMap[*svc.Name]; !found {
logrus.Infof("garbage collecting, zitiSvcId='%v', zrokSvcId='%v'", *svc.ID, *svc.Name)
if err := zrok_edge_sdk.DeleteServiceEdgeRouterPolicy("gc", *svc.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy("gc", *svc.Name, edge); err != nil {
logrus.Errorf("error garbage collecting service edge router policy: %v", err)
}
if err := zrok_edge_sdk.DeleteServicePolicyDial("gc", *svc.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyDial("gc", *svc.Name, edge); err != nil {
logrus.Errorf("error garbage collecting service dial policy: %v", err)
}
if err := zrok_edge_sdk.DeleteServicePolicyBind("gc", *svc.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyBind("gc", *svc.Name, edge); err != nil {
logrus.Errorf("error garbage collecting service bind policy: %v", err)
}
if err := zrok_edge_sdk.DeleteConfig("gc", *svc.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteConfig("gc", *svc.Name, edge); err != nil {
logrus.Errorf("error garbage collecting config: %v", err)
}
if err := zrok_edge_sdk.DeleteService("gc", *svc.ID, edge); err != nil {
if err := zrokEdgeSdk.DeleteService("gc", *svc.ID, edge); err != nil {
logrus.Errorf("error garbage collecting service: %v", err)
}
} else {
@ -109,7 +109,7 @@ func gcServiceEdgeRouterPolicies(edge *rest_management_api_client.ZitiEdgeManage
for _, serp := range listResp.Payload.Data {
if _, found := liveMap[*serp.Name]; !found {
logrus.Infof("garbage collecting, svcId='%v'", *serp.Name)
if err := zrok_edge_sdk.DeleteServiceEdgeRouterPolicy("gc", *serp.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy("gc", *serp.Name, edge); err != nil {
logrus.Errorf("error garbage collecting service edge router policy: %v", err)
}
} else {
@ -136,7 +136,7 @@ func gcServicePolicies(edge *rest_management_api_client.ZitiEdgeManagement, live
if _, found := liveMap[spName]; !found {
logrus.Infof("garbage collecting, svcId='%v'", spName)
deleteFilter := fmt.Sprintf("id=\"%v\"", *sp.ID)
if err := zrok_edge_sdk.DeleteServicePolicy("gc", deleteFilter, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicy("gc", deleteFilter, edge); err != nil {
logrus.Errorf("error garbage collecting service policy: %v", err)
}
} else {
@ -160,7 +160,7 @@ func gcConfigs(edge *rest_management_api_client.ZitiEdgeManagement, liveMap map[
if listResp, err := edge.Config.ListConfigs(listReq, nil); err == nil {
for _, c := range listResp.Payload.Data {
if _, found := liveMap[*c.Name]; !found {
if err := zrok_edge_sdk.DeleteConfig("gc", *c.Name, edge); err != nil {
if err := zrokEdgeSdk.DeleteConfig("gc", *c.Name, edge); err != nil {
logrus.Errorf("error garbage collecting config: %v", err)
}
} else {

0
controller/get_service.go → controller/getService.go
View File

0
controller/list_frontends.go → controller/listFrontends.go
View File

10
controller/share_private.go → controller/sharePrivate.go
View File

@ -1,7 +1,7 @@
package controller
import (
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/service"
"github.com/openziti/edge/rest_management_api_client"
@ -18,21 +18,21 @@ func (a *privateResourceAllocator) allocate(envZId, svcToken string, params serv
for _, authUser := range params.Body.AuthUsers {
authUsers = append(authUsers, &model.AuthUser{authUser.Username, authUser.Password})
}
cfgId, err := zrok_edge_sdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
cfgId, err := zrokEdgeSdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
if err != nil {
return "", nil, err
}
svcZId, err = zrok_edge_sdk.CreateShareService(envZId, svcToken, cfgId, edge)
svcZId, err = zrokEdgeSdk.CreateShareService(envZId, svcToken, cfgId, edge)
if err != nil {
return "", nil, err
}
if err := zrok_edge_sdk.CreateServicePolicyBind(envZId, svcToken, svcZId, edge); err != nil {
if err := zrokEdgeSdk.CreateServicePolicyBind(envZId, svcToken, svcZId, edge); err != nil {
return "", nil, err
}
if err := zrok_edge_sdk.CreateShareServiceEdgeRouterPolicy(envZId, svcToken, svcZId, edge); err != nil {
if err := zrokEdgeSdk.CreateShareServiceEdgeRouterPolicy(envZId, svcToken, svcZId, edge); err != nil {
return "", nil, err
}

12
controller/share_public.go → controller/sharePublic.go
View File

@ -1,7 +1,7 @@
package controller
import (
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/service"
"github.com/openziti/edge/rest_management_api_client"
@ -18,25 +18,25 @@ func (a *publicResourceAllocator) allocate(envZId, svcToken string, frontendZIds
for _, authUser := range params.Body.AuthUsers {
authUsers = append(authUsers, &model.AuthUser{authUser.Username, authUser.Password})
}
cfgId, err := zrok_edge_sdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
cfgId, err := zrokEdgeSdk.CreateConfig(zrokProxyConfigId, envZId, svcToken, params.Body.AuthScheme, authUsers, edge)
if err != nil {
return "", nil, err
}
svcZId, err = zrok_edge_sdk.CreateShareService(envZId, svcToken, cfgId, edge)
svcZId, err = zrokEdgeSdk.CreateShareService(envZId, svcToken, cfgId, edge)
if err != nil {
return "", nil, err
}
if err := zrok_edge_sdk.CreateServicePolicyBind(envZId, svcToken, svcZId, edge); err != nil {
if err := zrokEdgeSdk.CreateServicePolicyBind(envZId, svcToken, svcZId, edge); err != nil {
return "", nil, err
}
if err := zrok_edge_sdk.CreateServicePolicyDial(envZId, svcToken, svcZId, frontendZIds, edge); err != nil {
if err := zrokEdgeSdk.CreateServicePolicyDial(envZId, svcToken, svcZId, frontendZIds, edge); err != nil {
return "", nil, err
}
if err := zrok_edge_sdk.CreateShareServiceEdgeRouterPolicy(envZId, svcToken, svcZId, edge); err != nil {
if err := zrokEdgeSdk.CreateShareServiceEdgeRouterPolicy(envZId, svcToken, svcZId, edge); err != nil {
return "", nil, err
}

4
controller/unaccess.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/service"
"github.com/pkg/errors"
@ -70,7 +70,7 @@ func (h *unaccessHandler) Handle(params service.UnaccessParams, principal *rest_
return service.NewUnaccessNotFound()
}
if err := zrok_edge_sdk.DeleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceToken=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", svcToken, feToken), edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicy(envZId, fmt.Sprintf("tags.zrokServiceToken=\"%v\" and tags.zrokFrontendToken=\"%v\" and type=1", svcToken, feToken), edge); err != nil {
logrus.Errorf("error removing access to '%v' for '%v': %v", svcToken, envZId, err)
return service.NewUnaccessInternalServerError()
}

12
controller/unshare.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrok_edge_sdk"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/service"
"github.com/openziti/edge/rest_management_api_client"
@ -123,19 +123,19 @@ func (h *unshareHandler) findServiceZId(svcToken string, edge *rest_management_a
}
func (h *unshareHandler) deallocateResources(senv *store.Environment, svcToken, svcZId string, edge *rest_management_api_client.ZitiEdgeManagement) error {
if err := zrok_edge_sdk.DeleteServiceEdgeRouterPolicy(senv.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServiceEdgeRouterPolicy(senv.ZId, svcToken, edge); err != nil {
return err
}
if err := zrok_edge_sdk.DeleteServicePolicyDial(senv.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyDial(senv.ZId, svcToken, edge); err != nil {
return err
}
if err := zrok_edge_sdk.DeleteServicePolicyBind(senv.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteServicePolicyBind(senv.ZId, svcToken, edge); err != nil {
return err
}
if err := zrok_edge_sdk.DeleteConfig(senv.ZId, svcToken, edge); err != nil {
if err := zrokEdgeSdk.DeleteConfig(senv.ZId, svcToken, edge); err != nil {
return err
}
if err := zrok_edge_sdk.DeleteService(senv.ZId, svcZId, edge); err != nil {
if err := zrokEdgeSdk.DeleteService(senv.ZId, svcZId, edge); err != nil {
return err
}
return nil

0
controller/update_frontend.go → controller/updateFrontend.go
View File

0
controller/update_share.go → controller/updateShare.go
View File

4
controller/verify_email.go → controller/verifyEmail.go
View File

@ -2,7 +2,7 @@ package controller
import (
"bytes"
"github.com/openziti-test-kitchen/zrok/controller/email_ui"
"github.com/openziti-test-kitchen/zrok/controller/emailUi"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/wneessen/go-mail"
@ -63,7 +63,7 @@ func sendVerificationEmail(emailAddress, token string) error {
}
func mergeTemplate(emailData *verificationEmail, filename string) (string, error) {
t, err := template.ParseFS(email_ui.FS, filename)
t, err := template.ParseFS(emailUi.FS, filename)
if err != nil {
return "", errors.Wrapf(err, "error parsing verification email template '%v'", filename)
}

2
controller/zrok_edge_sdk/config.go → controller/zrokEdgeSdk/config.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/erp.go → controller/zrokEdgeSdk/erp.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/identity.go → controller/zrokEdgeSdk/identity.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/serp.go → controller/zrokEdgeSdk/serp.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/service.go → controller/zrokEdgeSdk/service.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/sp.go → controller/zrokEdgeSdk/sp.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"context"

2
controller/zrok_edge_sdk/tags.go → controller/zrokEdgeSdk/tags.go
View File

@ -1,4 +1,4 @@
package zrok_edge_sdk
package zrokEdgeSdk
import (
"github.com/openziti-test-kitchen/zrok/build"

2
endpoints/private_frontend/config.go → endpoints/privateFrontend/config.go
View File

@ -1,4 +1,4 @@
package private_frontend
package privateFrontend
type Config struct {
IdentityName string

4
endpoints/private_frontend/http.go → endpoints/privateFrontend/http.go
View File

@ -1,10 +1,10 @@
package private_frontend
package privateFrontend
import (
"context"
"fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/public_frontend/notfound_ui"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/notfound_ui"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"

2
endpoints/proxy_backend/http.go → endpoints/proxyBackend/http.go
View File

@ -1,4 +1,4 @@
package proxy_backend
package proxyBackend
import (
"context"

2
endpoints/proxy_backend/metricsconn.go → endpoints/proxyBackend/metricsconn.go
View File

@ -1,4 +1,4 @@
package proxy_backend
package proxyBackend
import (
"net"

2
endpoints/public_frontend/config.go → endpoints/publicFrontend/config.go
View File

@ -1,4 +1,4 @@
package public_frontend
package publicFrontend
import (
"github.com/michaelquigley/cf"

0
endpoints/public_frontend/health_ui/embed.go → endpoints/publicFrontend/health_ui/embed.go
View File

0
endpoints/public_frontend/health_ui/handler.go → endpoints/publicFrontend/health_ui/handler.go
View File

0
endpoints/public_frontend/health_ui/index.html → endpoints/publicFrontend/health_ui/index.html
View File

6
endpoints/public_frontend/http.go → endpoints/publicFrontend/http.go
View File

@ -1,11 +1,11 @@
package public_frontend
package publicFrontend
import (
"context"
"fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/public_frontend/health_ui"
"github.com/openziti-test-kitchen/zrok/endpoints/public_frontend/notfound_ui"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/health_ui"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/notfound_ui"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"

2
endpoints/public_frontend/metrics.go → endpoints/publicFrontend/metrics.go
View File

@ -1,4 +1,4 @@
package public_frontend
package publicFrontend
import (
"github.com/openziti-test-kitchen/zrok/model"

2
endpoints/public_frontend/metricsconn.go → endpoints/publicFrontend/metricsconn.go
View File

@ -1,4 +1,4 @@
package public_frontend
package publicFrontend
import (
"net"

0
endpoints/public_frontend/notfound_ui/embed.go → endpoints/publicFrontend/notfound_ui/embed.go
View File

0
endpoints/public_frontend/notfound_ui/handler.go → endpoints/publicFrontend/notfound_ui/handler.go
View File

0
endpoints/public_frontend/notfound_ui/index.html → endpoints/publicFrontend/notfound_ui/index.html
View File

2
endpoints/web_backend/web.go → endpoints/webBackend/web.go
View File

@ -1,4 +1,4 @@
package web_backend
package webBackend
import (
"github.com/openziti/sdk-golang/ziti"