feat: port reduction (#323)

* move mgmt pkg

* begin package restructure

* rename auth package to authz

* begin start api

* move auth

* move admin

* fix merge

* configs and interceptors

* interceptor

* revert generate-grpc.sh

* some cleanups

* console

* move console

* fix tests and merging

* js linting

* merge

* merging and configs

* change k8s base to current ports

* fixes

* cleanup

* regenerate proto

* remove unnecessary whitespace

* missing param

* go mod tidy

* fix merging

* move login pkg

* cleanup

* move api pkgs again

* fix pkg naming

* fix generate-static.sh for login

* update workflow

* fixes

* logging

* remove duplicate

* comment for optional gateway interfaces

* regenerate protos

* fix proto imports for grpc web

* protos

* grpc web generate

* grpc web generate

* fix changes

* add translation interceptor

* fix merging

* regenerate mgmt proto

internal/iam/repository/eventsourcing/eventstore_test.go

@@ -2,13 +2,15 @@ package eventsourcing
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/api/auth"
+	"testing"
+
+	"github.com/golang/mock/gomock"
+
+	"github.com/caos/zitadel/internal/api/authz"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
-	"github.com/golang/mock/gomock"
-	"testing"
 )
 
 func TestIamByID(t *testing.T) {
@@ -91,7 +93,7 @@ func TestSetUpStarted(t *testing.T) {
 			name: "setup started iam, ok",
 			args: args{
 				es:    GetMockManipulateIamNotExisting(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -102,7 +104,7 @@ func TestSetUpStarted(t *testing.T) {
 			name: "setup already started",
 			args: args{
 				es:    GetMockManipulateIam(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -113,7 +115,7 @@ func TestSetUpStarted(t *testing.T) {
 			name: "setup iam no id",
 			args: args{
 				es:  GetMockManipulateIam(ctrl),
-				ctx: auth.NewMockContext("orgID", "userID"),
+				ctx: authz.NewMockContext("orgID", "userID"),
 			},
 			res: res{
 				errFunc: caos_errs.IsPreconditionFailed,
@@ -157,7 +159,7 @@ func TestSetUpDone(t *testing.T) {
 			name: "setup done iam, ok",
 			args: args{
 				es:    GetMockManipulateIam(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -168,7 +170,7 @@ func TestSetUpDone(t *testing.T) {
 			name: "setup iam no id",
 			args: args{
 				es:  GetMockManipulateIam(ctrl),
-				ctx: auth.NewMockContext("orgID", "userID"),
+				ctx: authz.NewMockContext("orgID", "userID"),
 			},
 			res: res{
 				errFunc: caos_errs.IsPreconditionFailed,
@@ -178,7 +180,7 @@ func TestSetUpDone(t *testing.T) {
 			name: "iam not found",
 			args: args{
 				es:    GetMockManipulateIamNotExisting(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -224,7 +226,7 @@ func TestSetGlobalOrg(t *testing.T) {
 			name: "global org set, ok",
 			args: args{
 				es:        GetMockManipulateIam(ctrl),
-				ctx:       auth.NewMockContext("orgID", "userID"),
+				ctx:       authz.NewMockContext("orgID", "userID"),
 				iamID:     "iamID",
 				globalOrg: "globalOrg",
 			},
@@ -236,7 +238,7 @@ func TestSetGlobalOrg(t *testing.T) {
 			name: "no iam id",
 			args: args{
 				es:        GetMockManipulateIam(ctrl),
-				ctx:       auth.NewMockContext("orgID", "userID"),
+				ctx:       authz.NewMockContext("orgID", "userID"),
 				globalOrg: "",
 			},
 			res: res{
@@ -247,7 +249,7 @@ func TestSetGlobalOrg(t *testing.T) {
 			name: "no global org",
 			args: args{
 				es:    GetMockManipulateIam(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -258,7 +260,7 @@ func TestSetGlobalOrg(t *testing.T) {
 			name: "iam not found",
 			args: args{
 				es:        GetMockManipulateIamNotExisting(ctrl),
-				ctx:       auth.NewMockContext("orgID", "userID"),
+				ctx:       authz.NewMockContext("orgID", "userID"),
 				iamID:     "iamID",
 				globalOrg: "globalOrg",
 			},
@@ -305,7 +307,7 @@ func TestSetIamProjectID(t *testing.T) {
 			name: "iam project set, ok",
 			args: args{
 				es:           GetMockManipulateIam(ctrl),
-				ctx:          auth.NewMockContext("orgID", "userID"),
+				ctx:          authz.NewMockContext("orgID", "userID"),
 				iamID:        "iamID",
 				iamProjectID: "iamProjectID",
 			},
@@ -317,7 +319,7 @@ func TestSetIamProjectID(t *testing.T) {
 			name: "no iam id",
 			args: args{
 				es:           GetMockManipulateIam(ctrl),
-				ctx:          auth.NewMockContext("orgID", "userID"),
+				ctx:          authz.NewMockContext("orgID", "userID"),
 				iamProjectID: "",
 			},
 			res: res{
@@ -328,7 +330,7 @@ func TestSetIamProjectID(t *testing.T) {
 			name: "no global org",
 			args: args{
 				es:    GetMockManipulateIam(ctrl),
-				ctx:   auth.NewMockContext("orgID", "userID"),
+				ctx:   authz.NewMockContext("orgID", "userID"),
 				iamID: "iamID",
 			},
 			res: res{
@@ -339,7 +341,7 @@ func TestSetIamProjectID(t *testing.T) {
 			name: "iam not found",
 			args: args{
 				es:           GetMockManipulateIamNotExisting(ctrl),
-				ctx:          auth.NewMockContext("orgID", "userID"),
+				ctx:          authz.NewMockContext("orgID", "userID"),
 				iamID:        "iamID",
 				iamProjectID: "iamProjectID",
 			},
@@ -385,7 +387,7 @@ func TestAddIamMember(t *testing.T) {
 			name: "add iam member, ok",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"Roles"}},
 			},
 			res: res{
@@ -396,7 +398,7 @@ func TestAddIamMember(t *testing.T) {
 			name: "no userid",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, Roles: []string{"Roles"}},
 			},
 			res: res{
@@ -407,7 +409,7 @@ func TestAddIamMember(t *testing.T) {
 			name: "no roles",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID"},
 			},
 			res: res{
@@ -418,7 +420,7 @@ func TestAddIamMember(t *testing.T) {
 			name: "member already existing",
 			args: args{
 				es:     GetMockManipulateIamWithMember(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"Roles"}},
 			},
 			res: res{
@@ -429,7 +431,7 @@ func TestAddIamMember(t *testing.T) {
 			name: "existing iam not found",
 			args: args{
 				es:     GetMockManipulateIamNotExisting(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"Roles"}},
 			},
 			res: res{
@@ -477,7 +479,7 @@ func TestChangeIamMember(t *testing.T) {
 			name: "add iam member, ok",
 			args: args{
 				es:     GetMockManipulateIamWithMember(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"ChangeRoles"}},
 			},
 			res: res{
@@ -488,7 +490,7 @@ func TestChangeIamMember(t *testing.T) {
 			name: "no userid",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, Roles: []string{"ChangeRoles"}},
 			},
 			res: res{
@@ -499,7 +501,7 @@ func TestChangeIamMember(t *testing.T) {
 			name: "no roles",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID"},
 			},
 			res: res{
@@ -510,7 +512,7 @@ func TestChangeIamMember(t *testing.T) {
 			name: "member not existing",
 			args: args{
 				es:     GetMockManipulateIam(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"Roles"}},
 			},
 			res: res{
@@ -521,7 +523,7 @@ func TestChangeIamMember(t *testing.T) {
 			name: "existing not found",
 			args: args{
 				es:     GetMockManipulateIamNotExisting(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"ChangeRoles"}},
 			},
 			res: res{
@@ -570,10 +572,10 @@ func TestRemoveIamMember(t *testing.T) {
 			name: "remove iam member, ok",
 			args: args{
 				es:  GetMockManipulateIamWithMember(ctrl),
-				ctx: auth.NewMockContext("orgID", "userID"),
+				ctx: authz.NewMockContext("orgID", "userID"),
 				existing: &model.Iam{
 					ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1},
-					Members:    []*model.IamMember{&model.IamMember{UserID: "UserID", Roles: []string{"Roles"}}},
+					Members:    []*model.IamMember{{UserID: "UserID", Roles: []string{"Roles"}}},
 				},
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID"},
 			},
@@ -585,10 +587,10 @@ func TestRemoveIamMember(t *testing.T) {
 			name: "no userid",
 			args: args{
 				es:  GetMockManipulateIam(ctrl),
-				ctx: auth.NewMockContext("orgID", "userID"),
+				ctx: authz.NewMockContext("orgID", "userID"),
 				existing: &model.Iam{
 					ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1},
-					Members:    []*model.IamMember{&model.IamMember{UserID: "UserID", Roles: []string{"Roles"}}},
+					Members:    []*model.IamMember{{UserID: "UserID", Roles: []string{"Roles"}}},
 				},
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, Roles: []string{"ChangeRoles"}},
 			},
@@ -600,7 +602,7 @@ func TestRemoveIamMember(t *testing.T) {
 			name: "member not existing",
 			args: args{
 				es:  GetMockManipulateIam(ctrl),
-				ctx: auth.NewMockContext("orgID", "userID"),
+				ctx: authz.NewMockContext("orgID", "userID"),
 				existing: &model.Iam{
 					ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1},
 				},
@@ -614,7 +616,7 @@ func TestRemoveIamMember(t *testing.T) {
 			name: "existing not found",
 			args: args{
 				es:     GetMockManipulateIamNotExisting(ctrl),
-				ctx:    auth.NewMockContext("orgID", "userID"),
+				ctx:    authz.NewMockContext("orgID", "userID"),
 				member: &iam_model.IamMember{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID", Sequence: 1}, UserID: "UserID", Roles: []string{"ChangeRoles"}},
 			},
 			res: res{

internal/iam/repository/eventsourcing/iam_test.go

@@ -2,11 +2,12 @@ package eventsourcing
 
 import (
 	"context"
-	"github.com/caos/zitadel/internal/api/auth"
+	"testing"
+
+	"github.com/caos/zitadel/internal/api/authz"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/models"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
-	"testing"
 )
 
 func TestSetUpStartedAggregate(t *testing.T) {
@@ -28,7 +29,7 @@ func TestSetUpStartedAggregate(t *testing.T) {
 		{
 			name: "setupstarted aggregate ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				iam:        &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -40,7 +41,7 @@ func TestSetUpStartedAggregate(t *testing.T) {
 		{
 			name: "iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				iam:        nil,
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -87,7 +88,7 @@ func TestSetUpDoneAggregate(t *testing.T) {
 		{
 			name: "setup done aggregate ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -99,7 +100,7 @@ func TestSetUpDoneAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -147,7 +148,7 @@ func TestGlobalOrgAggregate(t *testing.T) {
 		{
 			name: "global org set aggregate ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				orgID:      "orgID",
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -160,7 +161,7 @@ func TestGlobalOrgAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				orgID:      "orgID",
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -172,7 +173,7 @@ func TestGlobalOrgAggregate(t *testing.T) {
 		{
 			name: "global org empty",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -218,7 +219,7 @@ func TestIamProjectAggregate(t *testing.T) {
 		{
 			name: "iam project id set aggregate ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				projectID:  "projectID",
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -231,7 +232,7 @@ func TestIamProjectAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				projectID:  "projectID",
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -243,7 +244,7 @@ func TestIamProjectAggregate(t *testing.T) {
 		{
 			name: "project id empty",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -289,7 +290,7 @@ func TestIamMemberAddedAggregate(t *testing.T) {
 		{
 			name: "iammember added ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        &model.IamMember{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}, UserID: "UserID", Roles: []string{"Roles"}},
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -302,7 +303,7 @@ func TestIamMemberAddedAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -315,7 +316,7 @@ func TestIamMemberAddedAggregate(t *testing.T) {
 		{
 			name: "member nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        nil,
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -368,7 +369,7 @@ func TestIamMemberChangedAggregate(t *testing.T) {
 		{
 			name: "iammember changed ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        &model.IamMember{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}, UserID: "UserID", Roles: []string{"Roles"}},
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -381,7 +382,7 @@ func TestIamMemberChangedAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -395,7 +396,7 @@ func TestIamMemberChangedAggregate(t *testing.T) {
 		{
 			name: "member nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        nil,
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -449,7 +450,7 @@ func TestIamMemberRemovedAggregate(t *testing.T) {
 		{
 			name: "iammember removed ok",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        &model.IamMember{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}, UserID: "UserID", Roles: []string{"Roles"}},
 				aggCreator: models.NewAggregateCreator("Test"),
@@ -462,7 +463,7 @@ func TestIamMemberRemovedAggregate(t *testing.T) {
 		{
 			name: "existing iam nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   nil,
 				aggCreator: models.NewAggregateCreator("Test"),
 			},
@@ -476,7 +477,7 @@ func TestIamMemberRemovedAggregate(t *testing.T) {
 		{
 			name: "member nil",
 			args: args{
-				ctx:        auth.NewMockContext("orgID", "userID"),
+				ctx:        authz.NewMockContext("orgID", "userID"),
 				existing:   &model.Iam{ObjectRoot: models.ObjectRoot{AggregateID: "AggregateID"}},
 				new:        nil,
 				aggCreator: models.NewAggregateCreator("Test"),