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

implement store layer for service model changes (#103)

Browse Source
This commit is contained in:
Michael Quigley 2022-11-21 14:51:11 -05:00
parent 7cd36021ce
commit 38c86aea82
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
controller/share_public.go
View File

@ -93,10 +93,12 @@ func (h *sharePublicHandler) Handle(params service.ShareParams, principal *rest_
frontendUrl := h.proxyUrl(svcName) frontendUrl := h.proxyUrl(svcName)
sid, err := str.CreateService(envId, &store.Service{ sid, err := str.CreateService(envId, &store.Service{
ZId: svcZId, ZId: svcZId,
Name: svcName, Name: svcName,
Frontend: frontendUrl, Frontend: frontendUrl,
Backend: params.Body.BackendProxyEndpoint, Backend: params.Body.BackendProxyEndpoint,
ShareMode: "public",
BackendMode: "proxy",
}, tx) }, tx)
if err != nil { if err != nil {
logrus.Errorf("error creating service record: %v", err) logrus.Errorf("error creating service record: %v", err)

10
controller/store/service.go
View File

@ -12,15 +12,17 @@ type Service struct {
Name string Name string
Frontend string Frontend string
Backend string Backend string
ShareMode string
BackendMode string
} }
func (self *Store) CreateService(envId int, svc *Service, tx *sqlx.Tx) (int, error) { func (self *Store) CreateService(envId int, svc *Service, tx *sqlx.Tx) (int, error) {
stmt, err := tx.Prepare("insert into services (environment_id, z_id, name, frontend, backend) values ($1, $2, $3, $4, $5) returning id") stmt, err := tx.Prepare("insert into services (environment_id, z_id, name, frontend, backend, share_mode, backend_mode) values ($1, $2, $3, $4, $5, $6, $7) returning id")
if err != nil { if err != nil {
return 0, errors.Wrap(err, "error preparing services insert statement") return 0, errors.Wrap(err, "error preparing services insert statement")
} }
var id int var id int
if err := stmt.QueryRow(envId, svc.ZId, svc.Name, svc.Frontend, svc.Backend).Scan(&id); err != nil { if err := stmt.QueryRow(envId, svc.ZId, svc.Name, svc.Frontend, svc.Backend, svc.ShareMode, svc.BackendMode).Scan(&id); err != nil {
return 0, errors.Wrap(err, "error executing services insert statement") return 0, errors.Wrap(err, "error executing services insert statement")
} }
return id, nil return id, nil
@ -67,12 +69,12 @@ func (self *Store) FindServicesForEnvironment(envId int, tx *sqlx.Tx) ([]*Servic
} }
func (self *Store) UpdateService(svc *Service, tx *sqlx.Tx) error { func (self *Store) UpdateService(svc *Service, tx *sqlx.Tx) error {
sql := "update services set z_id = $1, name = $2, frontend = $3, backend = $4, updated_at = strftime('%Y-%m-%d %H:%M:%f', 'now') where id = $5" sql := "update services set z_id = $1, name = $2, frontend = $3, backend = $4, share_mode = $5, backend_mode = $6, updated_at = strftime('%Y-%m-%d %H:%M:%f', 'now') where id = $7"
stmt, err := tx.Prepare(sql) stmt, err := tx.Prepare(sql)
if err != nil { if err != nil {
return errors.Wrap(err, "error preparing services update statement") return errors.Wrap(err, "error preparing services update statement")
} }
_, err = stmt.Exec(svc.ZId, svc.Name, svc.Frontend, svc.Backend, svc.Id) _, err = stmt.Exec(svc.ZId, svc.Name, svc.Frontend, svc.Backend, svc.ShareMode, svc.BackendMode, svc.Id)
if err != nil { if err != nil {
return errors.Wrap(err, "error executing services update statement") return errors.Wrap(err, "error executing services update statement")
} }