Skip to content

Commit

Permalink
proxyBackend lint and cleanup (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelquigley committed Apr 14, 2023
1 parent ec6ffa7 commit 3ec7e42
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 10 deletions.
2 changes: 1 addition & 1 deletion cmd/zrok/sharePrivate.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func (cmd *sharePrivateCommand) run(_ *cobra.Command, args []string) {
}

func (cmd *sharePrivateCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg)
be, err := proxyBackend.New(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/zrok/sharePublic.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ func (cmd *sharePublicCommand) run(_ *cobra.Command, args []string) {
}

func (cmd *sharePublicCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg)
be, err := proxyBackend.New(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/zrok/shareReserved.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
}

func (cmd *shareReservedCommand) proxyBackendMode(cfg *proxyBackend.Config) (endpoints.RequestHandler, error) {
be, err := proxyBackend.NewBackend(cfg)
be, err := proxyBackend.New(cfg)
if err != nil {
return nil, errors.Wrap(err, "error creating http proxy backend")
}
Expand Down
14 changes: 7 additions & 7 deletions endpoints/proxyBackend/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ type Config struct {
RequestsChan chan *endpoints.Request
}

type backend struct {
type Backend struct {
cfg *Config
requests func() int32
listener edge.Listener
handler http.Handler
}

func NewBackend(cfg *Config) (*backend, error) {
func New(cfg *Config) (*Backend, error) {
options := ziti.ListenOptions{
ConnectTimeout: 5 * time.Minute,
MaxConnections: 64,
Expand All @@ -51,23 +51,23 @@ func NewBackend(cfg *Config) (*backend, error) {
}

handler := util.NewProxyHandler(proxy)
return &backend{
return &Backend{
cfg: cfg,
requests: handler.Requests,
listener: listener,
handler: handler,
}, nil
}

func (self *backend) Run() error {
if err := http.Serve(self.listener, self.handler); err != nil {
func (b *Backend) Run() error {
if err := http.Serve(b.listener, b.handler); err != nil {
return err
}
return nil
}

func (self *backend) Requests() func() int32 {
return self.requests
func (b *Backend) Requests() func() int32 {
return b.requests
}

func newReverseProxy(cfg *Config) (*httputil.ReverseProxy, error) {
Expand Down
16 changes: 16 additions & 0 deletions endpoints/tunnelBackend/tunnel.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package tunnelBackend

import "github.com/openziti/sdk-golang/ziti/edge"

type Config struct {
IdentityPath string
EndpointAddress string
ShrToken string
}

type Backend struct {
cfg *Config
listener edge.Listener
}

func New

0 comments on commit 3ec7e42

Please sign in to comment.