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

feat(eventstore): increase parallel write capabilities (#5940)

Browse Source 
This implementation increases parallel write capabilities of the eventstore.
Please have a look at the technical advisories: [05](https://zitadel.com/docs/support/advisory/a10005) and  [06](https://zitadel.com/docs/support/advisory/a10006).
The implementation of eventstore.push is rewritten and stored events are migrated to a new table `eventstore.events2`.
If you are using cockroach: make sure that the database user of ZITADEL has `VIEWACTIVITY` grant. This is used to query events.
This commit is contained in:
Silvan
2023-10-19 12:19:10 +02:00
committed by GitHub
parent 259faba3f0
commit b5564572bc
791 changed files with 30326 additions and 43202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/repository/org/custom_text.go
View File

@@ -6,8 +6,6 @@ import (
"golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -39,7 +37,7 @@ func NewCustomTextSetEvent(
}
}
func CustomTextSetEventMapper(event *repository.Event) (eventstore.Event, error) {
func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.CustomTextSetEventMapper(event)
if err != nil {
return nil, err
@@ -69,7 +67,7 @@ func NewCustomTextRemovedEvent(
}
}
func CustomTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.CustomTextRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -97,7 +95,7 @@ func NewCustomTextTemplateRemovedEvent(
}
}
func CustomTextTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.CustomTextTemplateRemovedEventMapper(event)
if err != nil {
return nil, err

63
internal/repository/org/domain.go
View File

@@ -2,14 +2,11 @@ package org
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -23,15 +20,15 @@ const (
OrgDomainRemovedEventType = domainEventPrefix + "removed"
)
func NewAddOrgDomainUniqueConstraint(orgDomain string) *eventstore.EventUniqueConstraint {
func NewAddOrgDomainUniqueConstraint(orgDomain string) *eventstore.UniqueConstraint {
return eventstore.NewAddEventUniqueConstraint(
UniqueOrgDomain,
orgDomain,
"Errors.Org.Domain.AlreadyExists")
}
func NewRemoveOrgDomainUniqueConstraint(orgDomain string) *eventstore.EventUniqueConstraint {
return eventstore.NewRemoveEventUniqueConstraint(
func NewRemoveOrgDomainUniqueConstraint(orgDomain string) *eventstore.UniqueConstraint {
return eventstore.NewRemoveUniqueConstraint(
UniqueOrgDomain,
orgDomain)
}
@@ -42,11 +39,11 @@ type DomainAddedEvent struct {
Domain string `json:"domain,omitempty"`
}
func (e *DomainAddedEvent) Data() interface{} {
func (e *DomainAddedEvent) Payload() interface{} {
return e
}
func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -61,11 +58,11 @@ func NewDomainAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, d
}
}
func DomainAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainAdded := &DomainAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainAdded)
err := event.Unmarshal(orgDomainAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-GBr52", "unable to unmarshal org domain added")
}
@@ -81,11 +78,11 @@ type DomainVerificationAddedEvent struct {
ValidationCode *crypto.CryptoValue `json:"validationCode,omitempty"`
}
func (e *DomainVerificationAddedEvent) Data() interface{} {
func (e *DomainVerificationAddedEvent) Payload() interface{} {
return e
}
func (e *DomainVerificationAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainVerificationAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -107,11 +104,11 @@ func NewDomainVerificationAddedEvent(
}
}
func DomainVerificationAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainVerificationAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainVerificationAdded := &DomainVerificationAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainVerificationAdded)
err := event.Unmarshal(orgDomainVerificationAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-NRN32", "unable to unmarshal org domain verification added")
}
@@ -125,11 +122,11 @@ type DomainVerificationFailedEvent struct {
Domain string `json:"domain,omitempty"`
}
func (e *DomainVerificationFailedEvent) Data() interface{} {
func (e *DomainVerificationFailedEvent) Payload() interface{} {
return e
}
func (e *DomainVerificationFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainVerificationFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -144,11 +141,11 @@ func NewDomainVerificationFailedEvent(ctx context.Context, aggregate *eventstore
}
}
func DomainVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainVerificationFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainVerificationFailed := &DomainVerificationFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainVerificationFailed)
err := event.Unmarshal(orgDomainVerificationFailed)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-Bhm37", "unable to unmarshal org domain verification failed")
}
@@ -162,12 +159,12 @@ type DomainVerifiedEvent struct {
Domain string `json:"domain,omitempty"`
}
func (e *DomainVerifiedEvent) Data() interface{} {
func (e *DomainVerifiedEvent) Payload() interface{} {
return e
}
func (e *DomainVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddOrgDomainUniqueConstraint(e.Domain)}
func (e *DomainVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddOrgDomainUniqueConstraint(e.Domain)}
}
func NewDomainVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string) *DomainVerifiedEvent {
@@ -181,11 +178,11 @@ func NewDomainVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggregate
}
}
func DomainVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainVerified := &DomainVerifiedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainVerified)
err := event.Unmarshal(orgDomainVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-BFSwt", "unable to unmarshal org domain verified")
}
@@ -199,11 +196,11 @@ type DomainPrimarySetEvent struct {
Domain string `json:"domain,omitempty"`
}
func (e *DomainPrimarySetEvent) Data() interface{} {
func (e *DomainPrimarySetEvent) Payload() interface{} {
return e
}
func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainPrimarySetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -218,11 +215,11 @@ func NewDomainPrimarySetEvent(ctx context.Context, aggregate *eventstore.Aggrega
}
}
func DomainPrimarySetEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainPrimarySetEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainPrimarySet := &DomainPrimarySetEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainPrimarySet)
err := event.Unmarshal(orgDomainPrimarySet)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-N5787", "unable to unmarshal org domain primary set")
}
@@ -237,15 +234,15 @@ type DomainRemovedEvent struct {
isVerified bool
}
func (e *DomainRemovedEvent) Data() interface{} {
func (e *DomainRemovedEvent) Payload() interface{} {
return e
}
func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
if !e.isVerified {
return nil
}
return []*eventstore.EventUniqueConstraint{NewRemoveOrgDomainUniqueConstraint(e.Domain)}
return []*eventstore.UniqueConstraint{NewRemoveOrgDomainUniqueConstraint(e.Domain)}
}
func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string, verified bool) *DomainRemovedEvent {
@@ -260,11 +257,11 @@ func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate,
}
}
func DomainRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgDomainRemoved := &DomainRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgDomainRemoved)
err := event.Unmarshal(orgDomainRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-BngB2", "unable to unmarshal org domain removed")
}

