extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-01-09 15:38:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

endpoint subpackage naming cleanup (#170)

Browse Source
This commit is contained in:
Michael Quigley 2023-04-10 15:26:00 -04:00
parent e1d26c1639
commit ec6ffa72a4
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
13 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/zrok/accessPrivate.go
View File

@ -5,7 +5,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti/zrok/endpoints" "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"
"github.com/openziti/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti/zrok/rest_model_zrok" "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) logrus.Infof("allocated frontend '%v'", accessResp.Payload.FrontendToken)
cfg := privateFrontend.DefaultConfig("backend") cfg := proxyFrontend.DefaultConfig("backend")
cfg.ShrToken = shrToken cfg.ShrToken = shrToken
cfg.Address = cmd.bindAddress cfg.Address = cmd.bindAddress
cfg.RequestsChan = make(chan *endpoints.Request, 1024) cfg.RequestsChan = make(chan *endpoints.Request, 1024)
@ -98,7 +98,7 @@ func (cmd *accessPrivateCommand) run(_ *cobra.Command, args []string) {
os.Exit(0) os.Exit(0)
}() }()
frontend, err := privateFrontend.NewHTTP(cfg) frontend, err := proxyFrontend.NewHTTP(cfg)
if err != nil { if err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to create private frontend", err) tui.Error("unable to create private frontend", err)

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/publicFrontend" "github.com/openziti/zrok/endpoints/publicProxyFrontend"
"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 := publicFrontend.DefaultConfig() cfg := publicProxyFrontend.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 := publicFrontend.NewHTTP(cfg) frontend, err := publicProxyFrontend.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/publicFrontend" "github.com/openziti/zrok/endpoints/publicProxyFrontend"
"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 := publicFrontend.DefaultConfig() cfg := publicProxyFrontend.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/privateFrontend/config.go → endpoints/proxyFrontend/config.go
View File

@ -1,4 +1,4 @@
package privateFrontend package proxyFrontend
import "github.com/openziti/zrok/endpoints" import "github.com/openziti/zrok/endpoints"

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

@ -1,4 +1,4 @@
package privateFrontend package proxyFrontend
import ( import (
"context" "context"
@ -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/publicFrontend/notFoundUi" "github.com/openziti/zrok/endpoints/publicProxyFrontend/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/publicFrontend/config.go → endpoints/publicProxyFrontend/config.go
View File

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

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

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

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

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

@ -1,4 +1,4 @@
package publicFrontend package publicProxyFrontend
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/publicFrontend/healthUi" "github.com/openziti/zrok/endpoints/publicProxyFrontend/healthUi"
"github.com/openziti/zrok/endpoints/publicFrontend/notFoundUi" "github.com/openziti/zrok/endpoints/publicProxyFrontend/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/publicFrontend/notFoundUi/embed.go → endpoints/publicProxyFrontend/notFoundUi/embed.go
View File

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

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