feat: add action v2 execution on requests and responses (#7637)

* feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: add execution of targets to grpc calls * feat: split request and response logic to handle the different context information * feat: split request and response logic to handle the different context information * fix: integration test * fix: import alias * fix: refactor execution package * fix: refactor execution interceptor integration and unit tests * fix: refactor execution interceptor integration and unit tests * fix: refactor execution interceptor integration and unit tests * fix: refactor execution interceptor integration and unit tests * fix: refactor execution interceptor integration and unit tests * docs: basic documentation for executions and targets * fix: change order for interceptors * fix: merge back origin/main * fix: change target definition command and query side (#7735) * fix: change target definition command and query side * fix: correct refactoring name changes * fix: correct refactoring name changes * fix: changing execution defintion with target list and type * fix: changing execution definition with target list and type * fix: add back search queries for target and include * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * fix: projections change for execution with targets suffix table * docs: add example to actions v2 * docs: add example to actions v2 * fix: correct integration tests on query for executions * fix: add separate event for execution v2 as content changed * fix: add separate event for execution v2 as content changed * fix: added review comment changes * fix: added review comment changes * fix: added review comment changes --------- Co-authored-by: adlerhurst <silvan.reusser@gmail.com> * fix: added review comment changes * fix: added review comment changes * Update internal/api/grpc/server/middleware/execution_interceptor.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * fix: added review comment changes * fix: added review comment changes * fix: added review comment changes * fix: added review comment changes * fix: added review comment changes * fix: added review comment changes --------- Co-authored-by: adlerhurst <silvan.reusser@gmail.com> Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-10-09 10:22:56 +00:00 · 2024-05-04 11:55:57 +02:00
parent 7e345444bf
commit 1c5ecba42a
67 changed files with 4397 additions and 1556 deletions
--- a/internal/command/action_v2_execution.go
+++ b/internal/command/action_v2_execution.go
@@ -2,6 +2,7 @@ package command

 import (
 	"context"
+	"strings"

 	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/eventstore/v1/models"
@@ -9,6 +10,10 @@ import (
 	"github.com/zitadel/zitadel/internal/zerrors"
 )

+const (
+	EventGroupSuffix = ".*"
+)
+
 type ExecutionAPICondition struct {
 	Method  string
 	Service string
@@ -134,7 +139,11 @@ func (e *ExecutionEventCondition) ID() string {
 		return execution.ID(domain.ExecutionTypeEvent, e.Event)
 	}
 	if e.Group != "" {
-		return execution.ID(domain.ExecutionTypeEvent, e.Group)
+		group := e.Group
+		if !strings.HasSuffix(e.Group, EventGroupSuffix) {
+			group += EventGroupSuffix
+		}
+		return execution.ID(domain.ExecutionTypeEvent, group)
 	}
 	if e.All {
 		return execution.IDAll(domain.ExecutionTypeEvent)
@@ -168,25 +177,43 @@ func (c *Commands) SetExecutionEvent(ctx context.Context, cond *ExecutionEventCo
 type SetExecution struct {
 	models.ObjectRoot

-	Targets  []string
-	Includes []string
+	Targets []*execution.Target
+}
+
+func (t SetExecution) GetIncludes() []string {
+	includes := make([]string, 0)
+	for i := range t.Targets {
+		if t.Targets[i].Type == domain.ExecutionTargetTypeInclude {
+			includes = append(includes, t.Targets[i].Target)
+		}
+	}
+	return includes
+}
+
+func (t SetExecution) GetTargets() []string {
+	targets := make([]string, 0)
+	for i := range t.Targets {
+		if t.Targets[i].Type == domain.ExecutionTargetTypeTarget {
+			targets = append(targets, t.Targets[i].Target)
+		}
+	}
+	return targets
 }

 func (e *SetExecution) IsValid() error {
-	if len(e.Targets) == 0 && len(e.Includes) == 0 {
+	if len(e.Targets) == 0 {
 		return zerrors.ThrowInvalidArgument(nil, "COMMAND-56bteot2uj", "Errors.Execution.NoTargets")
 	}
-	if len(e.Targets) > 0 && len(e.Includes) > 0 {
-		return zerrors.ThrowInvalidArgument(nil, "COMMAND-5zleae34r1", "Errors.Execution.Invalid")
-	}
 	return nil
 }

 func (e *SetExecution) Existing(c *Commands, ctx context.Context, resourceOwner string) error {
-	if len(e.Targets) > 0 && !c.existsTargetsByIDs(ctx, e.Targets, resourceOwner) {
+	targets := e.GetTargets()
+	if len(targets) > 0 && !c.existsTargetsByIDs(ctx, targets, resourceOwner) {
 		return zerrors.ThrowNotFound(nil, "COMMAND-17e8fq1ggk", "Errors.Target.NotFound")
 	}
-	if len(e.Includes) > 0 && !c.existsExecutionsByIDs(ctx, e.Includes, resourceOwner) {
+	includes := e.GetIncludes()
+	if len(includes) > 0 && !c.existsExecutionsByIDs(ctx, includes, resourceOwner) {
 		return zerrors.ThrowNotFound(nil, "COMMAND-slgj0l4cdz", "Errors.Execution.IncludeNotFound")
 	}
 	return nil
@@ -206,11 +233,10 @@ func (c *Commands) setExecution(ctx context.Context, set *SetExecution, resource
 		return nil, err
 	}

-	if err := c.pushAppendAndReduce(ctx, wm, execution.NewSetEvent(
+	if err := c.pushAppendAndReduce(ctx, wm, execution.NewSetEventV2(
 		ctx,
 		ExecutionAggregateFromWriteModel(&wm.WriteModel),
 		set.Targets,
-		set.Includes,
 	)); err != nil {
 		return nil, err
 	}
--- a/internal/command/action_v2_execution_model.go
+++ b/internal/command/action_v2_execution_model.go
@@ -10,12 +10,13 @@ import (
 type ExecutionWriteModel struct {
 	eventstore.WriteModel

-	Targets  []string
-	Includes []string
+	Targets          []string
+	Includes         []string
+	ExecutionTargets []*execution.Target
 }

 func (e *ExecutionWriteModel) Exists() bool {
-	return len(e.Targets) > 0 || len(e.Includes) > 0
+	return len(e.ExecutionTargets) > 0 || len(e.Includes) > 0 || len(e.Targets) > 0
 }

 func NewExecutionWriteModel(id string, resourceOwner string) *ExecutionWriteModel {
@@ -34,9 +35,12 @@ func (wm *ExecutionWriteModel) Reduce() error {
 		case *execution.SetEvent:
 			wm.Targets = e.Targets
 			wm.Includes = e.Includes
+		case *execution.SetEventV2:
+			wm.ExecutionTargets = e.Targets
 		case *execution.RemovedEvent:
 			wm.Targets = nil
 			wm.Includes = nil
+			wm.ExecutionTargets = nil
 		}
 	}
 	return wm.WriteModel.Reduce()
@@ -49,6 +53,7 @@ func (wm *ExecutionWriteModel) Query() *eventstore.SearchQueryBuilder {
 		AggregateTypes(execution.AggregateType).
 		AggregateIDs(wm.AggregateID).
 		EventTypes(execution.SetEventType,
+			execution.SetEventV2Type,
 			execution.RemovedEventType).
 		Builder()
 }
@@ -91,6 +96,10 @@ func (wm *ExecutionsExistWriteModel) Reduce() error {
 			if !slices.Contains(wm.existingIDs, e.Aggregate().ID) {
 				wm.existingIDs = append(wm.existingIDs, e.Aggregate().ID)
 			}
+		case *execution.SetEventV2:
+			if !slices.Contains(wm.existingIDs, e.Aggregate().ID) {
+				wm.existingIDs = append(wm.existingIDs, e.Aggregate().ID)
+			}
 		case *execution.RemovedEvent:
 			i := slices.Index(wm.existingIDs, e.Aggregate().ID)
 			if i >= 0 {
@@ -108,6 +117,7 @@ func (wm *ExecutionsExistWriteModel) Query() *eventstore.SearchQueryBuilder {
 		AggregateTypes(execution.AggregateType).
 		AggregateIDs(wm.ids...).
 		EventTypes(execution.SetEventType,
+			execution.SetEventV2Type,
 			execution.RemovedEventType).
 		Builder()
 }
--- a/internal/command/action_v2_execution_model_test.go
+++ b/internal/command/action_v2_execution_model_test.go
@@ -6,6 +6,7 @@ import (

 	"github.com/stretchr/testify/assert"

+	"github.com/zitadel/zitadel/internal/domain"
 	"github.com/zitadel/zitadel/internal/eventstore"
 	"github.com/zitadel/zitadel/internal/repository/execution"
 )
@@ -32,10 +33,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -53,10 +56,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -65,10 +70,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -91,10 +98,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -112,10 +121,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -138,24 +149,30 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -174,17 +191,21 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -193,10 +214,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -214,17 +237,21 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -233,10 +260,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -254,24 +283,30 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -299,24 +334,30 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 					),
@@ -334,10 +375,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -346,17 +389,21 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -385,10 +432,12 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution1", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
@@ -397,17 +446,21 @@ func TestCommandSide_executionsExistsWriteModel(t *testing.T) {
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution2", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
-							execution.NewSetEvent(context.Background(),
+							execution.NewSetEventV2(context.Background(),
 								execution.NewAggregate("execution3", "org1"),
-								[]string{"target"},
-								[]string{"include"},
+								[]*execution.Target{
+									{Type: domain.ExecutionTargetTypeTarget, Target: "target"},
+									{Type: domain.ExecutionTargetTypeInclude, Target: "include"},
+								},
 							),
 						),
 						eventFromEventPusher(
--- a/internal/command/action_v2_execution_test.go
+++ b/internal/command/action_v2_execution_test.go
--- a/internal/command/action_v2_target.go
+++ b/internal/command/action_v2_target.go
@@ -16,9 +16,8 @@ type AddTarget struct {

 	Name             string
 	TargetType       domain.TargetType
-	URL              string
+	Endpoint         string
 	Timeout          time.Duration
-	Async            bool
 	InterruptOnError bool
 }

@@ -29,9 +28,9 @@ func (a *AddTarget) IsValid() error {
 	if a.Timeout == 0 {
 		return zerrors.ThrowInvalidArgument(nil, "COMMAND-39f35d8uri", "Errors.Target.NoTimeout")
 	}
-	_, err := url.Parse(a.URL)
-	if err != nil || a.URL == "" {
-		return zerrors.ThrowInvalidArgument(nil, "COMMAND-1r2k6qo6wg", "Errors.Target.InvalidURL")
+	_, err := url.Parse(a.Endpoint)
+	if err != nil || a.Endpoint == "" {
+		return zerrors.ThrowInvalidArgument(err, "COMMAND-1r2k6qo6wg", "Errors.Target.InvalidURL")
 	}

 	return nil
@@ -65,9 +64,8 @@ func (c *Commands) AddTarget(ctx context.Context, add *AddTarget, resourceOwner
 		TargetAggregateFromWriteModel(&wm.WriteModel),
 		add.Name,
 		add.TargetType,
-		add.URL,
+		add.Endpoint,
 		add.Timeout,
-		add.Async,
 		add.InterruptOnError,
 	))
 	if err != nil {
@@ -84,9 +82,8 @@ type ChangeTarget struct {

 	Name             *string
 	TargetType       *domain.TargetType
-	URL              *string
+	Endpoint         *string
 	Timeout          *time.Duration
-	Async            *bool
 	InterruptOnError *bool
 }

@@ -100,10 +97,10 @@ func (a *ChangeTarget) IsValid() error {
 	if a.Timeout != nil && *a.Timeout == 0 {
 		return zerrors.ThrowInvalidArgument(nil, "COMMAND-08b39vdi57", "Errors.Target.NoTimeout")
 	}
-	if a.URL != nil {
-		_, err := url.Parse(*a.URL)
-		if err != nil || *a.URL == "" {
-			return zerrors.ThrowInvalidArgument(nil, "COMMAND-jsbaera7b6", "Errors.Target.InvalidURL")
+	if a.Endpoint != nil {
+		_, err := url.Parse(*a.Endpoint)
+		if err != nil || *a.Endpoint == "" {
+			return zerrors.ThrowInvalidArgument(err, "COMMAND-jsbaera7b6", "Errors.Target.InvalidURL")
 		}
 	}
 	return nil
@@ -130,9 +127,8 @@ func (c *Commands) ChangeTarget(ctx context.Context, change *ChangeTarget, resou
 		TargetAggregateFromWriteModel(&existing.WriteModel),
 		change.Name,
 		change.TargetType,
-		change.URL,
+		change.Endpoint,
 		change.Timeout,
-		change.Async,
 		change.InterruptOnError)
 	if changedEvent == nil {
 		return writeModelToObjectDetails(&existing.WriteModel), nil
--- a/internal/command/action_v2_target_model.go
+++ b/internal/command/action_v2_target_model.go
@@ -15,9 +15,8 @@ type TargetWriteModel struct {

 	Name             string
 	TargetType       domain.TargetType
-	URL              string
+	Endpoint         string
 	Timeout          time.Duration
-	Async            bool
 	InterruptOnError bool

 	State domain.TargetState
@@ -39,9 +38,8 @@ func (wm *TargetWriteModel) Reduce() error {
 		case *target.AddedEvent:
 			wm.Name = e.Name
 			wm.TargetType = e.TargetType
-			wm.URL = e.URL
+			wm.Endpoint = e.Endpoint
 			wm.Timeout = e.Timeout
-			wm.Async = e.Async
 			wm.State = domain.TargetActive
 		case *target.ChangedEvent:
 			if e.Name != nil {
@@ -50,15 +48,12 @@ func (wm *TargetWriteModel) Reduce() error {
 			if e.TargetType != nil {
 				wm.TargetType = *e.TargetType
 			}
-			if e.URL != nil {
-				wm.URL = *e.URL
+			if e.Endpoint != nil {
+				wm.Endpoint = *e.Endpoint
 			}
 			if e.Timeout != nil {
 				wm.Timeout = *e.Timeout
 			}
-			if e.Async != nil {
-				wm.Async = *e.Async
-			}
 			if e.InterruptOnError != nil {
 				wm.InterruptOnError = *e.InterruptOnError
 			}
@@ -86,9 +81,8 @@ func (wm *TargetWriteModel) NewChangedEvent(
 	agg *eventstore.Aggregate,
 	name *string,
 	targetType *domain.TargetType,
-	url *string,
+	endpoint *string,
 	timeout *time.Duration,
-	async *bool,
 	interruptOnError *bool,
 ) *target.ChangedEvent {
 	changes := make([]target.Changes, 0)
@@ -98,15 +92,12 @@ func (wm *TargetWriteModel) NewChangedEvent(
 	if targetType != nil && wm.TargetType != *targetType {
 		changes = append(changes, target.ChangeTargetType(*targetType))
 	}
-	if url != nil && wm.URL != *url {
-		changes = append(changes, target.ChangeURL(*url))
+	if endpoint != nil && wm.Endpoint != *endpoint {
+		changes = append(changes, target.ChangeEndpoint(*endpoint))
 	}
 	if timeout != nil && wm.Timeout != *timeout {
 		changes = append(changes, target.ChangeTimeout(*timeout))
 	}
-	if async != nil && wm.Async != *async {
-		changes = append(changes, target.ChangeAsync(*async))
-	}
 	if interruptOnError != nil && wm.InterruptOnError != *interruptOnError {
 		changes = append(changes, target.ChangeInterruptOnError(*interruptOnError))
 	}
--- a/internal/command/action_v2_target_model_test.go
+++ b/internal/command/action_v2_target_model_test.go
@@ -20,7 +20,6 @@ func targetAddEvent(aggID, resourceOwner string) *target.AddedEvent {
 		"https://example.com",
 		time.Second,
 		false,
-		false,
 	)
 }

--- a/internal/command/action_v2_target_test.go
+++ b/internal/command/action_v2_target_test.go
@@ -19,7 +19,7 @@ import (

 func TestCommands_AddTarget(t *testing.T) {
 	type fields struct {
-		eventstore  *eventstore.Eventstore
+		eventstore  func(t *testing.T) *eventstore.Eventstore
 		idGenerator id.Generator
 	}
 	type args struct {
@@ -41,7 +41,7 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"no resourceowner, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx:           context.Background(),
@@ -55,12 +55,12 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"no name, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx:           context.Background(),
 				add:           &AddTarget{},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -69,50 +69,50 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"no timeout, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				add: &AddTarget{
 					Name: "name",
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
 			},
 		},
 		{
-			"no url, error",
+			"no Endpoint, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				add: &AddTarget{
-					Name:    "name",
-					Timeout: time.Second,
-					URL:     "",
+					Name:     "name",
+					Timeout:  time.Second,
+					Endpoint: "",
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
 			},
 		},
 		{
-			"no parsable url, error",
+			"no parsable Endpoint, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				add: &AddTarget{
-					Name:    "name",
-					Timeout: time.Second,
-					URL:     "://",
+					Name:     "name",
+					Timeout:  time.Second,
+					Endpoint: "://",
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -121,18 +121,17 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"unique constraint failed, error",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(),
 					expectPushFailed(
 						zerrors.ThrowPreconditionFailed(nil, "id", "name already exists"),
 						target.NewAddedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
+							target.NewAggregate("id1", "instance"),
 							"name",
 							domain.TargetTypeWebhook,
 							"https://example.com",
 							time.Second,
 							false,
-							false,
 						),
 					),
 				),
@@ -142,11 +141,11 @@ func TestCommands_AddTarget(t *testing.T) {
 				ctx: context.Background(),
 				add: &AddTarget{
 					Name:       "name",
-					URL:        "https://example.com",
+					Endpoint:   "https://example.com",
 					Timeout:    time.Second,
 					TargetType: domain.TargetTypeWebhook,
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsPreconditionFailed,
@@ -155,16 +154,10 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"already existing",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
-						target.NewAddedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
-							"name",
-							domain.TargetTypeWebhook,
-							"https://example.com",
-							time.Second,
-							false,
-							false,
+						eventFromEventPusher(
+							targetAddEvent("target", "instance"),
 						),
 					),
 				),
@@ -176,9 +169,9 @@ func TestCommands_AddTarget(t *testing.T) {
 					Name:       "name",
 					TargetType: domain.TargetTypeWebhook,
 					Timeout:    time.Second,
-					URL:        "https://example.com",
+					Endpoint:   "https://example.com",
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorAlreadyExists,
@@ -187,18 +180,10 @@ func TestCommands_AddTarget(t *testing.T) {
 		{
 			"push ok",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(),
 					expectPush(
-						target.NewAddedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
-							"name",
-							domain.TargetTypeWebhook,
-							"https://example.com",
-							time.Second,
-							false,
-							false,
-						),
+						targetAddEvent("id1", "instance"),
 					),
 				),
 				idGenerator: mock.ExpectID(t, "id1"),
@@ -209,32 +194,28 @@ func TestCommands_AddTarget(t *testing.T) {
 					Name:       "name",
 					TargetType: domain.TargetTypeWebhook,
 					Timeout:    time.Second,
-					URL:        "https://example.com",
+					Endpoint:   "https://example.com",
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				id: "id1",
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
 		{
 			"push full ok",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(),
 					expectPush(
-						target.NewAddedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
-							"name",
-							domain.TargetTypeWebhook,
-							"https://example.com",
-							time.Second,
-							true,
-							true,
-						),
+						func() eventstore.Command {
+							event := targetAddEvent("id1", "instance")
+							event.InterruptOnError = true
+							return event
+						}(),
 					),
 				),
 				idGenerator: mock.ExpectID(t, "id1"),
@@ -244,17 +225,16 @@ func TestCommands_AddTarget(t *testing.T) {
 				add: &AddTarget{
 					Name:             "name",
 					TargetType:       domain.TargetTypeWebhook,
-					URL:              "https://example.com",
+					Endpoint:         "https://example.com",
 					Timeout:          time.Second,
-					Async:            true,
 					InterruptOnError: true,
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				id: "id1",
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
@@ -262,7 +242,7 @@ func TestCommands_AddTarget(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &Commands{
-				eventstore:  tt.fields.eventstore,
+				eventstore:  tt.fields.eventstore(t),
 				idGenerator: tt.fields.idGenerator,
 			}
 			details, err := c.AddTarget(tt.args.ctx, tt.args.add, tt.args.resourceOwner)
@@ -282,7 +262,7 @@ func TestCommands_AddTarget(t *testing.T) {

 func TestCommands_ChangeTarget(t *testing.T) {
 	type fields struct {
-		eventstore *eventstore.Eventstore
+		eventstore func(t *testing.T) *eventstore.Eventstore
 	}
 	type args struct {
 		ctx           context.Context
@@ -302,7 +282,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"resourceowner missing, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx:           context.Background(),
@@ -316,12 +296,12 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"id missing, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx:           context.Background(),
 				change:        &ChangeTarget{},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -330,14 +310,14 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"name empty, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				change: &ChangeTarget{
 					Name: gu.Ptr(""),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -346,46 +326,46 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"timeout empty, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				change: &ChangeTarget{
 					Timeout: gu.Ptr(time.Duration(0)),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
 			},
 		},
 		{
-			"url empty, error",
+			"Endpoint empty, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				change: &ChangeTarget{
-					URL: gu.Ptr(""),
+					Endpoint: gu.Ptr(""),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
 			},
 		},
 		{
-			"url not parsable, error",
+			"Endpoint not parsable, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx: context.Background(),
 				change: &ChangeTarget{
-					URL: gu.Ptr("://"),
+					Endpoint: gu.Ptr("://"),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -394,7 +374,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"not found, error",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(),
 				),
 			},
@@ -406,7 +386,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
 					},
 					Name: gu.Ptr("name"),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsNotFound,
@@ -415,18 +395,10 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"no changes",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							target.NewAddedEvent(context.Background(),
-								target.NewAggregate("id1", "org1"),
-								"name",
-								domain.TargetTypeWebhook,
-								"https://example.com",
-								0,
-								false,
-								false,
-							),
+							targetAddEvent("target", "instance"),
 						),
 					),
 				),
@@ -439,35 +411,27 @@ func TestCommands_ChangeTarget(t *testing.T) {
 					},
 					TargetType: gu.Ptr(domain.TargetTypeWebhook),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
 		{
 			"unique constraint failed, error",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							target.NewAddedEvent(context.Background(),
-								target.NewAggregate("id1", "org1"),
-								"name",
-								domain.TargetTypeWebhook,
-								"https://example.com",
-								0,
-								false,
-								false,
-							),
+							targetAddEvent("target", "instance"),
 						),
 					),
 					expectPushFailed(
 						zerrors.ThrowPreconditionFailed(nil, "id", "name already exists"),
 						target.NewChangedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
+							target.NewAggregate("id1", "instance"),
 							[]target.Changes{
 								target.ChangeName("name", "name2"),
 							},
@@ -483,7 +447,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
 					},
 					Name: gu.Ptr("name2"),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsPreconditionFailed,
@@ -492,23 +456,15 @@ func TestCommands_ChangeTarget(t *testing.T) {
 		{
 			"push ok",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							target.NewAddedEvent(context.Background(),
-								target.NewAggregate("id1", "org1"),
-								"name",
-								domain.TargetTypeWebhook,
-								"https://example.com",
-								0,
-								false,
-								false,
-							),
+							targetAddEvent("id1", "instance"),
 						),
 					),
 					expectPush(
 						target.NewChangedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
+							target.NewAggregate("id1", "instance"),
 							[]target.Changes{
 								target.ChangeName("name", "name2"),
 							},
@@ -524,40 +480,31 @@ func TestCommands_ChangeTarget(t *testing.T) {
 					},
 					Name: gu.Ptr("name2"),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
 		{
 			"push full ok",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							target.NewAddedEvent(context.Background(),
-								target.NewAggregate("id1", "org1"),
-								"name",
-								domain.TargetTypeWebhook,
-								"https://example.com",
-								0,
-								false,
-								false,
-							),
+							targetAddEvent("id1", "instance"),
 						),
 					),
 					expectPush(
 						target.NewChangedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
+							target.NewAggregate("id1", "instance"),
 							[]target.Changes{
 								target.ChangeName("name", "name2"),
-								target.ChangeURL("https://example2.com"),
-								target.ChangeTargetType(domain.TargetTypeRequestResponse),
-								target.ChangeTimeout(time.Second),
-								target.ChangeAsync(true),
+								target.ChangeEndpoint("https://example2.com"),
+								target.ChangeTargetType(domain.TargetTypeCall),
+								target.ChangeTimeout(10 * time.Second),
 								target.ChangeInterruptOnError(true),
 							},
 						),
@@ -571,17 +518,16 @@ func TestCommands_ChangeTarget(t *testing.T) {
 						AggregateID: "id1",
 					},
 					Name:             gu.Ptr("name2"),
-					URL:              gu.Ptr("https://example2.com"),
-					TargetType:       gu.Ptr(domain.TargetTypeRequestResponse),
-					Timeout:          gu.Ptr(time.Second),
-					Async:            gu.Ptr(true),
+					Endpoint:         gu.Ptr("https://example2.com"),
+					TargetType:       gu.Ptr(domain.TargetTypeCall),
+					Timeout:          gu.Ptr(10 * time.Second),
 					InterruptOnError: gu.Ptr(true),
 				},
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
@@ -589,7 +535,7 @@ func TestCommands_ChangeTarget(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &Commands{
-				eventstore: tt.fields.eventstore,
+				eventstore: tt.fields.eventstore(t),
 			}
 			details, err := c.ChangeTarget(tt.args.ctx, tt.args.change, tt.args.resourceOwner)
 			if tt.res.err == nil {
@@ -607,7 +553,7 @@ func TestCommands_ChangeTarget(t *testing.T) {

 func TestCommands_DeleteTarget(t *testing.T) {
 	type fields struct {
-		eventstore *eventstore.Eventstore
+		eventstore func(t *testing.T) *eventstore.Eventstore
 	}
 	type args struct {
 		ctx           context.Context
@@ -627,12 +573,12 @@ func TestCommands_DeleteTarget(t *testing.T) {
 		{
 			"id missing, error",
 			fields{
-				eventstore: eventstoreExpect(t),
+				eventstore: expectEventstore(),
 			},
 			args{
 				ctx:           context.Background(),
 				id:            "",
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsErrorInvalidArgument,
@@ -641,14 +587,14 @@ func TestCommands_DeleteTarget(t *testing.T) {
 		{
 			"not found, error",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(),
 				),
 			},
 			args{
 				ctx:           context.Background(),
 				id:            "id1",
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				err: zerrors.IsNotFound,
@@ -657,23 +603,15 @@ func TestCommands_DeleteTarget(t *testing.T) {
 		{
 			"remove ok",
 			fields{
-				eventstore: eventstoreExpect(t,
+				eventstore: expectEventstore(
 					expectFilter(
 						eventFromEventPusher(
-							target.NewAddedEvent(context.Background(),
-								target.NewAggregate("id1", "org1"),
-								"name",
-								domain.TargetTypeWebhook,
-								"https://example.com",
-								0,
-								false,
-								false,
-							),
+							targetAddEvent("id1", "instance"),
 						),
 					),
 					expectPush(
 						target.NewRemovedEvent(context.Background(),
-							target.NewAggregate("id1", "org1"),
+							target.NewAggregate("id1", "instance"),
 							"name",
 						),
 					),
@@ -682,11 +620,11 @@ func TestCommands_DeleteTarget(t *testing.T) {
 			args{
 				ctx:           context.Background(),
 				id:            "id1",
-				resourceOwner: "org1",
+				resourceOwner: "instance",
 			},
 			res{
 				details: &domain.ObjectDetails{
-					ResourceOwner: "org1",
+					ResourceOwner: "instance",
 				},
 			},
 		},
@@ -694,7 +632,7 @@ func TestCommands_DeleteTarget(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := &Commands{
-				eventstore: tt.fields.eventstore,
+				eventstore: tt.fields.eventstore(t),
 			}
 			details, err := c.DeleteTarget(tt.args.ctx, tt.args.id, tt.args.resourceOwner)
 			if tt.res.err == nil {