TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(machine): delete domain policy dependency and restructure functions (#4605)

Browse Source 
* fix(machine): delete domain policy dependency and restructure functions

* fix(machine): delete domain policy dependency and restructure functions

* fix(machine): move check for username and name

* fix: correct unit test for machine

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Stefan Benz
2022-10-26 09:39:56 +01:00
committed by GitHub
parent 27e7dc68a8
commit 71fb5c526f
5 changed files with 218 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
internal/command/user_machine_test.go
View File

@@ -24,11 +24,10 @@ func TestCommandSide_AddMachine(t *testing.T) {
}
type args struct {
ctx context.Context
orgID string
machine *domain.Machine
machine *Machine
}
type res struct {
want *domain.Machine
want *domain.ObjectDetails
err func(error) bool
}
tests := []struct {
@@ -38,16 +37,29 @@ func TestCommandSide_AddMachine(t *testing.T) {
res res
}{
{
name: "user invalid, invalid argument error",
name: "user invalid, invalid argument error name",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate,
true,
true,
true,
),
),
),
),
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
ResourceOwner: "org1",
},
Username: "username",
},
},
@@ -55,6 +67,37 @@ func TestCommandSide_AddMachine(t *testing.T) {
err: caos_errs.IsErrorInvalidArgument,
},
},
{
name: "user invalid, invalid argument error username",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate,
true,
true,
true,
),
),
),
),
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"),
},
args: args{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
ResourceOwner: "org1",
},
Name: "name",
},
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
},
},
{
name: "org policy not found, precondition error",
fields: fields{
@@ -63,13 +106,16 @@ func TestCommandSide_AddMachine(t *testing.T) {
expectFilter(),
expectFilter(),
),
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
Username: "username",
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
ResourceOwner: "org1",
},
Name: "name",
Username: "username",
},
},
res: res{
@@ -91,6 +137,7 @@ func TestCommandSide_AddMachine(t *testing.T) {
),
),
),
expectFilter(),
expectPush(
[]*repository.Event{
eventFromEventPusher(
@@ -109,24 +156,19 @@ func TestCommandSide_AddMachine(t *testing.T) {
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
Username: "username",
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
ResourceOwner: "org1",
},
Description: "description",
Name: "name",
Username: "username",
},
},
res: res{
want: &domain.Machine{
ObjectRoot: models.ObjectRoot{
AggregateID: "user1",
ResourceOwner: "org1",
},
Username: "username",
Name: "name",
Description: "description",
State: domain.UserStateActive,
want: &domain.ObjectDetails{
ResourceOwner: "org1",
},
},
},
@@ -137,7 +179,7 @@ func TestCommandSide_AddMachine(t *testing.T) {
eventstore: tt.fields.eventstore,
idGenerator: tt.fields.idGenerator,
}
got, err := r.AddMachine(tt.args.ctx, tt.args.orgID, tt.args.machine)
got, err := r.AddMachine(tt.args.ctx, tt.args.machine)
if tt.res.err == nil {
assert.NoError(t, err)
}
@@ -157,11 +199,10 @@ func TestCommandSide_ChangeMachine(t *testing.T) {
}
type args struct {
ctx context.Context
orgID string
machine *domain.Machine
machine *Machine
}
type res struct {
want *domain.Machine
want *domain.ObjectDetails
err func(error) bool
}
tests := []struct {
@@ -178,9 +219,11 @@ func TestCommandSide_ChangeMachine(t *testing.T) {
),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
ResourceOwner: "org1",
},
Username: "username",
},
},
@@ -197,14 +240,14 @@ func TestCommandSide_ChangeMachine(t *testing.T) {
),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
AggregateID: "user1",
ResourceOwner: "org1",
AggregateID: "user1",
},
Username: "username",
Name: "name",
Username: "username",
},
},
res: res{
@@ -230,11 +273,11 @@ func TestCommandSide_ChangeMachine(t *testing.T) {
),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
AggregateID: "user1",
ResourceOwner: "org1",
AggregateID: "user1",
},
Name: "name",
Description: "description",
@@ -270,26 +313,19 @@ func TestCommandSide_ChangeMachine(t *testing.T) {
),
},
args: args{
ctx: context.Background(),
orgID: "org1",
machine: &domain.Machine{
ctx: context.Background(),
machine: &Machine{
ObjectRoot: models.ObjectRoot{
AggregateID: "user1",
ResourceOwner: "org1",
AggregateID: "user1",
},
Description: "description1",
Name: "name1",
Description: "description1",
},
},
res: res{
want: &domain.Machine{
ObjectRoot: models.ObjectRoot{
AggregateID: "user1",
ResourceOwner: "org1",
},
Username: "username",
Name: "name1",
Description: "description1",
State: domain.UserStateActive,
want: &domain.ObjectDetails{
ResourceOwner: "org1",
},
},
},