Skip to content

Commit

Permalink
audit pool manual hook db hits
Browse files Browse the repository at this point in the history 
Signed-off-by: Matt Siwiec <rizzza@users.noreply.github.com>
  • Loading branch information
@rizzza
rizzza committed Oct 24, 2023
1 parent 511314c commit 7e364de
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 40 deletions.
67 changes: 32 additions & 35 deletions internal/manualhooks/hooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,10 @@ func OriginHooks() []ent.Hook {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.LocationID)
}

if !slices.Contains(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.ProviderID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.ProviderID)
}

if !slices.Contains(msg.AdditionalSubjectIDs, port.LoadBalancerID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.LoadBalancerID)
}
Expand Down Expand Up @@ -558,6 +562,10 @@ func OriginHooks() []ent.Hook {
if !slices.Contains(additionalSubjects, port.Edges.LoadBalancer.LocationID) {
additionalSubjects = append(additionalSubjects, port.Edges.LoadBalancer.LocationID)
}

if !slices.Contains(additionalSubjects, port.Edges.LoadBalancer.ProviderID) {
additionalSubjects = append(additionalSubjects, port.Edges.LoadBalancer.ProviderID)
}
}
}

Expand Down Expand Up @@ -749,44 +757,37 @@ func PoolHooks() []ent.Hook {
return retValue, err
}

addSubjPorts, err := m.Client().Port.Query().Where(port.HasPoolsWith(pool.IDEQ(objID))).All(ctx)
addSubjPorts, err := m.Client().Port.Query().WithLoadBalancer().WithPools(func(q *generated.PoolQuery) {
q.WithOrigins()
}).Where(port.HasPoolsWith(pool.IDEQ(objID))).All(ctx)
if err == nil {
for _, port := range addSubjPorts {
for _, pool := range port.Edges.Pools {
for _, origin := range pool.Edges.Origins {
if !slices.Contains(msg.AdditionalSubjectIDs, origin.ID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, origin.ID)
}
}
}

if !slices.Contains(msg.AdditionalSubjectIDs, port.ID) && objID != port.ID {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.ID)
}

if !slices.Contains(msg.AdditionalSubjectIDs, port.LoadBalancerID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.LoadBalancerID)
}
}
}

addSubjOrigins, err := m.Client().Origin.Query().Where(origin.HasPoolWith(pool.IDEQ(objID))).All(ctx)
if err == nil {
for _, origin := range addSubjOrigins {
if !slices.Contains(msg.AdditionalSubjectIDs, origin.ID) && objID != origin.ID {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, origin.ID)
if !slices.Contains(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.LocationID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.LocationID)
}

if !slices.Contains(msg.AdditionalSubjectIDs, origin.PoolID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, origin.PoolID)
if !slices.Contains(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.ProviderID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, port.Edges.LoadBalancer.ProviderID)
}
}
}

lbs := getLoadBalancerIDs(ctx, objID, msg.AdditionalSubjectIDs)
for _, lb := range lbs {
lb, err := m.Client().LoadBalancer.Get(ctx, lb)
if err != nil {
return nil, fmt.Errorf("failed to get loadbalancer to lookup location %s", lb)
}

if !slices.Contains(msg.AdditionalSubjectIDs, lb.LocationID) {
msg.AdditionalSubjectIDs = append(msg.AdditionalSubjectIDs, lb.LocationID)
}
}

