feat(cli): setup (#3267)

* commander * commander * selber! * move to packages * fix(errors): implement Is interface * test: command * test: commands * add init steps * setup tenant * add default step yaml * possibility to set password * merge v2 into v2-commander * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: rename iam command side to instance * fix: search query builder can filter events in memory * fix: filters for add member * fix(setup): add `ExternalSecure` to config * chore: name iam to instance * fix: matching * remove unsued func * base url * base url * test(command): filter funcs * test: commands * fix: rename orgiampolicy to domain policy * start from init * commands * config * fix indexes and add constraints * fixes * fix: merge conflicts * fix: protos * fix: md files * setup * add deprecated org iam policy again * typo * fix search query * fix filter * Apply suggestions from code review * remove custom org from org setup * add todos for verification * change apps creation * simplify package structure * fix error * move preparation helper for tests * fix unique constraints * fix config mapping in setup * fix error handling in encryption_keys.go * fix projection config * fix query from old views to projection * fix setup of mgmt api * set iam project and fix instance projection * imports Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: fabi <fabienne.gerschwiler@gmail.com>
2025-08-12 08:27:32 +00:00 · 2022-03-28 10:05:09 +02:00
parent 9d4f296c62
commit c5b99274d7
175 changed files with 5213 additions and 2212 deletions
--- a/internal/repository/instance/eventstore.go
+++ b/internal/repository/instance/eventstore.go
@@ -47,8 +47,8 @@ func RegisterEventMappers(es *eventstore.Eventstore) {
 		RegisterFilterEventMapper(LabelPolicyAssetsRemovedEventType, LabelPolicyAssetsRemovedEventMapper).
 		RegisterFilterEventMapper(LoginPolicyAddedEventType, LoginPolicyAddedEventMapper).
 		RegisterFilterEventMapper(LoginPolicyChangedEventType, LoginPolicyChangedEventMapper).
-		RegisterFilterEventMapper(InstanceDomainPolicyAddedEventType, InstanceDomainPolicyAddedEventMapper).
-		RegisterFilterEventMapper(InstanceDomainPolicyChangedEventType, InstanceDomainPolicyChangedEventMapper).
+		RegisterFilterEventMapper(DomainPolicyAddedEventType, DomainPolicyAddedEventMapper).
+		RegisterFilterEventMapper(DomainPolicyChangedEventType, DomainPolicyChangedEventMapper).
 		RegisterFilterEventMapper(PasswordAgePolicyAddedEventType, PasswordAgePolicyAddedEventMapper).
 		RegisterFilterEventMapper(PasswordAgePolicyChangedEventType, PasswordAgePolicyChangedEventMapper).
 		RegisterFilterEventMapper(PasswordComplexityPolicyAddedEventType, PasswordComplexityPolicyAddedEventMapper).
--- a/internal/repository/instance/policy_domain.go
+++ b/internal/repository/instance/policy_domain.go
@@ -10,66 +10,66 @@ import (
 )

 var (
-	InstanceDomainPolicyAddedEventType   = instanceEventTypePrefix + policy.DomainPolicyAddedEventType
-	InstanceDomainPolicyChangedEventType = instanceEventTypePrefix + policy.DomainPolicyChangedEventType
+	DomainPolicyAddedEventType   = instanceEventTypePrefix + policy.DomainPolicyAddedEventType
+	DomainPolicyChangedEventType = instanceEventTypePrefix + policy.DomainPolicyChangedEventType
 )

-type InstanceDomainPolicyAddedEvent struct {
+type DomainPolicyAddedEvent struct {
 	policy.DomainPolicyAddedEvent
 }

-func NewInstnaceDomainPolicyAddedEvent(
+func NewDomainPolicyAddedEvent(
 	ctx context.Context,
 	aggregate *eventstore.Aggregate,
 	userLoginMustBeDomain bool,
-) *InstanceDomainPolicyAddedEvent {
-	return &InstanceDomainPolicyAddedEvent{
+) *DomainPolicyAddedEvent {
+	return &DomainPolicyAddedEvent{
 		DomainPolicyAddedEvent: *policy.NewDomainPolicyAddedEvent(
 			eventstore.NewBaseEventForPush(
 				ctx,
 				aggregate,
-				InstanceDomainPolicyAddedEventType),
+				DomainPolicyAddedEventType),
 			userLoginMustBeDomain,
 		),
 	}
 }

-func InstanceDomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyAddedEventMapper(event)
 	if err != nil {
 		return nil, err
 	}

-	return &InstanceDomainPolicyAddedEvent{DomainPolicyAddedEvent: *e.(*policy.DomainPolicyAddedEvent)}, nil
+	return &DomainPolicyAddedEvent{DomainPolicyAddedEvent: *e.(*policy.DomainPolicyAddedEvent)}, nil
 }

-type InstanceDomainPolicyChangedEvent struct {
+type DomainPolicyChangedEvent struct {
 	policy.DomainPolicyChangedEvent
 }

-func NewInstanceDomainPolicyChangedEvent(
+func NewDomainPolicyChangedEvent(
 	ctx context.Context,
 	aggregate *eventstore.Aggregate,
 	changes []policy.OrgPolicyChanges,
-) (*InstanceDomainPolicyChangedEvent, error) {
+) (*DomainPolicyChangedEvent, error) {
 	changedEvent, err := policy.NewDomainPolicyChangedEvent(
 		eventstore.NewBaseEventForPush(
 			ctx,
 			aggregate,
-			InstanceDomainPolicyChangedEventType),
+			DomainPolicyChangedEventType),
 		changes,
 	)
 	if err != nil {
 		return nil, err
 	}
-	return &InstanceDomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
+	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
 }

-func InstanceDomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
 	e, err := policy.DomainPolicyChangedEventMapper(event)
 	if err != nil {
 		return nil, err
 	}

-	return &InstanceDomainPolicyChangedEvent{DomainPolicyChangedEvent: *e.(*policy.DomainPolicyChangedEvent)}, nil
+	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *e.(*policy.DomainPolicyChangedEvent)}, nil
 }
--- a/internal/repository/org/eventstore.go
+++ b/internal/repository/org/eventstore.go
@@ -44,9 +44,9 @@ func RegisterEventMappers(es *eventstore.Eventstore) {
 		RegisterFilterEventMapper(LoginPolicyIDPProviderAddedEventType, IdentityProviderAddedEventMapper).
 		RegisterFilterEventMapper(LoginPolicyIDPProviderRemovedEventType, IdentityProviderRemovedEventMapper).
 		RegisterFilterEventMapper(LoginPolicyIDPProviderCascadeRemovedEventType, IdentityProviderCascadeRemovedEventMapper).
-		RegisterFilterEventMapper(OrgDomainPolicyAddedEventType, OrgDomainPolicyAddedEventMapper).
-		RegisterFilterEventMapper(OrgDomainPolicyChangedEventType, OrgDomainPolicyChangedEventMapper).
-		RegisterFilterEventMapper(OrgDomainPolicyRemovedEventType, OrgDomainPolicyRemovedEventMapper).
+		RegisterFilterEventMapper(DomainPolicyAddedEventType, DomainPolicyAddedEventMapper).
+		RegisterFilterEventMapper(DomainPolicyChangedEventType, DomainPolicyChangedEventMapper).
+		RegisterFilterEventMapper(DomainPolicyRemovedEventType, DomainPolicyRemovedEventMapper).
 		RegisterFilterEventMapper(PasswordAgePolicyAddedEventType, PasswordAgePolicyAddedEventMapper).
 		RegisterFilterEventMapper(PasswordAgePolicyChangedEventType, PasswordAgePolicyChangedEventMapper).
 		RegisterFilterEventMapper(PasswordAgePolicyRemovedEventType, PasswordAgePolicyRemovedEventMapper).
--- a/internal/repository/org/policy_domain.go
+++ b/internal/repository/org/policy_domain.go
@@ -0,0 +1,103 @@
+package org
+
+import (
+	"context"
+
+	"github.com/caos/zitadel/internal/eventstore"
+
+	"github.com/caos/zitadel/internal/eventstore/repository"
+	"github.com/caos/zitadel/internal/repository/policy"
+)
+
+var (
+	DomainPolicyAddedEventType   = orgEventTypePrefix + policy.DomainPolicyAddedEventType
+	DomainPolicyChangedEventType = orgEventTypePrefix + policy.DomainPolicyChangedEventType
+	DomainPolicyRemovedEventType = orgEventTypePrefix + policy.DomainPolicyRemovedEventType
+)
+
+type DomainPolicyAddedEvent struct {
+	policy.DomainPolicyAddedEvent
+}
+
+func NewDomainPolicyAddedEvent(
+	ctx context.Context,
+	aggregate *eventstore.Aggregate,
+	userLoginMustBeDomain bool,
+) *DomainPolicyAddedEvent {
+	return &DomainPolicyAddedEvent{
+		DomainPolicyAddedEvent: *policy.NewDomainPolicyAddedEvent(
+			eventstore.NewBaseEventForPush(
+				ctx,
+				aggregate,
+				DomainPolicyAddedEventType),
+			userLoginMustBeDomain,
+		),
+	}
+}
+
+func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
+	e, err := policy.DomainPolicyAddedEventMapper(event)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DomainPolicyAddedEvent{DomainPolicyAddedEvent: *e.(*policy.DomainPolicyAddedEvent)}, nil
+}
+
+type DomainPolicyChangedEvent struct {
+	policy.DomainPolicyChangedEvent
+}
+
+func NewDomainPolicyChangedEvent(
+	ctx context.Context,
+	aggregate *eventstore.Aggregate,
+	changes []policy.OrgPolicyChanges,
+) (*DomainPolicyChangedEvent, error) {
+	changedEvent, err := policy.NewDomainPolicyChangedEvent(
+		eventstore.NewBaseEventForPush(
+			ctx,
+			aggregate,
+			DomainPolicyChangedEventType),
+		changes,
+	)
+	if err != nil {
+		return nil, err
+	}
+	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
+}
+
+func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
+	e, err := policy.DomainPolicyChangedEventMapper(event)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *e.(*policy.DomainPolicyChangedEvent)}, nil
+}
+
+type DomainPolicyRemovedEvent struct {
+	policy.DomainPolicyRemovedEvent
+}
+
+func NewDomainPolicyRemovedEvent(
+	ctx context.Context,
+	aggregate *eventstore.Aggregate,
+) *DomainPolicyRemovedEvent {
+	return &DomainPolicyRemovedEvent{
+		DomainPolicyRemovedEvent: *policy.NewDomainPolicyRemovedEvent(
+			eventstore.NewBaseEventForPush(
+				ctx,
+				aggregate,
+				DomainPolicyRemovedEventType),
+		),
+	}
+}
+
+func DomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
+	e, err := policy.DomainPolicyRemovedEventMapper(event)
+	if err != nil {
+		return nil, err
+	}
+
+	return &DomainPolicyRemovedEvent{DomainPolicyRemovedEvent: *e.(*policy.DomainPolicyRemovedEvent)}, nil
+}
--- a/internal/repository/org/policy_org_domain.go
+++ b/internal/repository/org/policy_org_domain.go
@@ -1,103 +0,0 @@
-package org
-
-import (
-	"context"
-
-	"github.com/caos/zitadel/internal/eventstore"
-
-	"github.com/caos/zitadel/internal/eventstore/repository"
-	"github.com/caos/zitadel/internal/repository/policy"
-)
-
-var (
-	OrgDomainPolicyAddedEventType   = orgEventTypePrefix + policy.DomainPolicyAddedEventType
-	OrgDomainPolicyChangedEventType = orgEventTypePrefix + policy.DomainPolicyChangedEventType
-	OrgDomainPolicyRemovedEventType = orgEventTypePrefix + policy.DomainPolicyRemovedEventType
-)
-
-type OrgDomainPolicyAddedEvent struct {
-	policy.DomainPolicyAddedEvent
-}
-
-func NewOrgDomainPolicyAddedEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-	userLoginMustBeDomain bool,
-) *OrgDomainPolicyAddedEvent {
-	return &OrgDomainPolicyAddedEvent{
-		DomainPolicyAddedEvent: *policy.NewDomainPolicyAddedEvent(
-			eventstore.NewBaseEventForPush(
-				ctx,
-				aggregate,
-				OrgDomainPolicyAddedEventType),
-			userLoginMustBeDomain,
-		),
-	}
-}
-
-func OrgDomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
-	e, err := policy.DomainPolicyAddedEventMapper(event)
-	if err != nil {
-		return nil, err
-	}
-
-	return &OrgDomainPolicyAddedEvent{DomainPolicyAddedEvent: *e.(*policy.DomainPolicyAddedEvent)}, nil
-}
-
-type OrgDomainPolicyChangedEvent struct {
-	policy.DomainPolicyChangedEvent
-}
-
-func NewOrgDomainPolicyChangedEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-	changes []policy.OrgPolicyChanges,
-) (*OrgDomainPolicyChangedEvent, error) {
-	changedEvent, err := policy.NewDomainPolicyChangedEvent(
-		eventstore.NewBaseEventForPush(
-			ctx,
-			aggregate,
-			OrgDomainPolicyChangedEventType),
-		changes,
-	)
-	if err != nil {
-		return nil, err
-	}
-	return &OrgDomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
-}
-
-func OrgDomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
-	e, err := policy.DomainPolicyChangedEventMapper(event)
-	if err != nil {
-		return nil, err
-	}
-
-	return &OrgDomainPolicyChangedEvent{DomainPolicyChangedEvent: *e.(*policy.DomainPolicyChangedEvent)}, nil
-}
-
-type OrgDomainPolicyRemovedEvent struct {
-	policy.DomainPolicyRemovedEvent
-}
-
-func NewOrgDomainPolicyRemovedEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-) *OrgDomainPolicyRemovedEvent {
-	return &OrgDomainPolicyRemovedEvent{
-		DomainPolicyRemovedEvent: *policy.NewDomainPolicyRemovedEvent(
-			eventstore.NewBaseEventForPush(
-				ctx,
-				aggregate,
-				OrgDomainPolicyRemovedEventType),
-		),
-	}
-}
-
-func OrgDomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
-	e, err := policy.DomainPolicyRemovedEventMapper(event)
-	if err != nil {
-		return nil, err
-	}
-
-	return &OrgDomainPolicyRemovedEvent{DomainPolicyRemovedEvent: *e.(*policy.DomainPolicyRemovedEvent)}, nil
-}