7
internal/repository/org/flow.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/flow"
)
@@ -38,7 +37,7 @@ func NewTriggerActionsSetEvent(
}
}
func TriggerActionsSetEventMapper(event *repository.Event) (eventstore.Event, error) {
func TriggerActionsSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := flow.TriggerActionsSetEventMapper(event)
if err != nil {
return nil, err
@@ -68,7 +67,7 @@ func NewTriggerActionsCascadeRemovedEvent(
}
}
func TriggerActionsCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func TriggerActionsCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := flow.TriggerActionsCascadeRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -96,7 +95,7 @@ func NewFlowClearedEvent(
}
}
func FlowClearedEventMapper(event *repository.Event) (eventstore.Event, error) {
func FlowClearedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := flow.FlowClearedEventMapper(event)
if err != nil {
return nil, err

57
internal/repository/org/idp.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/idp"
)
@@ -80,7 +79,7 @@ func NewOAuthIDPAddedEvent(
}
}
func OAuthIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OAuthIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -115,7 +114,7 @@ func NewOAuthIDPChangedEvent(
return &OAuthIDPChangedEvent{OAuthIDPChangedEvent: *changedEvent}, nil
}
func OAuthIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OAuthIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -160,7 +159,7 @@ func NewOIDCIDPAddedEvent(
}
}
func OIDCIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OIDCIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -195,7 +194,7 @@ func NewOIDCIDPChangedEvent(
return &OIDCIDPChangedEvent{OIDCIDPChangedEvent: *changedEvent}, nil
}
func OIDCIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OIDCIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -239,7 +238,7 @@ func NewOIDCIDPMigratedAzureADEvent(
}
}
func OIDCIDPMigratedAzureADEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPMigratedAzureADEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OIDCIDPMigratedAzureADEventMapper(event)
if err != nil {
return nil, err
@@ -279,7 +278,7 @@ func NewOIDCIDPMigratedGoogleEvent(
}
}
func OIDCIDPMigratedGoogleEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPMigratedGoogleEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.OIDCIDPMigratedGoogleEventMapper(event)
if err != nil {
return nil, err
@@ -322,7 +321,7 @@ func NewJWTIDPAddedEvent(
}
}
func JWTIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.JWTIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -357,7 +356,7 @@ func NewJWTIDPChangedEvent(
return &JWTIDPChangedEvent{JWTIDPChangedEvent: *changedEvent}, nil
}
func JWTIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.JWTIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -402,7 +401,7 @@ func NewAzureADIDPAddedEvent(
}
}
func AzureADIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.AzureADIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -437,7 +436,7 @@ func NewAzureADIDPChangedEvent(
return &AzureADIDPChangedEvent{AzureADIDPChangedEvent: *changedEvent}, nil
}
func AzureADIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.AzureADIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -478,7 +477,7 @@ func NewGitHubIDPAddedEvent(
}
}
func GitHubIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitHubIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -513,7 +512,7 @@ func NewGitHubIDPChangedEvent(
return &GitHubIDPChangedEvent{GitHubIDPChangedEvent: *changedEvent}, nil
}
func GitHubIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitHubIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -560,7 +559,7 @@ func NewGitHubEnterpriseIDPAddedEvent(
}
}
func GitHubEnterpriseIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitHubEnterpriseIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -595,7 +594,7 @@ func NewGitHubEnterpriseIDPChangedEvent(
return &GitHubEnterpriseIDPChangedEvent{GitHubEnterpriseIDPChangedEvent: *changedEvent}, nil
}
func GitHubEnterpriseIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitHubEnterpriseIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -636,7 +635,7 @@ func NewGitLabIDPAddedEvent(
}
}
func GitLabIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitLabIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -671,7 +670,7 @@ func NewGitLabIDPChangedEvent(
return &GitLabIDPChangedEvent{GitLabIDPChangedEvent: *changedEvent}, nil
}
func GitLabIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitLabIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -714,7 +713,7 @@ func NewGitLabSelfHostedIDPAddedEvent(
}
}
func GitLabSelfHostedIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitLabSelfHostedIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -749,7 +748,7 @@ func NewGitLabSelfHostedIDPChangedEvent(
return &GitLabSelfHostedIDPChangedEvent{GitLabSelfHostedIDPChangedEvent: *changedEvent}, nil
}
func GitLabSelfHostedIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GitLabSelfHostedIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -790,7 +789,7 @@ func NewGoogleIDPAddedEvent(
}
}
func GoogleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GoogleIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -825,7 +824,7 @@ func NewGoogleIDPChangedEvent(
return &GoogleIDPChangedEvent{GoogleIDPChangedEvent: *changedEvent}, nil
}
func GoogleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.GoogleIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -880,7 +879,7 @@ func NewLDAPIDPAddedEvent(
}
}
func LDAPIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.LDAPIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -915,7 +914,7 @@ func NewLDAPIDPChangedEvent(
return &LDAPIDPChangedEvent{LDAPIDPChangedEvent: *changedEvent}, nil
}
func LDAPIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.LDAPIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -960,7 +959,7 @@ func NewAppleIDPAddedEvent(
}
}
func AppleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.AppleIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -995,7 +994,7 @@ func NewAppleIDPChangedEvent(
return &AppleIDPChangedEvent{AppleIDPChangedEvent: *changedEvent}, nil
}
func AppleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.AppleIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -1040,7 +1039,7 @@ func NewSAMLIDPAddedEvent(
}
}
func SAMLIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.SAMLIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -1074,7 +1073,7 @@ func NewSAMLIDPChangedEvent(
return &SAMLIDPChangedEvent{SAMLIDPChangedEvent: *changedEvent}, nil
}
func SAMLIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.SAMLIDPChangedEventMapper(event)
if err != nil {
return nil, err
@@ -1104,11 +1103,11 @@ func NewIDPRemovedEvent(
}
}
func (e *IDPRemovedEvent) Data() interface{} {
func (e *IDPRemovedEvent) Payload() interface{} {
return e
}
func IDPRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idp.RemovedEventMapper(event)
if err != nil {
return nil, err

14
internal/repository/org/idp_config.go
View File

@@ -3,10 +3,8 @@ package org
import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/idpconfig"
)
@@ -48,7 +46,7 @@ func NewIDPConfigAddedEvent(
}
}
func IDPConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.IDPConfigAddedEventMapper(event)
if err != nil {
return nil, err
@@ -82,7 +80,7 @@ func NewIDPConfigChangedEvent(
return &IDPConfigChangedEvent{IDPConfigChangedEvent: *changeEvent}, nil
}
func IDPConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.IDPConfigChangedEventMapper(event)
if err != nil {
return nil, err
@@ -115,7 +113,7 @@ func NewIDPConfigRemovedEvent(
}
}
func IDPConfigRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.IDPConfigRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -146,7 +144,7 @@ func NewIDPConfigDeactivatedEvent(
}
}
func IDPConfigDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.IDPConfigDeactivatedEventMapper(event)
if err != nil {
return nil, err
@@ -177,7 +175,7 @@ func NewIDPConfigReactivatedEvent(
}
}
func IDPConfigReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPConfigReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.IDPConfigReactivatedEventMapper(event)
if err != nil {
return nil, err

6
internal/repository/org/idp_jwt_config.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/idpconfig"
)
@@ -44,7 +42,7 @@ func NewIDPJWTConfigAddedEvent(
}
}
func IDPJWTConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPJWTConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.JWTConfigAddedEventMapper(event)
if err != nil {
return nil, err
@@ -77,7 +75,7 @@ func NewIDPJWTConfigChangedEvent(
return &IDPJWTConfigChangedEvent{JWTConfigChangedEvent: *changeEvent}, nil
}
func IDPJWTConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPJWTConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.JWTConfigChangedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/idp_oidc_config.go
View File

@@ -3,11 +3,9 @@ package org
import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/idpconfig"
)
@@ -54,7 +52,7 @@ func NewIDPOIDCConfigAddedEvent(
}
}
func IDPOIDCConfigAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPOIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.OIDCConfigAddedEventMapper(event)
if err != nil {
return nil, err
@@ -87,7 +85,7 @@ func NewIDPOIDCConfigChangedEvent(
return &IDPOIDCConfigChangedEvent{OIDCConfigChangedEvent: *changeEvent}, nil
}
func IDPOIDCConfigChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IDPOIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := idpconfig.OIDCConfigChangedEventMapper(event)
if err != nil {
return nil, err

10
internal/repository/org/member.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/member"
)
@@ -39,7 +37,7 @@ func NewMemberAddedEvent(
}
}
func MemberAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := member.MemberAddedEventMapper(event)
if err != nil {
return nil, err
@@ -72,7 +70,7 @@ func NewMemberChangedEvent(
}
}
func MemberChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MemberChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := member.ChangedEventMapper(event)
if err != nil {
return nil, err
@@ -102,7 +100,7 @@ func NewMemberRemovedEvent(
}
}
func MemberRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := member.RemovedEventMapper(event)
if err != nil {
return nil, err
@@ -132,7 +130,7 @@ func NewMemberCascadeRemovedEvent(
}
}
func MemberCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := member.CascadeRemovedEventMapper(event)
if err != nil {
return nil, err

7
internal/repository/org/metadata.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/metadata"
)
@@ -30,7 +29,7 @@ func NewMetadataSetEvent(ctx context.Context, aggregate *eventstore.Aggregate, k
}
}
func MetadataSetEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.SetEventMapper(event)
if err != nil {
return nil, err
@@ -54,7 +53,7 @@ func NewMetadataRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregat
}
}
func MetadataRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.RemovedEventMapper(event)
if err != nil {
return nil, err
@@ -78,7 +77,7 @@ func NewMetadataRemovedAllEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func MetadataRemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataRemovedAllEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.RemovedAllEventMapper(event)
if err != nil {
return nil, err

48
internal/repository/org/org.go
View File

@@ -2,12 +2,10 @@ package org
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/project"
"github.com/zitadel/zitadel/internal/repository/user"
)
@@ -21,15 +19,15 @@ const (
OrgRemovedEventType = orgEventTypePrefix + "removed"
)
func NewAddOrgNameUniqueConstraint(orgName string) *eventstore.EventUniqueConstraint {
func NewAddOrgNameUniqueConstraint(orgName string) *eventstore.UniqueConstraint {
return eventstore.NewAddEventUniqueConstraint(
uniqueOrgname,
orgName,
"Errors.Org.AlreadyExists")
}
func NewRemoveOrgNameUniqueConstraint(orgName string) *eventstore.EventUniqueConstraint {
return eventstore.NewRemoveEventUniqueConstraint(
func NewRemoveOrgNameUniqueConstraint(orgName string) *eventstore.UniqueConstraint {
return eventstore.NewRemoveUniqueConstraint(
uniqueOrgname,
orgName)
}
@@ -40,12 +38,12 @@ type OrgAddedEvent struct {
Name string `json:"name,omitempty"`
}
func (e *OrgAddedEvent) Data() interface{} {
func (e *OrgAddedEvent) Payload() interface{} {
return e
}
func (e *OrgAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddOrgNameUniqueConstraint(e.Name)}
func (e *OrgAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddOrgNameUniqueConstraint(e.Name)}
}
func NewOrgAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name string) *OrgAddedEvent {
@@ -59,11 +57,11 @@ func NewOrgAddedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name
}
}
func OrgAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OrgAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgAdded := &OrgAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgAdded)
err := event.Unmarshal(orgAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added")
}
@@ -78,12 +76,12 @@ type OrgChangedEvent struct {
oldName string `json:"-"`
}
func (e *OrgChangedEvent) Data() interface{} {
func (e *OrgChangedEvent) Payload() interface{} {
return e
}
func (e *OrgChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{
func (e *OrgChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{
NewRemoveOrgNameUniqueConstraint(e.oldName),
NewAddOrgNameUniqueConstraint(e.Name),
}
@@ -101,11 +99,11 @@ func NewOrgChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate, ol
}
}
func OrgChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OrgChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
orgChanged := &OrgChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, orgChanged)
err := event.Unmarshal(orgChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added")
}
@@ -117,11 +115,11 @@ type OrgDeactivatedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *OrgDeactivatedEvent) Data() interface{} {
func (e *OrgDeactivatedEvent) Payload() interface{} {
return e
}
func (e *OrgDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OrgDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -135,7 +133,7 @@ func NewOrgDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate
}
}
func OrgDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OrgDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &OrgDeactivatedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -145,11 +143,11 @@ type OrgReactivatedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *OrgReactivatedEvent) Data() interface{} {
func (e *OrgReactivatedEvent) Payload() interface{} {
return e
}
func (e *OrgReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OrgReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -163,7 +161,7 @@ func NewOrgReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregate
}
}
func OrgReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OrgReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &OrgReactivatedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -179,12 +177,12 @@ type OrgRemovedEvent struct {
samlEntityIDs []string
}
func (e *OrgRemovedEvent) Data() interface{} {
func (e *OrgRemovedEvent) Payload() interface{} {
return nil
}
func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
constraints := []*eventstore.EventUniqueConstraint{
func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
constraints := []*eventstore.UniqueConstraint{
NewRemoveOrgNameUniqueConstraint(e.name),
}
for _, name := range e.usernames {
@@ -218,7 +216,7 @@ func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, na
}
}
func OrgRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OrgRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &OrgRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil

8
internal/repository/org/policy_domain.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -39,7 +37,7 @@ func NewDomainPolicyAddedEvent(
}
}
func DomainPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.DomainPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -70,7 +68,7 @@ func NewDomainPolicyChangedEvent(
return &DomainPolicyChangedEvent{DomainPolicyChangedEvent: *changedEvent}, nil
}
func DomainPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.DomainPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -97,7 +95,7 @@ func NewDomainPolicyRemovedEvent(
}
}
func DomainPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.DomainPolicyRemovedEventMapper(event)
if err != nil {
return nil, err

35
internal/repository/org/policy_label.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -68,7 +67,7 @@ func NewLabelPolicyAddedEvent(
}
}
func LabelPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -99,7 +98,7 @@ func NewLabelPolicyChangedEvent(
return &LabelPolicyChangedEvent{LabelPolicyChangedEvent: *changedEvent}, nil
}
func LabelPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -126,7 +125,7 @@ func NewLabelPolicyRemovedEvent(
}
}
func LabelPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -153,7 +152,7 @@ func NewLabelPolicyActivatedEvent(
}
}
func LabelPolicyActivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyActivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyActivatedEventMapper(event)
if err != nil {
return nil, err
@@ -182,7 +181,7 @@ func NewLabelPolicyLogoAddedEvent(
}
}
func LabelPolicyLogoAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyLogoAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyLogoAddedEventMapper(event)
if err != nil {
return nil, err
@@ -211,7 +210,7 @@ func NewLabelPolicyLogoRemovedEvent(
}
}
func LabelPolicyLogoRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyLogoRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyLogoRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -240,7 +239,7 @@ func NewLabelPolicyIconAddedEvent(
}
}
func LabelPolicyIconAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyIconAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyIconAddedEventMapper(event)
if err != nil {
return nil, err
@@ -269,7 +268,7 @@ func NewLabelPolicyIconRemovedEvent(
}
}
func LabelPolicyIconRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyIconRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyIconRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -298,7 +297,7 @@ func NewLabelPolicyLogoDarkAddedEvent(
}
}
func LabelPolicyLogoDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyLogoDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyLogoDarkAddedEventMapper(event)
if err != nil {
return nil, err
@@ -327,7 +326,7 @@ func NewLabelPolicyLogoDarkRemovedEvent(
}
}
func LabelPolicyLogoDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyLogoDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyLogoDarkRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -356,7 +355,7 @@ func NewLabelPolicyIconDarkAddedEvent(
}
}
func LabelPolicyIconDarkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyIconDarkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyIconDarkAddedEventMapper(event)
if err != nil {
return nil, err
@@ -385,7 +384,7 @@ func NewLabelPolicyIconDarkRemovedEvent(
}
}
func LabelPolicyIconDarkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyIconDarkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyIconDarkRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -414,7 +413,7 @@ func NewLabelPolicyFontAddedEvent(
}
}
func LabelPolicyFontAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyFontAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyFontAddedEventMapper(event)
if err != nil {
return nil, err
@@ -443,7 +442,7 @@ func NewLabelPolicyFontRemovedEvent(
}
}
func LabelPolicyFontRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyFontRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyFontRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -456,11 +455,11 @@ type LabelPolicyAssetsRemovedEvent struct {
policy.LabelPolicyAssetsRemovedEvent
}
func (e *LabelPolicyAssetsRemovedEvent) Data() interface{} {
func (e *LabelPolicyAssetsRemovedEvent) Payload() interface{} {
return nil
}
func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *LabelPolicyAssetsRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -478,7 +477,7 @@ func NewLabelPolicyAssetsRemovedEvent(
}
}
func LabelPolicyAssetsRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LabelPolicyAssetsRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LabelPolicyAssetsRemovedEventMapper(event)
if err != nil {
return nil, err

10
internal/repository/org/policy_login.go
View File

@@ -4,10 +4,8 @@ import (
"context"
"time"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -69,7 +67,7 @@ func NewLoginPolicyAddedEvent(
}
}
func LoginPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LoginPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -100,7 +98,7 @@ func NewLoginPolicyChangedEvent(
return &LoginPolicyChangedEvent{LoginPolicyChangedEvent: *changedEvent}, nil
}
func LoginPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LoginPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -127,7 +125,7 @@ func NewLoginPolicyRemovedEvent(
}
}
func LoginPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LoginPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LoginPolicyRemovedEventMapper(event)
if err != nil {
return nil, err

12
internal/repository/org/policy_login_factors.go
View File

@@ -3,10 +3,8 @@ package org
import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -37,7 +35,7 @@ func NewLoginPolicySecondFactorAddedEvent(
}
}
func SecondFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func SecondFactorAddedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.SecondFactorAddedEventMapper(event)
if err != nil {
return nil, err
@@ -68,7 +66,7 @@ func NewLoginPolicySecondFactorRemovedEvent(
}
}
func SecondFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func SecondFactorRemovedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.SecondFactorRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -98,7 +96,7 @@ func NewLoginPolicyMultiFactorAddedEvent(
}
}
func MultiFactorAddedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func MultiFactorAddedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MultiFactorAddedEventMapper(event)
if err != nil {
return nil, err
@@ -129,7 +127,7 @@ func NewLoginPolicyMultiFactorRemovedEvent(
}
}
func MultiFactorRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func MultiFactorRemovedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MultiFactorRemovedEventMapper(event)
if err != nil {
return nil, err

10
internal/repository/org/policy_login_identity_provider.go
View File

@@ -3,10 +3,8 @@ package org
import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -38,7 +36,7 @@ func NewIdentityProviderAddedEvent(
}
}
func IdentityProviderAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.IdentityProviderAddedEventMapper(event)
if err != nil {
return nil, err
@@ -68,7 +66,7 @@ func NewIdentityProviderRemovedEvent(
}
}
func IdentityProviderRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.IdentityProviderRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -95,7 +93,7 @@ func NewIdentityProviderCascadeRemovedEvent(
}
}
func IdentityProviderCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.IdentityProviderCascadeRemovedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/policy_mail_template.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -31,7 +29,7 @@ func NewMailTemplateAddedEvent(
}
}
func MailTemplateAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTemplateAddedEventMapper(event)
if err != nil {
return nil, err
@@ -59,7 +57,7 @@ func NewMailTemplateChangedEvent(
return &MailTemplateChangedEvent{MailTemplateChangedEvent: *changedEvent}, nil
}
func MailTemplateChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTemplateChangedEventMapper(event)
if err != nil {
return nil, err
@@ -83,7 +81,7 @@ func NewMailTemplateRemovedEvent(
}
}
func MailTemplateRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTemplateRemovedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/policy_mail_text.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -45,7 +43,7 @@ func NewMailTextAddedEvent(
}
}
func MailTextAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTextAddedEventMapper(event)
if err != nil {
return nil, err
@@ -77,7 +75,7 @@ func NewMailTextChangedEvent(
return &MailTextChangedEvent{MailTextChangedEvent: *changedEvent}, nil
}
func MailTextChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTextChangedEventMapper(event)
if err != nil {
return nil, err
@@ -105,7 +103,7 @@ func NewMailTextRemovedEvent(
}
}
func MailTextRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MailTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.MailTextRemovedEventMapper(event)
if err != nil {
return nil, err

7
internal/repository/org/policy_notification.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -34,7 +33,7 @@ func NewNotificationPolicyAddedEvent(
}
}
func NotificationPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.NotificationPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -65,7 +64,7 @@ func NewNotificationPolicyChangedEvent(
return &NotificationPolicyChangedEvent{NotificationPolicyChangedEvent: *changedEvent}, nil
}
func NotificationPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.NotificationPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -92,7 +91,7 @@ func NewNotificationPolicyRemovedEvent(
}
}
func NotificationPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func NotificationPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.NotificationPolicyRemovedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/policy_password_age.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -36,7 +34,7 @@ func NewPasswordAgePolicyAddedEvent(
}
}
func PasswordAgePolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordAgePolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -67,7 +65,7 @@ func NewPasswordAgePolicyChangedEvent(
return &PasswordAgePolicyChangedEvent{PasswordAgePolicyChangedEvent: *changedEvent}, nil
}
func PasswordAgePolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordAgePolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -94,7 +92,7 @@ func NewPasswordAgePolicyRemovedEvent(
}
}
func PasswordAgePolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordAgePolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordAgePolicyRemovedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/policy_password_complexity.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -42,7 +40,7 @@ func NewPasswordComplexityPolicyAddedEvent(
}
}
func PasswordComplexityPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordComplexityPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -73,7 +71,7 @@ func NewPasswordComplexityPolicyChangedEvent(
return &PasswordComplexityPolicyChangedEvent{PasswordComplexityPolicyChangedEvent: *changedEvent}, nil
}
func PasswordComplexityPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordComplexityPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -100,7 +98,7 @@ func NewPasswordComplexityPolicyRemovedEvent(
}
}
func PasswordComplexityPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PasswordComplexityPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PasswordComplexityPolicyRemovedEventMapper(event)
if err != nil {
return nil, err

8
internal/repository/org/policy_password_lockout.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -36,7 +34,7 @@ func NewLockoutPolicyAddedEvent(
}
}
func LockoutPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LockoutPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -67,7 +65,7 @@ func NewLockoutPolicyChangedEvent(
return &LockoutPolicyChangedEvent{LockoutPolicyChangedEvent: *changedEvent}, nil
}
func LockoutPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LockoutPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -94,7 +92,7 @@ func NewLockoutPolicyRemovedEvent(
}
}
func LockoutPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LockoutPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.LockoutPolicyRemovedEventMapper(event)
if err != nil {
return nil, err

7
internal/repository/org/policy_privacy.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/policy"
)
@@ -40,7 +39,7 @@ func NewPrivacyPolicyAddedEvent(
}
}
func PrivacyPolicyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PrivacyPolicyAddedEventMapper(event)
if err != nil {
return nil, err
@@ -71,7 +70,7 @@ func NewPrivacyPolicyChangedEvent(
return &PrivacyPolicyChangedEvent{PrivacyPolicyChangedEvent: *changedEvent}, nil
}
func PrivacyPolicyChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PrivacyPolicyChangedEventMapper(event)
if err != nil {
return nil, err
@@ -98,7 +97,7 @@ func NewPrivacyPolicyRemovedEvent(
}
}
func PrivacyPolicyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PrivacyPolicyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := policy.PrivacyPolicyRemovedEventMapper(event)
if err != nil {
return nil, err