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

cleanup

Browse Source
This commit is contained in:
adlerhurst
2025-07-25 17:54:10 +02:00
parent 9d5f545623
commit 24ef46e75b
3 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/v3/domain/instance_domain.go
View File

@@ -19,12 +19,12 @@ type InstanceDomain struct {
} }
type AddInstanceDomain struct { type AddInstanceDomain struct {
InstanceID string `json:"instanceId,omitempty" db:"instance_id"` InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
Domain string `json:"domain,omitempty" db:"domain"` Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"` IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"` IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
IsGenerated bool `json:"isGenerated,omitempty" db:"is_generated"` IsGenerated bool `json:"isGenerated,omitempty" db:"is_generated"`
ValidationType DomainValidationType `json:"validationType,omitempty" db:"validation_type"` ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
// CreatedAt is the time when the domain was added. // CreatedAt is the time when the domain was added.
// It is set by the repository and should not be set by the caller. // It is set by the repository and should not be set by the caller.

2
backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql
View File

@@ -6,7 +6,7 @@ CREATE TYPE zitadel.organization_state AS ENUM (
CREATE TABLE zitadel.organizations( CREATE TABLE zitadel.organizations(
id TEXT NOT NULL CHECK (id <> ''), id TEXT NOT NULL CHECK (id <> ''),
name TEXT NOT NULL CHECK (name <> ''), name TEXT NOT NULL CHECK (name <> ''),
instance_id TEXT NOT NULL REFERENCES zitadel.instances (id), instance_id TEXT NOT NULL REFERENCES zitadel.instances (id) ON DELETE CASCADE,
state zitadel.organization_state NOT NULL, state zitadel.organization_state NOT NULL,
created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL, created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,
updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL, updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL,

33
backend/v3/storage/database/repository/instance_domain_test.go
View File

@@ -5,6 +5,7 @@ import (
"testing" "testing"
"github.com/brianvoe/gofakeit/v6" "github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@@ -42,7 +43,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
}, },
{ {
@@ -52,7 +53,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: true, IsVerified: true,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP, ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
}, },
}, },
{ {
@@ -62,7 +63,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: true, IsVerified: true,
IsPrimary: true, IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
}, },
{ {
@@ -72,7 +73,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: "", Domain: "",
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
err: new(database.CheckError), err: new(database.CheckError),
}, },
@@ -86,7 +87,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: domainName, Domain: domainName,
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
} }
err := domainRepo.Add(ctx, instanceDomain) err := domainRepo.Add(ctx, instanceDomain)
@@ -98,7 +99,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: domainName, Domain: domainName,
IsVerified: true, IsVerified: true,
IsPrimary: true, IsPrimary: true,
ValidationType: domain.DomainValidationTypeHTTP, ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
} }
}, },
err: new(database.UniqueError), err: new(database.UniqueError),
@@ -110,7 +111,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
err: new(database.ForeignKeyError), err: new(database.ForeignKeyError),
}, },
@@ -120,7 +121,7 @@ func TestAddInstanceDomain(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
err: new(database.ForeignKeyError), err: new(database.ForeignKeyError),
}, },
@@ -189,14 +190,14 @@ func TestGetInstanceDomain(t *testing.T) {
Domain: domainName1, Domain: domainName1,
IsVerified: true, IsVerified: true,
IsPrimary: true, IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
} }
domain2 := &domain.AddInstanceDomain{ domain2 := &domain.AddInstanceDomain{
InstanceID: instanceID, InstanceID: instanceID,
Domain: domainName2, Domain: domainName2,
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP, ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
} }
err = domainRepo.Add(t.Context(), domain1) err = domainRepo.Add(t.Context(), domain1)
@@ -310,21 +311,21 @@ func TestListInstanceDomains(t *testing.T) {
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: true, IsVerified: true,
IsPrimary: true, IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
{ {
InstanceID: instanceID, InstanceID: instanceID,
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP, ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
}, },
{ {
InstanceID: instanceID, InstanceID: instanceID,
Domain: gofakeit.DomainName(), Domain: gofakeit.DomainName(),
IsVerified: true, IsVerified: true,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}, },
} }
@@ -422,7 +423,7 @@ func TestUpdateInstanceDomain(t *testing.T) {
Domain: domainName, Domain: domainName,
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
} }
err = domainRepo.Add(t.Context(), instanceDomain) err = domainRepo.Add(t.Context(), instanceDomain)
@@ -536,14 +537,14 @@ func TestRemoveInstanceDomain(t *testing.T) {
Domain: domainName1, Domain: domainName1,
IsVerified: true, IsVerified: true,
IsPrimary: true, IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS, ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
} }
domain2 := &domain.AddInstanceDomain{ domain2 := &domain.AddInstanceDomain{
InstanceID: instanceID, InstanceID: instanceID,
Domain: domainName2, Domain: domainName2,
IsVerified: false, IsVerified: false,
IsPrimary: false, IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP, ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
} }
err = domainRepo.Add(t.Context(), domain1) err = domainRepo.Add(t.Context(), domain1)