TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:07:30 +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

19
internal/repository/idp/apple.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type AppleIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewAppleIDPAddedEvent(
}
}
func (e *AppleIDPAddedEvent) Data() interface{} {
func (e *AppleIDPAddedEvent) Payload() interface{} {
return e
}
func (e *AppleIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *AppleIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func AppleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &AppleIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Beqss", "unable to unmarshal event")
}
@@ -142,20 +139,20 @@ func ChangeAppleOptions(options OptionChanges) func(*AppleIDPChangedEvent) {
}
}
func (e *AppleIDPChangedEvent) Data() interface{} {
func (e *AppleIDPChangedEvent) Payload() interface{} {
return e
}
func (e *AppleIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *AppleIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func AppleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &AppleIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-NBe1s", "unable to unmarshal event")
}

19
internal/repository/idp/azuread.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type AzureADIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewAzureADIDPAddedEvent(
}
}
func (e *AzureADIDPAddedEvent) Data() interface{} {
func (e *AzureADIDPAddedEvent) Payload() interface{} {
return e
}
func (e *AzureADIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *AzureADIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func AzureADIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &AzureADIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Grh2g", "unable to unmarshal event")
}
@@ -142,20 +139,20 @@ func ChangeAzureADIsEmailVerified(isEmailVerified bool) func(*AzureADIDPChangedE
}
}
func (e *AzureADIDPChangedEvent) Data() interface{} {
func (e *AzureADIDPChangedEvent) Payload() interface{} {
return e
}
func (e *AzureADIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *AzureADIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func AzureADIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &AzureADIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
}

35
internal/repository/idp/github.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type GitHubIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGitHubIDPAddedEvent(
}
}
func (e *GitHubIDPAddedEvent) Data() interface{} {
func (e *GitHubIDPAddedEvent) Payload() interface{} {
return e
}
func (e *GitHubIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitHubIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitHubIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitHubIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event")
}
@@ -121,20 +118,20 @@ func ChangeGitHubScopes(scopes []string) func(*GitHubIDPChangedEvent) {
}
}
func (e *GitHubIDPChangedEvent) Data() interface{} {
func (e *GitHubIDPChangedEvent) Payload() interface{} {
return e
}
func (e *GitHubIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitHubIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitHubIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitHubIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Sfrth", "unable to unmarshal event")
}
@@ -182,20 +179,20 @@ func NewGitHubEnterpriseIDPAddedEvent(
}
}
func (e *GitHubEnterpriseIDPAddedEvent) Data() interface{} {
func (e *GitHubEnterpriseIDPAddedEvent) Payload() interface{} {
return e
}
func (e *GitHubEnterpriseIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitHubEnterpriseIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitHubEnterpriseIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitHubEnterpriseIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event")
}
@@ -284,20 +281,20 @@ func ChangeGitHubEnterpriseScopes(scopes []string) func(*GitHubEnterpriseIDPChan
}
}
func (e *GitHubEnterpriseIDPChangedEvent) Data() interface{} {
func (e *GitHubEnterpriseIDPChangedEvent) Payload() interface{} {
return e
}
func (e *GitHubEnterpriseIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitHubEnterpriseIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitHubEnterpriseIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitHubEnterpriseIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-ASf3r", "unable to unmarshal event")
}

35
internal/repository/idp/gitlab.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type GitLabIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGitLabIDPAddedEvent(
}
}
func (e *GitLabIDPAddedEvent) Data() interface{} {
func (e *GitLabIDPAddedEvent) Payload() interface{} {
return e
}
func (e *GitLabIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitLabIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitLabIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitLabIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-KLewio", "unable to unmarshal event")
}
@@ -122,20 +119,20 @@ func ChangeGitLabOptions(options OptionChanges) func(*GitLabIDPChangedEvent) {
}
}
func (e *GitLabIDPChangedEvent) Data() interface{} {
func (e *GitLabIDPChangedEvent) Payload() interface{} {
return e
}
func (e *GitLabIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitLabIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitLabIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitLabIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Sfhjk", "unable to unmarshal event")
}
@@ -177,20 +174,20 @@ func NewGitLabSelfHostedIDPAddedEvent(
}
}
func (e *GitLabSelfHostedIDPAddedEvent) Data() interface{} {
func (e *GitLabSelfHostedIDPAddedEvent) Payload() interface{} {
return e
}
func (e *GitLabSelfHostedIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitLabSelfHostedIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitLabSelfHostedIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitLabSelfHostedIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-S1efv", "unable to unmarshal event")
}
@@ -266,20 +263,20 @@ func ChangeGitLabSelfHostedOptions(options OptionChanges) func(*GitLabSelfHosted
}
}
func (e *GitLabSelfHostedIDPChangedEvent) Data() interface{} {
func (e *GitLabSelfHostedIDPChangedEvent) Payload() interface{} {
return e
}
func (e *GitLabSelfHostedIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GitLabSelfHostedIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GitLabSelfHostedIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GitLabSelfHostedIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-SFrhj", "unable to unmarshal event")
}

19
internal/repository/idp/google.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type GoogleIDPAddedEvent struct {
@@ -40,20 +37,20 @@ func NewGoogleIDPAddedEvent(
}
}
func (e *GoogleIDPAddedEvent) Data() interface{} {
func (e *GoogleIDPAddedEvent) Payload() interface{} {
return e
}
func (e *GoogleIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GoogleIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GoogleIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GoogleIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-SAff1", "unable to unmarshal event")
}
@@ -121,20 +118,20 @@ func ChangeGoogleOptions(options OptionChanges) func(*GoogleIDPChangedEvent) {
}
}
func (e *GoogleIDPChangedEvent) Data() interface{} {
func (e *GoogleIDPChangedEvent) Payload() interface{} {
return e
}
func (e *GoogleIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *GoogleIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func GoogleIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &GoogleIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-SF3t2", "unable to unmarshal event")
}

11
internal/repository/idp/idp.go
View File

@@ -1,11 +1,8 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type Options struct {
@@ -74,20 +71,20 @@ func NewRemovedEvent(
}
}
func (e *RemovedEvent) Data() interface{} {
func (e *RemovedEvent) Payload() interface{} {
return e
}
func (e *RemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *RemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func RemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &RemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-plSD2", "unable to unmarshal event")
}

19
internal/repository/idp/jwt.go
View File

@@ -1,11 +1,8 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type JWTIDPAddedEvent struct {
@@ -42,20 +39,20 @@ func NewJWTIDPAddedEvent(
}
}
func (e *JWTIDPAddedEvent) Data() interface{} {
func (e *JWTIDPAddedEvent) Payload() interface{} {
return e
}
func (e *JWTIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *JWTIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func JWTIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &JWTIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
}
@@ -131,20 +128,20 @@ func ChangeJWTOptions(options OptionChanges) func(*JWTIDPChangedEvent) {
}
}
func (e *JWTIDPChangedEvent) Data() interface{} {
func (e *JWTIDPChangedEvent) Payload() interface{} {
return e
}
func (e *JWTIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *JWTIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func JWTIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &JWTIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
}

18
internal/repository/idp/ldap.go
View File

@@ -1,13 +1,11 @@
package idp
import (
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type LDAPIDPAddedEvent struct {
@@ -165,20 +163,20 @@ func NewLDAPIDPAddedEvent(
}
}
func (e *LDAPIDPAddedEvent) Data() interface{} {
func (e *LDAPIDPAddedEvent) Payload() interface{} {
return e
}
func (e *LDAPIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *LDAPIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func LDAPIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &LDAPIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Dgh42", "unable to unmarshal event")
}
@@ -329,20 +327,20 @@ func ChangeLDAPOptions(options OptionChanges) func(*LDAPIDPChangedEvent) {
}
}
func (e *LDAPIDPChangedEvent) Data() interface{} {
func (e *LDAPIDPChangedEvent) Payload() interface{} {
return e
}
func (e *LDAPIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *LDAPIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func LDAPIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &LDAPIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Sfth3", "unable to unmarshal event")
}

19
internal/repository/idp/oauth.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type OAuthIDPAddedEvent struct {
@@ -52,20 +49,20 @@ func NewOAuthIDPAddedEvent(
}
}
func (e *OAuthIDPAddedEvent) Data() interface{} {
func (e *OAuthIDPAddedEvent) Payload() interface{} {
return e
}
func (e *OAuthIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OAuthIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OAuthIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &OAuthIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
}
@@ -161,20 +158,20 @@ func ChangeOAuthIDAttribute(idAttribute string) func(*OAuthIDPChangedEvent) {
}
}
func (e *OAuthIDPChangedEvent) Data() interface{} {
func (e *OAuthIDPChangedEvent) Payload() interface{} {
return e
}
func (e *OAuthIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OAuthIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OAuthIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &OAuthIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-SAf3gw", "unable to unmarshal event")
}

27
internal/repository/idp/oidc.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type OIDCIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewOIDCIDPAddedEvent(
}
}
func (e *OIDCIDPAddedEvent) Data() interface{} {
func (e *OIDCIDPAddedEvent) Payload() interface{} {
return e
}
func (e *OIDCIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OIDCIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OIDCIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &OIDCIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event")
}
@@ -142,20 +139,20 @@ func ChangeOIDCIsIDTokenMapping(idTokenMapping bool) func(*OIDCIDPChangedEvent)
}
}
func (e *OIDCIDPChangedEvent) Data() interface{} {
func (e *OIDCIDPChangedEvent) Payload() interface{} {
return e
}
func (e *OIDCIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OIDCIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OIDCIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &OIDCIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event")
}
@@ -197,11 +194,11 @@ func (e *OIDCIDPMigratedAzureADEvent) Data() interface{} {
return e
}
func (e *OIDCIDPMigratedAzureADEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OIDCIDPMigratedAzureADEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OIDCIDPMigratedAzureADEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPMigratedAzureADEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := AzureADIDPAddedEventMapper(event)
if err != nil {
return nil, err
@@ -240,11 +237,11 @@ func (e *OIDCIDPMigratedGoogleEvent) Data() interface{} {
return e
}
func (e *OIDCIDPMigratedGoogleEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *OIDCIDPMigratedGoogleEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func OIDCIDPMigratedGoogleEventMapper(event *repository.Event) (eventstore.Event, error) {
func OIDCIDPMigratedGoogleEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := GoogleIDPAddedEventMapper(event)
if err != nil {
return nil, err

19
internal/repository/idp/saml.go
View File

@@ -1,12 +1,9 @@
package idp
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type SAMLIDPAddedEvent struct {
@@ -46,20 +43,20 @@ func NewSAMLIDPAddedEvent(
}
}
func (e *SAMLIDPAddedEvent) Data() interface{} {
func (e *SAMLIDPAddedEvent) Payload() interface{} {
return e
}
func (e *SAMLIDPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *SAMLIDPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func SAMLIDPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &SAMLIDPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-v9uajo3k71", "unable to unmarshal event")
}
@@ -142,20 +139,20 @@ func ChangeSAMLOptions(options OptionChanges) func(*SAMLIDPChangedEvent) {
}
}
func (e *SAMLIDPChangedEvent) Data() interface{} {
func (e *SAMLIDPChangedEvent) Payload() interface{} {
return e
}
func (e *SAMLIDPChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *SAMLIDPChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
func SAMLIDPChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &SAMLIDPChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "IDP-w1t1824tw5", "unable to unmarshal event")
}