feat: split users into human and machine (#470)

* feat(management): service accounts * chore: current go version * init * refactor: apis * feat(internal): start impl of service account * chore: start impl of machine/human users * code compiles * fix: tests * fix: tests * fix: add new event types to switches * chore: add cases to event types * fix(management): definitive proto messages * fix: machine/human * fix: add missing tables as todos * fix: remove unused permissions * fix: refactoring * fix: refactor * fix: human registered * fix: user id * fix: logid * fix: proto remove //equal * chore(management): remove no comment * fix: human mfas * fix: user subobjects * chore: rename existing to better name * fix: username in user (#634) * fix: username in user * fix: username * fix remove unused code * fix add validations * fix: use new user in all apis * fix: regexp for username in api * fix: fill user data for human and machine (#638) * fix: fill Display name grant/member handlers fix: add description to grant/member objects in api fix: check if user is human in login * fix: remove description from member and grant * chore: remove todos * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix partial authconfig prompt, domain c perm * membership read check * contributor refresh trigger, observe org write * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * user permissions, project deactivate * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <florian@caos.ch> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <florian@caos.ch> * allow user grants for project.write * management service * fix mgmt service * feat: Machine keys (#655) * fix: memberships (#633) * feat: add iam members to memberships * fix: search project grants * fix: rename * feat: idp and login policy configurations (#619) * feat: oidc config * fix: oidc configurations * feat: oidc idp config * feat: add oidc config test * fix: tests * fix: tests * feat: translate new events * feat: idp eventstore * feat: idp eventstore * fix: tests * feat: command side idp * feat: query side idp * feat: idp config on org * fix: tests * feat: authz idp on org * feat: org idps * feat: login policy * feat: login policy * feat: login policy * feat: add idp func on login policy * feat: add validation to loginpolicy and idp provider * feat: add default login policy * feat: login policy on org * feat: login policy on org * fix: id config handlers * fix: id config handlers * fix: create idp on org * fix: create idp on org * fix: not existing idp config * fix: default login policy * fix: add login policy on org * fix: idp provider search on org * fix: test * fix: remove idp on org * fix: test * fix: test * fix: remove admin idp * fix: logo src as byte * fix: migration * fix: tests * Update internal/iam/repository/eventsourcing/iam.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/org/repository/eventsourcing/org_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * fix: pr comments * fix: tests * Update types.go * fix: merge request changes * fix: reduce optimization Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> * fix: reread user mfas, preferred loginname as otp account name (#636) * fix: reread user mfas * fix: use preferred login name as otp account name * fix: tests * fix: reduce (#635) * fix: management reduce optimization * fix: reduce optimization * fix: reduce optimization * fix: merge master * chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627) Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/gorilla/schema/releases) - [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624) Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0. - [Release notes](https://github.com/gorilla/mux/releases) - [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591) Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases) - [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: auto assign issues and PR to ZTIADEL project board (#643) * Create main.yml * Update main.yml Co-authored-by: Livio Amstutz <livio.a@gmail.com> * fix(console): project grant members, update deps (#645) * fix: searchprojectgrantmembers * chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622) Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular-devkit/build-angular in /console (#626) Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> * chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623) Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update packlock Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: delete main.yml (#648) * fix: usergrant (#650) * fix(console): mfa refresh after verification, member eventemitter (#651) * refresh mfa * fix: detail link from contributors * lint * feat: add domain verification notification (#649) * fix: dont (re)generate client secret with auth type none * fix(cors): allow Origin from request * feat: add origin allow list and fix some core issues * rename migration * fix UserIDsByDomain * feat: send email to users after domain claim * username * check origin on userinfo * update oidc pkg * fix: add migration 1.6 * change username * change username * remove unique email aggregate * change username in mgmt * search global user by login name * fix test * change user search in angular * fix tests * merge * userview in angular * fix merge * Update pkg/grpc/management/proto/management.proto Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * Update internal/notification/static/i18n/de.yaml Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix: translation (#647) * fix: translation * fix: translation * fix: translation * fix: remove unused code * fix: log err * fix: migration numbers (#652) * chore: issue / feature templates (#642) * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * feat: global org read (#657) * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <florian@caos.ch> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <florian@caos.ch> * refactor: protos * fix(management): key expiration date * fix: check if user is human * fix: marshal key details * fix: correct generate login names * fix: logid Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com> Co-authored-by: Florian Forster <florian@caos.ch> * fix: naming * refactor: findings * fix: username * fix: mfa upper case * fix: tests * fix: add translations * reactivatemyorg req typeö * fix: projectType for console * fix: user changes * fix: translate events * fix: event type translation * fix: remove unused types Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-12 03:57:32 +00:00 · 2020-08-31 17:48:01 +02:00
parent c1c85e632b
commit 5abd5b0505
207 changed files with 52837 additions and 26745 deletions
--- a/internal/project/repository/eventsourcing/model/application_test.go
+++ b/internal/project/repository/eventsourcing/model/application_test.go
@@ -2,15 +2,16 @@ package model

 import (
 	"encoding/json"
+	"testing"
+
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
 	"github.com/caos/zitadel/internal/project/model"
-	"testing"
 )

 func TestApplicationChanges(t *testing.T) {
 	type args struct {
-		existing *Application
-		new      *Application
+		existingProject *Application
+		newProject      *Application
 	}
 	type res struct {
 		changesLen int
@@ -23,8 +24,8 @@ func TestApplicationChanges(t *testing.T) {
 		{
 			name: "application name changes",
 			args: args{
-				existing: &Application{AppID: "AppID", Name: "Name"},
-				new:      &Application{AppID: "AppID", Name: "NameChanged"},
+				existingProject: &Application{AppID: "AppID", Name: "Name"},
+				newProject:      &Application{AppID: "AppID", Name: "NameChanged"},
 			},
 			res: res{
 				changesLen: 2,
@@ -33,8 +34,8 @@ func TestApplicationChanges(t *testing.T) {
 		{
 			name: "no changes",
 			args: args{
-				existing: &Application{AppID: "AppID", Name: "Name"},
-				new:      &Application{AppID: "AppID", Name: "Name"},
+				existingProject: &Application{AppID: "AppID", Name: "Name"},
+				newProject:      &Application{AppID: "AppID", Name: "Name"},
 			},
 			res: res{
 				changesLen: 1,
@@ -43,7 +44,7 @@ func TestApplicationChanges(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			changes := tt.args.existing.Changes(tt.args.new)
+			changes := tt.args.existingProject.Changes(tt.args.newProject)
 			if len(changes) != tt.res.changesLen {
 				t.Errorf("got wrong changes len: expected: %v, actual: %v ", tt.res.changesLen, len(changes))
 			}
@@ -69,7 +70,11 @@ func TestAppendAddAppEvent(t *testing.T) {
 				app:     &Application{Name: "Application"},
 				event:   &es_models.Event{},
 			},
-			result: &Project{Applications: []*Application{&Application{Name: "Application"}}},
+			result: &Project{
+				Applications: []*Application{
+					{Name: "Application"},
+				},
+			},
 		},
 	}
 	for _, tt := range tests {
@@ -103,11 +108,19 @@ func TestAppendChangeAppEvent(t *testing.T) {
 		{
 			name: "append change application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{Name: "Application"}}},
-				app:     &Application{Name: "Application Change"},
-				event:   &es_models.Event{},
+				project: &Project{
+					Applications: []*Application{
+						{Name: "Application"},
+					},
+				},
+				app:   &Application{Name: "Application Change"},
+				event: &es_models.Event{},
+			},
+			result: &Project{
+				Applications: []*Application{
+					{Name: "Application Change"},
+				},
 			},
-			result: &Project{Applications: []*Application{&Application{Name: "Application Change"}}},
 		},
 	}
 	for _, tt := range tests {
@@ -141,9 +154,13 @@ func TestAppendRemoveAppEvent(t *testing.T) {
 		{
 			name: "append remove application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{AppID: "AppID", Name: "Application"}}},
-				app:     &Application{AppID: "AppID", Name: "Application"},
-				event:   &es_models.Event{},
+				project: &Project{
+					Applications: []*Application{
+						{AppID: "AppID", Name: "Application"},
+					},
+				},
+				app:   &Application{AppID: "AppID", Name: "Application"},
+				event: &es_models.Event{},
 			},
 			result: &Project{Applications: []*Application{}},
 		},
@@ -177,22 +194,38 @@ func TestAppendAppStateEvent(t *testing.T) {
 		{
 			name: "append deactivate application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{AppID: "AppID", Name: "Application", State: int32(model.AppStateActive)}}},
-				app:     &ApplicationID{AppID: "AppID"},
-				event:   &es_models.Event{},
-				state:   model.AppStateInactive,
+				project: &Project{
+					Applications: []*Application{
+						{AppID: "AppID", Name: "Application", State: int32(model.AppStateActive)},
+					},
+				},
+				app:   &ApplicationID{AppID: "AppID"},
+				event: &es_models.Event{},
+				state: model.AppStateInactive,
+			},
+			result: &Project{
+				Applications: []*Application{
+					{AppID: "AppID", Name: "Application", State: int32(model.AppStateInactive)},
+				},
 			},
-			result: &Project{Applications: []*Application{&Application{AppID: "AppID", Name: "Application", State: int32(model.AppStateInactive)}}},
 		},
 		{
 			name: "append reactivate application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{AppID: "AppID", Name: "Application", State: int32(model.AppStateInactive)}}},
-				app:     &ApplicationID{AppID: "AppID"},
-				event:   &es_models.Event{},
-				state:   model.AppStateActive,
+				project: &Project{
+					Applications: []*Application{
+						{AppID: "AppID", Name: "Application", State: int32(model.AppStateInactive)},
+					},
+				},
+				app:   &ApplicationID{AppID: "AppID"},
+				event: &es_models.Event{},
+				state: model.AppStateActive,
+			},
+			result: &Project{
+				Applications: []*Application{
+					{AppID: "AppID", Name: "Application", State: int32(model.AppStateActive)},
+				},
 			},
-			result: &Project{Applications: []*Application{&Application{AppID: "AppID", Name: "Application", State: int32(model.AppStateActive)}}},
 		},
 	}
 	for _, tt := range tests {
--- a/internal/project/repository/eventsourcing/model/oidc_config_test.go
+++ b/internal/project/repository/eventsourcing/model/oidc_config_test.go
@@ -2,14 +2,15 @@ package model

 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
 	"testing"
+
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
 )

 func TestOIDCConfigChanges(t *testing.T) {
 	type args struct {
-		existing *OIDCConfig
-		new      *OIDCConfig
+		existingConfig *OIDCConfig
+		newConfig      *OIDCConfig
 	}
 	type res struct {
 		changesLen int
@@ -22,7 +23,7 @@ func TestOIDCConfigChanges(t *testing.T) {
 		{
 			name: "all possible values change",
 			args: args{
-				existing: &OIDCConfig{
+				existingConfig: &OIDCConfig{
 					AppID:                  "AppID",
 					RedirectUris:           []string{"RedirectUris"},
 					ResponseTypes:          []int32{1},
@@ -31,7 +32,7 @@ func TestOIDCConfigChanges(t *testing.T) {
 					AuthMethodType:         1,
 					PostLogoutRedirectUris: []string{"PostLogoutRedirectUris"},
 				},
-				new: &OIDCConfig{
+				newConfig: &OIDCConfig{
 					AppID:                  "AppID",
 					RedirectUris:           []string{"RedirectUrisChanged"},
 					ResponseTypes:          []int32{2},
@@ -48,7 +49,7 @@ func TestOIDCConfigChanges(t *testing.T) {
 		{
 			name: "no changes",
 			args: args{
-				existing: &OIDCConfig{
+				existingConfig: &OIDCConfig{
 					AppID:                  "AppID",
 					RedirectUris:           []string{"RedirectUris"},
 					ResponseTypes:          []int32{1},
@@ -57,7 +58,7 @@ func TestOIDCConfigChanges(t *testing.T) {
 					AuthMethodType:         1,
 					PostLogoutRedirectUris: []string{"PostLogoutRedirectUris"},
 				},
-				new: &OIDCConfig{
+				newConfig: &OIDCConfig{
 					AppID:                  "AppID",
 					RedirectUris:           []string{"RedirectUris"},
 					ResponseTypes:          []int32{1},
@@ -74,11 +75,11 @@ func TestOIDCConfigChanges(t *testing.T) {
 		{
 			name: "change not changeable attributes",
 			args: args{
-				existing: &OIDCConfig{
+				existingConfig: &OIDCConfig{
 					AppID:    "AppID",
 					ClientID: "ClientID",
 				},
-				new: &OIDCConfig{
+				newConfig: &OIDCConfig{
 					AppID:    "AppIDChange",
 					ClientID: "ClientIDChange",
 				},
@@ -90,7 +91,7 @@ func TestOIDCConfigChanges(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			changes := tt.args.existing.Changes(tt.args.new)
+			changes := tt.args.existingConfig.Changes(tt.args.newConfig)
 			if len(changes) != tt.res.changesLen {
 				t.Errorf("got wrong changes len: expected: %v, actual: %v ", tt.res.changesLen, len(changes))
 			}
@@ -112,11 +113,19 @@ func TestAppendAddOIDCConfigEvent(t *testing.T) {
 		{
 			name: "append add application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{AppID: "AppID"}}},
-				config:  &OIDCConfig{AppID: "AppID", ClientID: "ClientID"},
-				event:   &es_models.Event{},
+				project: &Project{
+					Applications: []*Application{
+						{AppID: "AppID"},
+					},
+				},
+				config: &OIDCConfig{AppID: "AppID", ClientID: "ClientID"},
+				event:  &es_models.Event{},
+			},
+			result: &Project{
+				Applications: []*Application{
+					{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID"}},
+				},
 			},
-			result: &Project{Applications: []*Application{&Application{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID"}}}},
 		},
 	}
 	for _, tt := range tests {
@@ -153,11 +162,19 @@ func TestAppendChangeOIDCConfigEvent(t *testing.T) {
 		{
 			name: "append change application event",
 			args: args{
-				project: &Project{Applications: []*Application{&Application{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID"}}}},
-				config:  &OIDCConfig{AppID: "AppID", ClientID: "ClientID Changed"},
-				event:   &es_models.Event{},
+				project: &Project{
+					Applications: []*Application{
+						{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID"}},
+					},
+				},
+				config: &OIDCConfig{AppID: "AppID", ClientID: "ClientID Changed"},
+				event:  &es_models.Event{},
+			},
+			result: &Project{
+				Applications: []*Application{
+					{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID Changed"}},
+				},
 			},
-			result: &Project{Applications: []*Application{&Application{AppID: "AppID", OIDCConfig: &OIDCConfig{AppID: "AppID", ClientID: "ClientID Changed"}}}},
 		},
 	}
 	for _, tt := range tests {
--- a/internal/project/repository/eventsourcing/model/project_test.go
+++ b/internal/project/repository/eventsourcing/model/project_test.go
@@ -2,15 +2,16 @@ package model

 import (
 	"encoding/json"
+	"testing"
+
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
 	"github.com/caos/zitadel/internal/project/model"
-	"testing"
 )

 func TestProjectChanges(t *testing.T) {
 	type args struct {
-		existing *Project
-		new      *Project
+		existingProject *Project
+		newProject      *Project
 	}
 	type res struct {
 		changesLen int
@@ -23,8 +24,8 @@ func TestProjectChanges(t *testing.T) {
 		{
 			name: "project name changes",
 			args: args{
-				existing: &Project{Name: "Name"},
-				new:      &Project{Name: "NameChanged"},
+				existingProject: &Project{Name: "Name"},
+				newProject:      &Project{Name: "NameChanged"},
 			},
 			res: res{
 				changesLen: 1,
@@ -33,8 +34,8 @@ func TestProjectChanges(t *testing.T) {
 		{
 			name: "no changes",
 			args: args{
-				existing: &Project{Name: "Name"},
-				new:      &Project{Name: "Name"},
+				existingProject: &Project{Name: "Name"},
+				newProject:      &Project{Name: "Name"},
 			},
 			res: res{
 				changesLen: 0,
@@ -43,7 +44,7 @@ func TestProjectChanges(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			changes := tt.args.existing.Changes(tt.args.new)
+			changes := tt.args.existingProject.Changes(tt.args.newProject)
 			if len(changes) != tt.res.changesLen {
 				t.Errorf("got wrong changes len: expected: %v, actual: %v ", tt.res.changesLen, len(changes))
 			}
@@ -65,7 +66,7 @@ func TestProjectFromEvents(t *testing.T) {
 			name: "project from events, ok",
 			args: args{
 				event: []*es_models.Event{
-					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
+					{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
 				},
 				project: &Project{Name: "ProjectName"},
 			},
@@ -75,7 +76,7 @@ func TestProjectFromEvents(t *testing.T) {
 			name: "project from events, nil project",
 			args: args{
 				event: []*es_models.Event{
-					&es_models.Event{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
+					{AggregateID: "AggregateID", Sequence: 1, Type: ProjectAdded},
 				},
 				project: nil,
 			},