diff --git a/cmd/zrok/accessPublic.go b/cmd/zrok/accessPublic.go index 1198cab3..9574978b 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/publicProxyFrontend" + "github.com/openziti/zrok/endpoints/publicProxy" "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 := publicProxyFrontend.DefaultConfig() + cfg := publicProxy.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 := publicProxyFrontend.NewHTTP(cfg) + frontend, err := publicProxy.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 c3fea00f..e8760431 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/publicProxyFrontend" + "github.com/openziti/zrok/endpoints/publicProxy" "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 := publicProxyFrontend.DefaultConfig() + cfg := publicProxy.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/proxy/frontend.go b/endpoints/proxy/frontend.go index c19db92a..9729d12e 100644 --- a/endpoints/proxy/frontend.go +++ b/endpoints/proxy/frontend.go @@ -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/publicProxyFrontend/notFoundUi" + "github.com/openziti/zrok/endpoints/publicProxy/notFoundUi" "github.com/openziti/zrok/model" "github.com/openziti/zrok/util" "github.com/openziti/zrok/zrokdir" diff --git a/endpoints/publicProxyFrontend/config.go b/endpoints/publicProxy/config.go similarity index 94% rename from endpoints/publicProxyFrontend/config.go rename to endpoints/publicProxy/config.go index 1c532c3f..fd6fe6c0 100644 --- a/endpoints/publicProxyFrontend/config.go +++ b/endpoints/publicProxy/config.go @@ -1,4 +1,4 @@ -package publicProxyFrontend +package publicProxy import ( "github.com/michaelquigley/cf" diff --git a/endpoints/publicProxyFrontend/healthUi/embed.go b/endpoints/publicProxy/healthUi/embed.go similarity index 100% rename from endpoints/publicProxyFrontend/healthUi/embed.go rename to endpoints/publicProxy/healthUi/embed.go diff --git a/endpoints/publicProxyFrontend/healthUi/handler.go b/endpoints/publicProxy/healthUi/handler.go similarity index 100% rename from endpoints/publicProxyFrontend/healthUi/handler.go rename to endpoints/publicProxy/healthUi/handler.go diff --git a/endpoints/publicProxyFrontend/healthUi/index.html b/endpoints/publicProxy/healthUi/index.html similarity index 100% rename from endpoints/publicProxyFrontend/healthUi/index.html rename to endpoints/publicProxy/healthUi/index.html diff --git a/endpoints/publicProxyFrontend/http.go b/endpoints/publicProxy/http.go similarity index 97% rename from endpoints/publicProxyFrontend/http.go rename to endpoints/publicProxy/http.go index 26a4dfa3..8f391492 100644 --- a/endpoints/publicProxyFrontend/http.go +++ b/endpoints/publicProxy/http.go @@ -1,4 +1,4 @@ -package publicProxyFrontend +package publicProxy 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/publicProxyFrontend/healthUi" - "github.com/openziti/zrok/endpoints/publicProxyFrontend/notFoundUi" + "github.com/openziti/zrok/endpoints/publicProxy/healthUi" + "github.com/openziti/zrok/endpoints/publicProxy/notFoundUi" "github.com/openziti/zrok/model" "github.com/openziti/zrok/util" "github.com/openziti/zrok/zrokdir" diff --git a/endpoints/publicProxyFrontend/notFoundUi/embed.go b/endpoints/publicProxy/notFoundUi/embed.go similarity index 100% rename from endpoints/publicProxyFrontend/notFoundUi/embed.go rename to endpoints/publicProxy/notFoundUi/embed.go diff --git a/endpoints/publicProxyFrontend/notFoundUi/handler.go b/endpoints/publicProxy/notFoundUi/handler.go similarity index 100% rename from endpoints/publicProxyFrontend/notFoundUi/handler.go rename to endpoints/publicProxy/notFoundUi/handler.go diff --git a/endpoints/publicProxyFrontend/notFoundUi/index.html b/endpoints/publicProxy/notFoundUi/index.html similarity index 100% rename from endpoints/publicProxyFrontend/notFoundUi/index.html rename to endpoints/publicProxy/notFoundUi/index.html