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

controller, store infrastructure; services -> shares (#144)

Browse Source
This commit is contained in:
Michael Quigley
2023-01-04 13:13:50 -05:00
parent fcb0873784
commit 9572ed3c73
14 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
controller/overview.go
View File

@ -21,7 +21,7 @@ func overviewHandler(_ metadata.OverviewParams, principal *rest_model_zrok.Princ
}
var out rest_model_zrok.EnvironmentServicesList
for _, env := range envs {
svcs, err := str.FindServicesForEnvironment(env.Id, tx)
shrs, err := str.FindSharesForEnvironment(env.Id, tx)
if err != nil {
logrus.Errorf("error finding services for environment '%v': %v", env.ZId, err)
return metadata.NewOverviewInternalServerError()
@ -37,30 +37,30 @@ func overviewHandler(_ metadata.OverviewParams, principal *rest_model_zrok.Princ
},
}
for _, svc := range svcs {
for _, shr := range shrs {
feEndpoint := ""
if svc.FrontendEndpoint != nil {
feEndpoint = *svc.FrontendEndpoint
if shr.FrontendEndpoint != nil {
feEndpoint = *shr.FrontendEndpoint
}
feSelection := ""
if svc.FrontendSelection != nil {
feSelection = *svc.FrontendSelection
if shr.FrontendSelection != nil {
feSelection = *shr.FrontendSelection
}
beProxyEndpoint := ""
if svc.BackendProxyEndpoint != nil {
beProxyEndpoint = *svc.BackendProxyEndpoint
if shr.BackendProxyEndpoint != nil {
beProxyEndpoint = *shr.BackendProxyEndpoint
}
es.Services = append(es.Services, &rest_model_zrok.Service{
Token: svc.Token,
ZID: svc.ZId,
ShareMode: svc.ShareMode,
BackendMode: svc.BackendMode,
Token: shr.Token,
ZID: shr.ZId,
ShareMode: shr.ShareMode,
BackendMode: shr.BackendMode,
FrontendSelection: feSelection,
FrontendEndpoint: feEndpoint,
BackendProxyEndpoint: beProxyEndpoint,
Reserved: svc.Reserved,
CreatedAt: svc.CreatedAt.UnixMilli(),
UpdatedAt: svc.UpdatedAt.UnixMilli(),
Reserved: shr.Reserved,
CreatedAt: shr.CreatedAt.UnixMilli(),
UpdatedAt: shr.UpdatedAt.UnixMilli(),
})
}
out = append(out, es)