extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-12-22 23:02:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

moved zrok client creation into zrokdir, to better support the new zrokloop utility (#40)

Browse Source
This commit is contained in:
Michael Quigley 2022-09-30 15:12:06 -04:00
parent 02d6b7fce9
commit 175f8e8167
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
7 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zrok/disable.go
View File

@ -36,7 +36,7 @@ func (cmd *disableCommand) run(_ *cobra.Command, args []string) {
}
panic(err)
}
zrok, err := newZrokClient(env.ApiEndpoint)
zrok, err := zrokdir.ZrokClient(env.ApiEndpoint)
if err != nil {
if !panicInstead {
showError("could not create zrok service client", err)

2
cmd/zrok/enable.go
View File

@ -56,7 +56,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
cmd.description = fmt.Sprintf("%v@%v", user.Username, hostName)
}
zrok, err := newZrokClient(apiEndpoint)
zrok, err := zrokdir.ZrokClient(apiEndpoint)
if err != nil {
panic(err)
}

2
cmd/zrok/http_backend.go
View File

@ -80,7 +80,7 @@ func (self *httpBackendCommand) run(_ *cobra.Command, args []string) {
EndpointAddress: args[0],
}
zrok, err := newZrokClient(env.ApiEndpoint)
zrok, err := zrokdir.ZrokClient(env.ApiEndpoint)
if err != nil {
ui.Close()
if !panicInstead {

3
cmd/zrok/invite.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/identity"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/foundation/v2/term"
"github.com/spf13/cobra"
)
@ -40,7 +41,7 @@ func (cmd *inviteCommand) run(_ *cobra.Command, _ []string) {
showError("entered emails do not match... aborting!", nil)
}
zrok, err := newZrokClient(apiEndpoint)
zrok, err := zrokdir.ZrokClient(apiEndpoint)
if err != nil {
if !panicInstead {
showError("error creating zrok api client", err)

17
cmd/zrok/main.go
View File

@ -1,15 +1,9 @@
package main
import (
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"net/url"
"os"
"path/filepath"
"strings"
@ -50,14 +44,3 @@ func main() {
panic(err)
}
}
func newZrokClient(endpoint string) (*rest_client_zrok.Zrok, error) {
apiUrl, err := url.Parse(endpoint)
if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", apiEndpoint)
}
transport := httptransport.New(apiUrl.Host, "/api/v1", []string{apiUrl.Scheme})
transport.Producers["application/zrok.v1+json"] = runtime.JSONProducer()
transport.Consumers["application/zrok.v1+json"] = runtime.JSONConsumer()
return rest_client_zrok.New(transport, strfmt.Default), nil
}

27
cmd/zrokloop/main.go Normal file
View File

@ -0,0 +1,27 @@
package main
import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"os"
"path/filepath"
"strings"
)
var rootCmd = &cobra.Command{
Use: strings.TrimSuffix(filepath.Base(os.Args[0]), filepath.Ext(os.Args[0])),
Short: "zrok loopback harness",
PersistentPreRun: func(_ *cobra.Command, _ []string) {
if verbose {
logrus.SetLevel(logrus.DebugLevel)
}
},
}
var verbose bool
var apiEndpoint string
func main() {
if err := rootCmd.Execute(); err != nil {
panic(err)
}
}

21
zrokdir/client.go Normal file
View File

@ -0,0 +1,21 @@
package zrokdir
import (
"github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/pkg/errors"
"net/url"
)
func ZrokClient(endpoint string) (*rest_client_zrok.Zrok, error) {
apiUrl, err := url.Parse(endpoint)
if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", endpoint)
}
transport := httptransport.New(apiUrl.Host, "/api/v1", []string{apiUrl.Scheme})
transport.Producers["application/zrok.v1+json"] = runtime.JSONProducer()
transport.Consumers["application/zrok.v1+json"] = runtime.JSONConsumer()
return rest_client_zrok.New(transport, strfmt.Default), nil
}