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

breaking up the big method; 1 (#40)

Browse Source
This commit is contained in:
Michael Quigley 2022-10-06 11:59:47 -04:00
parent eb51705e55
commit 1f4a5125d2
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmd/zrokloop/loop.go
View File

@ -4,8 +4,10 @@ import (
"bytes" "bytes"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/model" "github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/tunnel" "github.com/openziti-test-kitchen/zrok/rest_client_zrok/tunnel"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti-test-kitchen/zrok/zrokdir"
@ -68,8 +70,12 @@ func (r *run) run(_ *cobra.Command, _ []string) {
type looper struct { type looper struct {
id int id int
r *run r *run
env *zrokdir.Environment
done chan struct{} done chan struct{}
listener edge.Listener listener edge.Listener
zrok *rest_client_zrok.Zrok
service string
auth runtime.ClientAuthInfoWriter
} }
func newLooper(id int, r *run) *looper { func newLooper(id int, r *run) *looper {
@ -86,7 +92,8 @@ func (l *looper) run() {
defer close(l.done) defer close(l.done)
defer logrus.Infof("stopping #%d", l.id) defer logrus.Infof("stopping #%d", l.id)
env, err := zrokdir.LoadEnvironment() var err error
l.env, err = zrokdir.LoadEnvironment()
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -94,23 +101,24 @@ func (l *looper) run() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
zrok, err := zrokdir.ZrokClient(env.ApiEndpoint) l.zrok, err = zrokdir.ZrokClient(l.env.ApiEndpoint)
if err != nil { if err != nil {
panic(err) panic(err)
} }
auth := httptransport.APIKeyAuth("x-token", "header", env.ZrokToken) l.auth = httptransport.APIKeyAuth("x-token", "header", l.env.ZrokToken)
tunnelReq := tunnel.NewTunnelParams() tunnelReq := tunnel.NewTunnelParams()
tunnelReq.Body = &rest_model_zrok.TunnelRequest{ tunnelReq.Body = &rest_model_zrok.TunnelRequest{
ZitiIdentityID: env.ZitiIdentityId, ZitiIdentityID: l.env.ZitiIdentityId,
Endpoint: fmt.Sprintf("looper#%d", l.id), Endpoint: fmt.Sprintf("looper#%d", l.id),
AuthScheme: string(model.None), AuthScheme: string(model.None),
} }
tunnelResp, err := zrok.Tunnel.Tunnel(tunnelReq, auth) tunnelResp, err := l.zrok.Tunnel.Tunnel(tunnelReq, l.auth)
if err != nil { if err != nil {
panic(err) panic(err)
} }
l.service = tunnelResp.Payload.Service
logrus.Infof("looper #%d, service: %v, frontend: %v", l.id, tunnelResp.Payload.Service, tunnelResp.Payload.ProxyEndpoint) logrus.Infof("looper #%d, service: %v, frontend: %v", l.id, l.service, tunnelResp.Payload.ProxyEndpoint)
go l.serviceListener(zif, tunnelResp.Payload.Service) go l.serviceListener(zif, tunnelResp.Payload.Service)
// Dwell // Dwell
@ -146,23 +154,10 @@ func (l *looper) run() {
logrus.Errorf("looper #%d error creating request: %v", l.id, err) logrus.Errorf("looper #%d error creating request: %v", l.id, err)
} }
} }
logrus.Infof("looper #%d: complete", l.id) logrus.Infof("looper #%d: complete", l.id)
// Shutdown l.shutdown()
if l.listener != nil {
if err := l.listener.Close(); err != nil {
logrus.Errorf("looper #%d error closing listener: %v", l.id, err)
}
}
untunnelReq := tunnel.NewUntunnelParams()
untunnelReq.Body = &rest_model_zrok.UntunnelRequest{
ZitiIdentityID: env.ZitiIdentityId,
Service: tunnelResp.Payload.Service,
}
if _, err := zrok.Tunnel.Untunnel(untunnelReq, auth); err != nil {
logrus.Errorf("error shutting down looper #%d: %v", l.id, err)
}
} }
func (l *looper) serviceListener(zitiIdPath string, svcId string) { func (l *looper) serviceListener(zitiIdPath string, svcId string) {
@ -189,3 +184,20 @@ func (l *looper) ServeHTTP(w http.ResponseWriter, r *http.Request) {
io.Copy(buf, r.Body) io.Copy(buf, r.Body)
w.Write(buf.Bytes()) w.Write(buf.Bytes())
} }
func (l *looper) shutdown() {
if l.listener != nil {
if err := l.listener.Close(); err != nil {
logrus.Errorf("looper #%d error closing listener: %v", l.id, err)
}
}
untunnelReq := tunnel.NewUntunnelParams()
untunnelReq.Body = &rest_model_zrok.UntunnelRequest{
ZitiIdentityID: l.env.ZitiIdentityId,
Service: l.service,
}
if _, err := l.zrok.Tunnel.Untunnel(untunnelReq, l.auth); err != nil {
logrus.Errorf("error shutting down looper #%d: %v", l.id, err)
}
}