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

frontends.name -> frontends.token (#119)

Browse Source
This commit is contained in:
Michael Quigley
2022-11-30 11:52:48 -05:00
parent 0f9ed9dd68
commit f54d315e34
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controller/access.go
View File

@ -61,13 +61,13 @@ func (h *accessHandler) Handle(params service.AccessParams, principal *rest_mode
return service.NewAccessNotFound()
}
frontendName, err := createToken()
feToken, err := createToken()
if err != nil {
logrus.Error(err)
return service.NewAccessInternalServerError()
}
if _, err := str.CreateFrontend(envId, &store.Frontend{Name: frontendName, ZId: envZId}, tx); err != nil {
if _, err := str.CreateFrontend(envId, &store.Frontend{Token: feToken, ZId: envZId}, tx); err != nil {
logrus.Errorf("error creating frontend record: %v", err)
return service.NewAccessInternalServerError()
}
@ -79,7 +79,7 @@ func (h *accessHandler) Handle(params service.AccessParams, principal *rest_mode
}
extraTags := &rest_model_edge.Tags{SubTags: map[string]interface{}{
"zrokEnvironmentZId": envZId,
"zrokFrontendName": frontendName,
"zrokFrontendToken": feToken,
}}
if err := createServicePolicyDialForEnvironment(envZId, ssvc.Name, ssvc.ZId, edge, extraTags); err != nil {
logrus.Errorf("unable to create dial policy: %v", err)
@ -91,7 +91,7 @@ func (h *accessHandler) Handle(params service.AccessParams, principal *rest_mode
return service.NewAccessInternalServerError()
}
return service.NewAccessCreated().WithPayload(&rest_model_zrok.AccessResponse{FrontendName: frontendName})
return service.NewAccessCreated().WithPayload(&rest_model_zrok.AccessResponse{FrontendName: feToken})
}
func createServicePolicyDialForEnvironment(envZId, svcName, svcZId string, edge *rest_management_api_client.ZitiEdgeManagement, tags ...*rest_model.Tags) error {