From 24ef46e75b56dae4cb8c965039aad42ef70af99c Mon Sep 17 00:00:00 2001 From: adlerhurst <27845747+adlerhurst@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:54:10 +0200 Subject: [PATCH] cleanup --- backend/v3/domain/instance_domain.go | 12 +++---- .../migration/002_organization_table/up.sql | 2 +- .../repository/instance_domain_test.go | 33 ++++++++++--------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/backend/v3/domain/instance_domain.go b/backend/v3/domain/instance_domain.go index e4e0d3924c..e9049ebd4f 100644 --- a/backend/v3/domain/instance_domain.go +++ b/backend/v3/domain/instance_domain.go @@ -19,12 +19,12 @@ type InstanceDomain struct { } type AddInstanceDomain struct { - InstanceID string `json:"instanceId,omitempty" db:"instance_id"` - Domain string `json:"domain,omitempty" db:"domain"` - IsVerified bool `json:"isVerified,omitempty" db:"is_verified"` - IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"` - IsGenerated bool `json:"isGenerated,omitempty" db:"is_generated"` - ValidationType DomainValidationType `json:"validationType,omitempty" db:"validation_type"` + InstanceID string `json:"instanceId,omitempty" db:"instance_id"` + Domain string `json:"domain,omitempty" db:"domain"` + IsVerified bool `json:"isVerified,omitempty" db:"is_verified"` + IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"` + IsGenerated bool `json:"isGenerated,omitempty" db:"is_generated"` + ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"` // CreatedAt is the time when the domain was added. // It is set by the repository and should not be set by the caller. diff --git a/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql b/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql index 6ef33fbee4..e8b5acef4b 100644 --- a/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql +++ b/backend/v3/storage/database/dialect/postgres/migration/002_organization_table/up.sql @@ -6,7 +6,7 @@ CREATE TYPE zitadel.organization_state AS ENUM ( CREATE TABLE zitadel.organizations( id TEXT NOT NULL CHECK (id <> ''), 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, created_at TIMESTAMPTZ DEFAULT NOW() NOT NULL, updated_at TIMESTAMPTZ DEFAULT NOW() NOT NULL, diff --git a/backend/v3/storage/database/repository/instance_domain_test.go b/backend/v3/storage/database/repository/instance_domain_test.go index 888b74bdab..bf915577de 100644 --- a/backend/v3/storage/database/repository/instance_domain_test.go +++ b/backend/v3/storage/database/repository/instance_domain_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/brianvoe/gofakeit/v6" + "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -42,7 +43,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, }, { @@ -52,7 +53,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: true, IsPrimary: false, - ValidationType: domain.DomainValidationTypeHTTP, + ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP), }, }, { @@ -62,7 +63,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: true, IsPrimary: true, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, }, { @@ -72,7 +73,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: "", IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, err: new(database.CheckError), }, @@ -86,7 +87,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: domainName, IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), } err := domainRepo.Add(ctx, instanceDomain) @@ -98,7 +99,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: domainName, IsVerified: true, IsPrimary: true, - ValidationType: domain.DomainValidationTypeHTTP, + ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP), } }, err: new(database.UniqueError), @@ -110,7 +111,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, err: new(database.ForeignKeyError), }, @@ -120,7 +121,7 @@ func TestAddInstanceDomain(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, err: new(database.ForeignKeyError), }, @@ -189,14 +190,14 @@ func TestGetInstanceDomain(t *testing.T) { Domain: domainName1, IsVerified: true, IsPrimary: true, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), } domain2 := &domain.AddInstanceDomain{ InstanceID: instanceID, Domain: domainName2, IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeHTTP, + ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP), } err = domainRepo.Add(t.Context(), domain1) @@ -310,21 +311,21 @@ func TestListInstanceDomains(t *testing.T) { Domain: gofakeit.DomainName(), IsVerified: true, IsPrimary: true, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, { InstanceID: instanceID, Domain: gofakeit.DomainName(), IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeHTTP, + ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP), }, { InstanceID: instanceID, Domain: gofakeit.DomainName(), IsVerified: true, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), }, } @@ -422,7 +423,7 @@ func TestUpdateInstanceDomain(t *testing.T) { Domain: domainName, IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), } err = domainRepo.Add(t.Context(), instanceDomain) @@ -536,14 +537,14 @@ func TestRemoveInstanceDomain(t *testing.T) { Domain: domainName1, IsVerified: true, IsPrimary: true, - ValidationType: domain.DomainValidationTypeDNS, + ValidationType: gu.Ptr(domain.DomainValidationTypeDNS), } domain2 := &domain.AddInstanceDomain{ InstanceID: instanceID, Domain: domainName2, IsVerified: false, IsPrimary: false, - ValidationType: domain.DomainValidationTypeHTTP, + ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP), } err = domainRepo.Add(t.Context(), domain1)