fix: move v2 pkgs (#1331)

* fix: move eventstore pkgs

* fix: move eventstore pkgs

* fix: remove v2 view

* fix: remove v2 view

internal/iam/model/iam.go

@@ -1,8 +1,8 @@
 package model
 
 import (
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
-	"github.com/caos/zitadel/internal/v2/domain"
+	"github.com/caos/zitadel/internal/domain"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type Step int

internal/iam/model/iam_member.go

@@ -1,6 +1,6 @@
 package model
 
-import es_models "github.com/caos/zitadel/internal/eventstore/models"
+import es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 type IAMMember struct {
 	es_models.ObjectRoot

internal/iam/model/idp_config.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type IDPConfig struct {

internal/iam/model/idp_provider_view.go

@@ -1,8 +1,8 @@
 package model
 
 import (
+	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"time"
 )
 

internal/iam/model/label_policy.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type LabelPolicy struct {

internal/iam/model/login_policy.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type LoginPolicy struct {

internal/iam/model/login_policy_view.go

@@ -1,9 +1,9 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 	"time"
 )
 

internal/iam/model/mail_template.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type MailTemplate struct {

internal/iam/model/mail_text.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type MailTexts struct {

internal/iam/model/org_iam_policy.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type OrgIAMPolicy struct {

internal/iam/model/password_age_policy.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type PasswordAgePolicy struct {

internal/iam/model/password_complexity_policy.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"regexp"
 )
 

internal/iam/model/password_lockout_policy.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 type PasswordLockoutPolicy struct {

internal/iam/repository/eventsourcing/cache.go

@@ -4,7 +4,7 @@ import (
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/cache"
 	"github.com/caos/zitadel/internal/cache/config"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 )
 

internal/iam/repository/eventsourcing/eventstore.go

@@ -2,10 +2,10 @@ package eventsourcing
 
 import (
 	"github.com/caos/zitadel/internal/cache/config"
-	es_int "github.com/caos/zitadel/internal/eventstore"
+	"github.com/caos/zitadel/internal/eventstore/v1"
 )
 
 type IAMConfig struct {
-	es_int.Eventstore
+	v1.Eventstore
 	Cache *config.CacheConfig
 }

internal/iam/repository/eventsourcing/iam.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 )
 

internal/iam/repository/eventsourcing/model/iam.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 
 	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
-	"github.com/caos/zitadel/internal/v2/domain"
 )
 
 const (

internal/iam/repository/eventsourcing/model/iam_member.go

@@ -3,7 +3,7 @@ package model
 import (
 	"encoding/json"
 	"github.com/caos/logging"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/eventsourcing/model/iam_member_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/iam_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func mockIamData(iam *IAM) []byte {

internal/iam/repository/eventsourcing/model/idp_config.go

@@ -3,7 +3,7 @@ package model
 import (
 	"encoding/json"
 	"github.com/caos/logging"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/eventsourcing/model/idp_config_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 	"testing"
 )

internal/iam/repository/eventsourcing/model/label_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type LabelPolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 	State          int32  `json:"-"`
 	PrimaryColor   string `json:"primaryColor"`
 	SecondaryColor string `json:"secondaryColor"`

internal/iam/repository/eventsourcing/model/label_policy_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestLabelPolicyChanges(t *testing.T) {

internal/iam/repository/eventsourcing/model/login_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type LoginPolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 	State                 int32          `json:"-"`
 	AllowUsernamePassword bool           `json:"allowUsernamePassword"`
 	AllowRegister         bool           `json:"allowRegister"`
@@ -23,7 +22,7 @@ type LoginPolicy struct {
 }
 
 type IDPProvider struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 	Type        int32  `json:"idpProviderType"`
 	IDPConfigID string `json:"idpConfigId"`
 }

internal/iam/repository/eventsourcing/model/login_policy_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 	"testing"
 )

internal/iam/repository/eventsourcing/model/mail_template.go

@@ -5,13 +5,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type MailTemplate struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 	State    int32 `json:"-"`
 	Template []byte
 }

internal/iam/repository/eventsourcing/model/mail_template_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestMailTemplateChanges(t *testing.T) {

internal/iam/repository/eventsourcing/model/mail_text.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type MailText struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 	State        int32 `json:"-"`
 	MailTextType string
 	Language     string

internal/iam/repository/eventsourcing/model/mail_text_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 )
 
 func TestAppendAddMailTextEvent(t *testing.T) {

internal/iam/repository/eventsourcing/model/oidc_idp_config.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"github.com/caos/logging"
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 	"github.com/lib/pq"
 	"reflect"

internal/iam/repository/eventsourcing/model/oidc_idp_config_test.go

@@ -3,7 +3,7 @@ package model
 import (
 	"encoding/json"
 	"github.com/caos/zitadel/internal/crypto"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/org_iam_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type OrgIAMPolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 
 	State                 int32 `json:"-"`
 	UserLoginMustBeDomain bool  `json:"userLoginMustBeDomain"`

internal/iam/repository/eventsourcing/model/org_iam_policy_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/password_age_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type PasswordAgePolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 
 	State          int32  `json:"-"`
 	MaxAgeDays     uint64 `json:"maxAgeDays"`

internal/iam/repository/eventsourcing/model/password_age_policy_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/password_complexity_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type PasswordComplexityPolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 
 	State        int32  `json:"-"`
 	MinLength    uint64 `json:"minLength"`

internal/iam/repository/eventsourcing/model/password_complexity_policy_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/password_lockout_policy.go

@@ -4,13 +4,12 @@ import (
 	"encoding/json"
 
 	"github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
 )
 
 type PasswordLockoutPolicy struct {
-	models.ObjectRoot
+	es_models.ObjectRoot
 
 	State               int32  `json:"-"`
 	MaxAttempts         uint64 `json:"maxAttempts"`

internal/iam/repository/eventsourcing/model/password_lockout_policy_test.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"encoding/json"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"testing"
 )
 

internal/iam/repository/eventsourcing/model/types.go

@@ -1,6 +1,6 @@
 package model
 
-import "github.com/caos/zitadel/internal/eventstore/models"
+import "github.com/caos/zitadel/internal/eventstore/v1/models"
 
 const (
 	IAMAggregate models.AggregateType = "iam"

internal/iam/repository/view/model/iam_member.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 	"github.com/lib/pq"
 )

internal/iam/repository/view/model/idp_config.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 	"github.com/lib/pq"
 )

internal/iam/repository/view/model/idp_provider.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/label_policy.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/login_policy.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/mail_template.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/mail_text.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/org_iam_policy.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/password_age_policy.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/password_complexity_policy.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/model/password_lockout_policy.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/caos/logging"
 	caos_errs "github.com/caos/zitadel/internal/errors"
-	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/iam/model"
 )
 

internal/iam/repository/view/query.go

@@ -2,7 +2,7 @@ package view
 
 import (
 	"github.com/caos/zitadel/internal/errors"
-	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 )