diff --git a/cmd/zrok/accessPrivate.go b/cmd/zrok/accessPrivate.go index 9184d034..d9afbc77 100644 --- a/cmd/zrok/accessPrivate.go +++ b/cmd/zrok/accessPrivate.go @@ -5,7 +5,7 @@ import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" "github.com/openziti/zrok/endpoints" - "github.com/openziti/zrok/endpoints/privateFrontend" + "github.com/openziti/zrok/endpoints/proxyFrontend" "github.com/openziti/zrok/rest_client_zrok" "github.com/openziti/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_model_zrok" @@ -85,7 +85,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) { } logrus.Infof("allocated frontend '%v'", accessResp.Payload.FrontendToken) - cfg := privateFrontend.DefaultConfig("backend") + cfg := proxyFrontend.DefaultConfig("backend") cfg.ShrToken = shrToken cfg.Address = cmd.bindAddress cfg.RequestsChan = make(chan *endpoints.Request, 1024) @@ -98,7 +98,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) { os.Exit(0) }() - frontend, err := privateFrontend.NewHTTP(cfg) + frontend, err := proxyFrontend.NewHTTP(cfg) if err != nil { if !panicInstead { tui.Error("unable to create private frontend", err) diff --git a/cmd/zrok/accessPublic.go b/cmd/zrok/accessPublic.go index a05743f6..1198cab3 100644 --- a/cmd/zrok/accessPublic.go +++ b/cmd/zrok/accessPublic.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/michaelquigley/cf" - "github.com/openziti/zrok/endpoints/publicFrontend" + "github.com/openziti/zrok/endpoints/publicProxyFrontend" "github.com/openziti/zrok/tui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -33,7 +33,7 @@ func newAccessPublicCommand() *accessPublicCommand { } func (cmd *accessPublicCommand) run(_ *cobra.Command, args []string) { - cfg := publicFrontend.DefaultConfig() + cfg := publicProxyFrontend.DefaultConfig() if len(args) == 1 { if err := cfg.Load(args[0]); err != nil { if !panicInstead { @@ -43,7 +43,7 @@ func (cmd *accessPublicCommand) run(_ *cobra.Command, args []string) { } } logrus.Infof(cf.Dump(cfg, cf.DefaultOptions())) - frontend, err := publicFrontend.NewHTTP(cfg) + frontend, err := publicProxyFrontend.NewHTTP(cfg) if err != nil { if !panicInstead { tui.Error("unable to create http frontend", err) diff --git a/cmd/zrok/accessPublicValidate.go b/cmd/zrok/accessPublicValidate.go index a7de00d5..c3fea00f 100644 --- a/cmd/zrok/accessPublicValidate.go +++ b/cmd/zrok/accessPublicValidate.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/michaelquigley/cf" - "github.com/openziti/zrok/endpoints/publicFrontend" + "github.com/openziti/zrok/endpoints/publicProxyFrontend" "github.com/openziti/zrok/tui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -29,7 +29,7 @@ func newAccessPublicValidateCommand() *accessPublicValidateCommand { } func (cmd *accessPublicValidateCommand) run(_ *cobra.Command, args []string) { - cfg := publicFrontend.DefaultConfig() + cfg := publicProxyFrontend.DefaultConfig() if err := cfg.Load(args[0]); err != nil { tui.Error(fmt.Sprintf("unable to load configuration '%v'", args[0]), err) } diff --git a/endpoints/privateFrontend/config.go b/endpoints/proxyFrontend/config.go similarity index 92% rename from endpoints/privateFrontend/config.go rename to endpoints/proxyFrontend/config.go index 76a65017..1196148b 100644 --- a/endpoints/privateFrontend/config.go +++ b/endpoints/proxyFrontend/config.go @@ -1,4 +1,4 @@ -package privateFrontend +package proxyFrontend import "github.com/openziti/zrok/endpoints" diff --git a/endpoints/privateFrontend/http.go b/endpoints/proxyFrontend/http.go similarity index 98% rename from endpoints/privateFrontend/http.go rename to endpoints/proxyFrontend/http.go index 72277127..f53b2473 100644 --- a/endpoints/privateFrontend/http.go +++ b/endpoints/proxyFrontend/http.go @@ -1,4 +1,4 @@ -package privateFrontend +package proxyFrontend import ( "context" @@ -6,7 +6,7 @@ import ( "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/zrok/endpoints" - "github.com/openziti/zrok/endpoints/publicFrontend/notFoundUi" + "github.com/openziti/zrok/endpoints/publicProxyFrontend/notFoundUi" "github.com/openziti/zrok/model" "github.com/openziti/zrok/util" "github.com/openziti/zrok/zrokdir" diff --git a/endpoints/publicFrontend/config.go b/endpoints/publicProxyFrontend/config.go similarity index 94% rename from endpoints/publicFrontend/config.go rename to endpoints/publicProxyFrontend/config.go index 080a1714..1c532c3f 100644 --- a/endpoints/publicFrontend/config.go +++ b/endpoints/publicProxyFrontend/config.go @@ -1,4 +1,4 @@ -package publicFrontend +package publicProxyFrontend import ( "github.com/michaelquigley/cf" diff --git a/endpoints/publicFrontend/healthUi/embed.go b/endpoints/publicProxyFrontend/healthUi/embed.go similarity index 100% rename from endpoints/publicFrontend/healthUi/embed.go rename to endpoints/publicProxyFrontend/healthUi/embed.go diff --git a/endpoints/publicFrontend/healthUi/handler.go b/endpoints/publicProxyFrontend/healthUi/handler.go similarity index 100% rename from endpoints/publicFrontend/healthUi/handler.go rename to endpoints/publicProxyFrontend/healthUi/handler.go diff --git a/endpoints/publicFrontend/healthUi/index.html b/endpoints/publicProxyFrontend/healthUi/index.html similarity index 100% rename from endpoints/publicFrontend/healthUi/index.html rename to endpoints/publicProxyFrontend/healthUi/index.html diff --git a/endpoints/publicFrontend/http.go b/endpoints/publicProxyFrontend/http.go similarity index 97% rename from endpoints/publicFrontend/http.go rename to endpoints/publicProxyFrontend/http.go index 9e9ddbb7..26a4dfa3 100644 --- a/endpoints/publicFrontend/http.go +++ b/endpoints/publicProxyFrontend/http.go @@ -1,4 +1,4 @@ -package publicFrontend +package publicProxyFrontend import ( "context" @@ -6,8 +6,8 @@ import ( "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/zrok/endpoints" - "github.com/openziti/zrok/endpoints/publicFrontend/healthUi" - "github.com/openziti/zrok/endpoints/publicFrontend/notFoundUi" + "github.com/openziti/zrok/endpoints/publicProxyFrontend/healthUi" + "github.com/openziti/zrok/endpoints/publicProxyFrontend/notFoundUi" "github.com/openziti/zrok/model" "github.com/openziti/zrok/util" "github.com/openziti/zrok/zrokdir" diff --git a/endpoints/publicFrontend/notFoundUi/embed.go b/endpoints/publicProxyFrontend/notFoundUi/embed.go similarity index 100% rename from endpoints/publicFrontend/notFoundUi/embed.go rename to endpoints/publicProxyFrontend/notFoundUi/embed.go diff --git a/endpoints/publicFrontend/notFoundUi/handler.go b/endpoints/publicProxyFrontend/notFoundUi/handler.go similarity index 100% rename from endpoints/publicFrontend/notFoundUi/handler.go rename to endpoints/publicProxyFrontend/notFoundUi/handler.go diff --git a/endpoints/publicFrontend/notFoundUi/index.html b/endpoints/publicProxyFrontend/notFoundUi/index.html similarity index 100% rename from endpoints/publicFrontend/notFoundUi/index.html rename to endpoints/publicProxyFrontend/notFoundUi/index.html