zitadel/internal/query/execution_test.go
Stefan Benz a05f7ce3fc
fix: correct handling of removed targets (#9824)
# Which Problems Are Solved

In Actions v2, if a target is removed, which is still used in an
execution, the target is still listed when list executions.

# How the Problems Are Solved

Removed targets are now also removed from the executions.

# Additional Changes

To be sure the list executions include a check if the target is still
existing.

# Additional Context

None

Co-authored-by: Livio Spring <livio.a@gmail.com>
2025-04-30 12:58:10 +00:00

329 lines
8.7 KiB
Go

package query
import (
"database/sql"
"database/sql/driver"
"errors"
"fmt"
"regexp"
"testing"
"github.com/zitadel/zitadel/internal/domain"
exec "github.com/zitadel/zitadel/internal/repository/execution"
"github.com/zitadel/zitadel/internal/zerrors"
)
var (
prepareExecutionsStmt = `SELECT projections.executions1.instance_id,` +
` projections.executions1.id,` +
` projections.executions1.creation_date,` +
` projections.executions1.change_date,` +
` execution_targets.targets,` +
` COUNT(*) OVER ()` +
` FROM projections.executions1` +
` JOIN (` +
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_OBJECT( 'position' : et.position, 'include' : et.include, 'target' : et.target_id ) ) as targets` +
` FROM projections.executions1_targets AS et` +
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
` GROUP BY et.instance_id, et.execution_id` +
`)` +
` AS execution_targets` +
` ON execution_targets.instance_id = projections.executions1.instance_id` +
` AND execution_targets.execution_id = projections.executions1.id`
prepareExecutionsCols = []string{
"instance_id",
"id",
"creation_date",
"change_date",
"targets",
"count",
}
prepareExecutionStmt = `SELECT projections.executions1.instance_id,` +
` projections.executions1.id,` +
` projections.executions1.creation_date,` +
` projections.executions1.change_date,` +
` execution_targets.targets` +
` FROM projections.executions1` +
` JOIN (` +
`SELECT et.instance_id, et.execution_id, JSONB_AGG( JSON_OBJECT( 'position' : et.position, 'include' : et.include, 'target' : et.target_id ) ) as targets` +
` FROM projections.executions1_targets AS et` +
` INNER JOIN projections.targets2 AS t ON et.instance_id = t.instance_id AND et.target_id IS NOT NULL AND et.target_id = t.id` +
` GROUP BY et.instance_id, et.execution_id` +
`)` +
` AS execution_targets` +
` ON execution_targets.instance_id = projections.executions1.instance_id` +
` AND execution_targets.execution_id = projections.executions1.id`
prepareExecutionCols = []string{
"instance_id",
"id",
"creation_date",
"change_date",
"targets",
}
)
func Test_ExecutionPrepares(t *testing.T) {
type want struct {
sqlExpectations sqlExpectation
err checkErr
}
tests := []struct {
name string
prepare interface{}
want want
object interface{}
}{
{
name: "prepareExecutionsQuery no result",
prepare: prepareExecutionsQuery,
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(prepareExecutionsStmt),
nil,
nil,
),
},
object: &Executions{Executions: []*Execution{}},
},
{
name: "prepareExecutionsQuery one result",
prepare: prepareExecutionsQuery,
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(prepareExecutionsStmt),
prepareExecutionsCols,
[][]driver.Value{
{
"ro",
"id",
testNow,
testNow,
[]byte(`[{"position" : 1, "target" : "target"}, {"position" : 2, "include" : "include"}]`),
},
},
),
},
object: &Executions{
SearchResponse: SearchResponse{
Count: 1,
},
Executions: []*Execution{
{
ObjectDetails: domain.ObjectDetails{
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
ID: "id",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
},
},
},
},
},
{
name: "prepareExecutionsQuery multiple result",
prepare: prepareExecutionsQuery,
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(prepareExecutionsStmt),
prepareExecutionsCols,
[][]driver.Value{
{
"ro",
"id-1",
testNow,
testNow,
[]byte(`[{"position" : 1, "target" : "target"}, {"position" : 2, "include" : "include"}]`),
},
{
"ro",
"id-2",
testNow,
testNow,
[]byte(`[{"position" : 2, "target" : "target"}, {"position" : 1, "include" : "include"}]`),
},
},
),
},
object: &Executions{
SearchResponse: SearchResponse{
Count: 2,
},
Executions: []*Execution{
{
ObjectDetails: domain.ObjectDetails{
ID: "id-1",
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
},
},
{
ObjectDetails: domain.ObjectDetails{
ID: "id-2",
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
},
},
},
},
},
{
name: "prepareExecutionsQuery multiple result, removed target, position missing",
prepare: prepareExecutionsQuery,
want: want{
sqlExpectations: mockQueries(
regexp.QuoteMeta(prepareExecutionsStmt),
prepareExecutionsCols,
[][]driver.Value{
{
"ro",
"id-1",
testNow,
testNow,
[]byte(`[{"position" : 1, "target" : "target"}, {"position" : 3, "include" : "include"}]`),
},
{
"ro",
"id-2",
testNow,
testNow,
[]byte(`[{"position" : 2, "target" : "target"}, {"position" : 1, "include" : "include"}]`),
},
},
),
},
object: &Executions{
SearchResponse: SearchResponse{
Count: 2,
},
Executions: []*Execution{
{
ObjectDetails: domain.ObjectDetails{
ID: "id-1",
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
},
},
{
ObjectDetails: domain.ObjectDetails{
ID: "id-2",
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
},
},
},
},
},
{
name: "prepareExecutionsQuery sql err",
prepare: prepareExecutionsQuery,
want: want{
sqlExpectations: mockQueryErr(
regexp.QuoteMeta(prepareExecutionsStmt),
sql.ErrConnDone,
),
err: func(err error) (error, bool) {
if !errors.Is(err, sql.ErrConnDone) {
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
}
return nil, true
},
},
object: (*Execution)(nil),
},
{
name: "prepareExecutionQuery no result",
prepare: prepareExecutionQuery,
want: want{
sqlExpectations: mockQueriesScanErr(
regexp.QuoteMeta(prepareExecutionStmt),
nil,
nil,
),
err: func(err error) (error, bool) {
if !zerrors.IsNotFound(err) {
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
}
return nil, true
},
},
object: (*Execution)(nil),
},
{
name: "prepareExecutionQuery found",
prepare: prepareExecutionQuery,
want: want{
sqlExpectations: mockQuery(
regexp.QuoteMeta(prepareExecutionStmt),
prepareExecutionCols,
[]driver.Value{
"ro",
"id",
testNow,
testNow,
[]byte(`[{"position" : 1, "target" : "target"}, {"position" : 2, "include" : "include"}]`),
},
),
},
object: &Execution{
ObjectDetails: domain.ObjectDetails{
ID: "id",
EventDate: testNow,
CreationDate: testNow,
ResourceOwner: "ro",
},
Targets: []*exec.Target{
{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
},
},
},
{
name: "prepareExecutionQuery sql err",
prepare: prepareExecutionQuery,
want: want{
sqlExpectations: mockQueryErr(
regexp.QuoteMeta(prepareExecutionStmt),
sql.ErrConnDone,
),
err: func(err error) (error, bool) {
if !errors.Is(err, sql.ErrConnDone) {
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
}
return nil, true
},
},
object: (*Execution)(nil),
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
})
}
}