if len(relationships) != 0 {
if err := permissions.CreateAuthRelationships(ctx, "load-balancer-pool", objID, relationships...); err != nil {
return nil, fmt.Errorf("relationship request failed with error: %w", err)
Expand Down Expand Up @@ -822,9 +823,17 @@ func PoolHooks() []ent.Hook {

additionalSubjects = append(additionalSubjects, dbObj.OwnerID)

addSubjPorts, err := m.Client().Port.Query().Where(port.HasPoolsWith(pool.IDEQ(objID))).All(ctx)
addSubjPorts, err := m.Client().Port.Query().WithLoadBalancer().Where(port.HasPoolsWith(pool.IDEQ(objID))).All(ctx)
if err == nil {
for _, port := range addSubjPorts {
if !slices.Contains(additionalSubjects, port.Edges.LoadBalancer.LocationID) {
additionalSubjects = append(additionalSubjects, port.Edges.LoadBalancer.LocationID)
}

if !slices.Contains(additionalSubjects, port.Edges.LoadBalancer.ProviderID) {
additionalSubjects = append(additionalSubjects, port.Edges.LoadBalancer.ProviderID)
}

if !slices.Contains(additionalSubjects, port.LoadBalancerID) {
additionalSubjects = append(additionalSubjects, port.LoadBalancerID)
}
Expand All @@ -836,18 +845,6 @@ func PoolHooks() []ent.Hook {
SubjectID: dbObj.OwnerID,
})

lbs := getLoadBalancerIDs(ctx, objID, additionalSubjects)
for _, lb := range lbs {
lb, err := m.Client().LoadBalancer.Get(ctx, lb)
if err != nil {
return nil, fmt.Errorf("failed to get loadbalancer to lookup location %s", lb)
}

if !slices.Contains(additionalSubjects, lb.LocationID) {
additionalSubjects = append(additionalSubjects, lb.LocationID)
}
}

// we have all the info we need, now complete the mutation before we process the event
retValue, err := next.Mutate(ctx, m)
if err != nil {
Expand Down
10 changes: 5 additions & 5 deletions internal/manualhooks/hooks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func Test_OriginCreateHook(t *testing.T) {
msg := testutils.ChannelReceiveWithTimeout[events.Message[events.ChangeMessage]](t, changesChannel, defaultTimeout)

// Assert
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID}
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID, lb.ProviderID}
actualAdditionalSubjectIDs := msg.Message().AdditionalSubjectIDs

assert.ElementsMatch(t, expectedAdditionalSubjectIDs, actualAdditionalSubjectIDs)
Expand Down Expand Up @@ -161,7 +161,7 @@ func Test_OriginUpdateHook(t *testing.T) {
msg := testutils.ChannelReceiveWithTimeout[events.Message[events.ChangeMessage]](t, changesChannel, defaultTimeout)

// Assert
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID}
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID, lb.ProviderID}
actualAdditionalSubjectIDs := msg.Message().AdditionalSubjectIDs

assert.ElementsMatch(t, expectedAdditionalSubjectIDs, actualAdditionalSubjectIDs)
Expand Down Expand Up @@ -189,7 +189,7 @@ func Test_OriginDeleteHook(t *testing.T) {
msg := testutils.ChannelReceiveWithTimeout[events.Message[events.ChangeMessage]](t, changesChannel, defaultTimeout)

// Assert
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID}
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID, lb.ProviderID}
actualAdditionalSubjectIDs := msg.Message().AdditionalSubjectIDs

assert.ElementsMatch(t, expectedAdditionalSubjectIDs, actualAdditionalSubjectIDs)
Expand Down Expand Up @@ -240,7 +240,7 @@ func Test_PoolUpdateHook(t *testing.T) {
msg := testutils.ChannelReceiveWithTimeout[events.Message[events.ChangeMessage]](t, changesChannel, defaultTimeout)

// Assert
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.ID, pool.OwnerID, lb.ID, lb.LocationID, origin.ID, port.ID}
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.OwnerID, lb.ID, lb.LocationID, lb.ProviderID, origin.ID, port.ID}
actualAdditionalSubjectIDs := msg.Message().AdditionalSubjectIDs

assert.ElementsMatch(t, expectedAdditionalSubjectIDs, actualAdditionalSubjectIDs)
Expand All @@ -267,7 +267,7 @@ func Test_PoolDeleteHook(t *testing.T) {
msg := testutils.ChannelReceiveWithTimeout[events.Message[events.ChangeMessage]](t, changesChannel, defaultTimeout)

// Assert
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.OwnerID, lb.ID, lb.LocationID}
expectedAdditionalSubjectIDs := []gidx.PrefixedID{pool.OwnerID, lb.ID, lb.LocationID, lb.ProviderID}
actualAdditionalSubjectIDs := msg.Message().AdditionalSubjectIDs

assert.ElementsMatch(t, expectedAdditionalSubjectIDs, actualAdditionalSubjectIDs)
Expand Down

0 comments on commit 7e364de

Please sign in to comment.