gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 23:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request openziti/fabric#234 from openziti/add-nil-check

Browse Source 
Add nill check on terminator lookup. Fix spelling mistake
This commit is contained in:
Paul Lorenz
2021-04-29 23:28:52 -04:00
committed by GitHub
parent d73c0192d6 0173a633c6
commit cab0fdf55b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/db/terminator_store.go
+7 -4
View File
@@ -273,19 +273,22 @@ func (store *terminatorStoreImpl) DeleteById(ctx boltz.MutateContext, id string)
return store.baseStore.DeleteById(ctx, id)
}
func (store *terminatorStoreImpl) GetTerminatorsInIdentityGroup(tx *bbolt.Tx, termnatorId string) ([]*Terminator, error) {
terminator, err := store.LoadOneById(tx, termnatorId)
func (store *terminatorStoreImpl) GetTerminatorsInIdentityGroup(tx *bbolt.Tx, terminatorId string) ([]*Terminator, error) {
terminator, err := store.LoadOneById(tx, terminatorId)
if err != nil {
return nil, err
}
serviceId := terminator.GetServiceId()
if terminator == nil {
return nil, boltz.NewNotFoundError("terminator", "id", terminatorId)
}
serviceId := terminator.GetServiceId()
identity := terminator.GetIdentity()
terminatorIds := store.stores.service.GetRelatedEntitiesIdList(tx, serviceId, EntityTypeTerminators)
var identityTerminators []*Terminator
for _, siblingId := range terminatorIds {
if siblingId != termnatorId {
if siblingId != terminatorId {
if terminator, _ := store.LoadOneById(tx, siblingId); terminator != nil {
if identity == terminator.Identity {
identityTerminators = append(identityTerminators, terminator)