extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-13 13:26:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

store api endpoint in zrokdir (#47)

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

2
cmd/zrok/create.go
View File

@ -46,7 +46,7 @@ func (cmd *createAccountCommand) run(_ *cobra.Command, _ []string) {
fmt.Println("entered emails do not match... aborting!") fmt.Println("entered emails do not match... aborting!")
} }
zrok, err := newZrokClient() zrok, err := newZrokClient(apiEndpoint)
if err != nil { if err != nil {
panic(err) panic(err)
} }

2
cmd/zrok/disable.go
View File

@ -33,7 +33,7 @@ func (cmd *disableCommand) run(_ *cobra.Command, args []string) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
zrok, err := newZrokClient() zrok, err := newZrokClient(env.ApiEndpoint)
if err != nil { if err != nil {
panic(err) panic(err)
} }

4
cmd/zrok/enable.go
View File

@ -55,7 +55,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
cmd.description = fmt.Sprintf("%v@%v", user.Username, hostName) cmd.description = fmt.Sprintf("%v@%v", user.Username, hostName)
} }
zrok, err := newZrokClient() zrok, err := newZrokClient(apiEndpoint)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -69,7 +69,7 @@ func (cmd *enableCommand) run(_ *cobra.Command, args []string) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
if err := zrokdir.SaveEnvironment(&zrokdir.Environment{ZrokToken: token, ZitiIdentityId: resp.Payload.Identity}); err != nil { if err := zrokdir.SaveEnvironment(&zrokdir.Environment{ZrokToken: token, ZitiIdentityId: resp.Payload.Identity, ApiEndpoint: apiEndpoint}); err != nil {
panic(err) panic(err)
} }
if err := zrokdir.WriteZitiIdentity("environment", resp.Payload.Cfg); err != nil { if err := zrokdir.WriteZitiIdentity("environment", resp.Payload.Cfg); err != nil {

2
cmd/zrok/http_backend.go
View File

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

4
cmd/zrok/main.go
View File

@ -49,8 +49,8 @@ func main() {
} }
} }
func newZrokClient() (*rest_client_zrok.Zrok, error) { func newZrokClient(endpoint string) (*rest_client_zrok.Zrok, error) {
apiUrl, err := url.Parse(apiEndpoint) apiUrl, err := url.Parse(endpoint)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", apiEndpoint) return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", apiEndpoint)
} }

1
zrokdir/zrokdir.go
View File

@ -11,6 +11,7 @@ import (
type Environment struct { type Environment struct {
ZrokToken string `json:"zrok_token"` ZrokToken string `json:"zrok_token"`
ZitiIdentityId string `json:"ziti_identity"` ZitiIdentityId string `json:"ziti_identity"`
ApiEndpoint string `json:"api_endpoint"`
} }
func Delete() error { func Delete() error {