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

publicProxyFrontend -> publicProxy (#170)

Browse Source
This commit is contained in:
Michael Quigley 2023-04-18 13:38:32 -04:00
parent 4c41908ce2
commit 56bb9c6d31
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
11 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zrok/accessPublic.go
View File

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

4
cmd/zrok/accessPublicValidate.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti/zrok/endpoints/publicProxyFrontend" "github.com/openziti/zrok/endpoints/publicProxy"
"github.com/openziti/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -29,7 +29,7 @@ func newAccessPublicValidateCommand() *accessPublicValidateCommand {
} }
func (cmd *accessPublicValidateCommand) run(_ *cobra.Command, args []string) { func (cmd *accessPublicValidateCommand) run(_ *cobra.Command, args []string) {
cfg := publicProxyFrontend.DefaultConfig() cfg := publicProxy.DefaultConfig()
if err := cfg.Load(args[0]); err != nil { if err := cfg.Load(args[0]); err != nil {
tui.Error(fmt.Sprintf("unable to load configuration '%v'", args[0]), err) tui.Error(fmt.Sprintf("unable to load configuration '%v'", args[0]), err)
} }

2
endpoints/proxy/frontend.go
View File

@ -6,7 +6,7 @@ import (
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/endpoints" "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/model"
"github.com/openziti/zrok/util" "github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"

2
endpoints/publicProxyFrontend/config.go → endpoints/publicProxy/config.go
View File

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

0
endpoints/publicProxyFrontend/healthUi/embed.go → endpoints/publicProxy/healthUi/embed.go
View File

0
endpoints/publicProxyFrontend/healthUi/handler.go → endpoints/publicProxy/healthUi/handler.go
View File

0
endpoints/publicProxyFrontend/healthUi/index.html → endpoints/publicProxy/healthUi/index.html
View File

6
endpoints/publicProxyFrontend/http.go → endpoints/publicProxy/http.go
View File

@ -1,4 +1,4 @@
package publicProxyFrontend package publicProxy
import ( import (
"context" "context"
@ -6,8 +6,8 @@ import (
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/endpoints/publicProxyFrontend/healthUi" "github.com/openziti/zrok/endpoints/publicProxy/healthUi"
"github.com/openziti/zrok/endpoints/publicProxyFrontend/notFoundUi" "github.com/openziti/zrok/endpoints/publicProxy/notFoundUi"
"github.com/openziti/zrok/model" "github.com/openziti/zrok/model"
"github.com/openziti/zrok/util" "github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"

0
endpoints/publicProxyFrontend/notFoundUi/embed.go → endpoints/publicProxy/notFoundUi/embed.go
View File

0
endpoints/publicProxyFrontend/notFoundUi/handler.go → endpoints/publicProxy/notFoundUi/handler.go
View File

0
endpoints/publicProxyFrontend/notFoundUi/index.html → endpoints/publicProxy/notFoundUi/index.html
View File