extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-08-14 02:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

zrok status now shows origination for api endpoint (#136)

Browse Source
This commit is contained in:
Michael Quigley
2023-01-09 14:33:17 -05:00
parent 434943c964
commit 5bd11e46a5
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zrokdir/client.go
View File

@ -13,7 +13,7 @@ import (
)
func (zrd *ZrokDir) Client() (*rest_client_zrok.Zrok, error) {
apiEndpoint := zrd.ApiEndpoint()
apiEndpoint, _ := zrd.ApiEndpoint()
apiUrl, err := url.Parse(apiEndpoint)
if err != nil {
return nil, errors.Wrapf(err, "error parsing api endpoint '%v'", zrd)
@ -34,21 +34,25 @@ func (zrd *ZrokDir) Client() (*rest_client_zrok.Zrok, error) {
return zrok, nil
}
func (zrd *ZrokDir) ApiEndpoint() string {
apiEndpoint := "https://api.zrok.io"
func (zrd *ZrokDir) ApiEndpoint() (apiEndpoint string, from string) {
apiEndpoint = "https://api.zrok.io"
from = "binary"
if zrd.Cfg != nil && zrd.Cfg.ApiEndpoint != "" {
apiEndpoint = zrd.Cfg.ApiEndpoint
from = "config"
}
env := os.Getenv("ZROK_API_ENDPOINT")
if env != "" {
apiEndpoint = env
from = "ZROK_API_ENDPOINT"
}
if zrd.Env != nil && zrd.Env.ApiEndpoint != "" {
apiEndpoint = zrd.Env.ApiEndpoint
from = "env"
}
return apiEndpoint
return apiEndpoint, from
}