mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:17:32 +00:00
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>
This commit is contained in:
Stefan Benz
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user