mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-29 03:36:32 +00:00
This pull request fixes an issue where the repository would fail to scan organization or instance structs if the `domains` column was `NULL`. ## Which problems are solved If the `domains` column of `orgs` or `instances` was `NULL`, the repository failed scanning into the structs. This happened because the scanning mechanism did not correctly handle `NULL` JSONB columns. ## How the problems are solved A new generic type `JSONArray[T]` is introduced, which implements the `sql.Scanner` interface. This type can correctly scan JSON arrays from the database, including handling `NULL` values gracefully. The repositories for instances and organizations have been updated to use this new type for the domains field. The SQL queries have also been improved to use `FILTER` with `jsonb_agg` for better readability and performance when aggregating domains. ## Additional changes * An unnecessary cleanup step in the organization domain tests for already removed domains has been removed. * The `pgxscan` library has been replaced with `sqlscan` for scanning `database/sql`.Rows. * Minor cleanups in integration tests.
163 lines
5.4 KiB
Go
163 lines
5.4 KiB
Go
//go:build integration
|
|
|
|
package events_test
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/brianvoe/gofakeit/v6"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
|
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
|
"github.com/zitadel/zitadel/internal/integration"
|
|
"github.com/zitadel/zitadel/pkg/grpc/system"
|
|
)
|
|
|
|
func TestServer_TestInstanceReduces(t *testing.T) {
|
|
instanceRepo := repository.InstanceRepository(pool)
|
|
|
|
t.Run("test instance add reduces", func(t *testing.T) {
|
|
instanceName := gofakeit.Name()
|
|
beforeCreate := time.Now()
|
|
instance, err := SystemClient.CreateInstance(CTX, &system.CreateInstanceRequest{
|
|
InstanceName: instanceName,
|
|
Owner: &system.CreateInstanceRequest_Machine_{
|
|
Machine: &system.CreateInstanceRequest_Machine{
|
|
UserName: "owner",
|
|
Name: "owner",
|
|
PersonalAccessToken: &system.CreateInstanceRequest_PersonalAccessToken{},
|
|
},
|
|
},
|
|
})
|
|
afterCreate := time.Now()
|
|
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() {
|
|
_, err = SystemClient.RemoveInstance(CTX, &system.RemoveInstanceRequest{
|
|
InstanceId: instance.GetInstanceId(),
|
|
})
|
|
if err != nil {
|
|
t.Logf("Failed to delete instance on cleanup: %v", err)
|
|
}
|
|
})
|
|
|
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute)
|
|
assert.EventuallyWithT(t, func(t *assert.CollectT) {
|
|
instance, err := instanceRepo.Get(CTX,
|
|
database.WithCondition(instanceRepo.IDCondition(instance.GetInstanceId())),
|
|
)
|
|
require.NoError(t, err)
|
|
// event instance.added
|
|
assert.Equal(t, instanceName, instance.Name)
|
|
// event instance.default.org.set
|
|
assert.NotNil(t, instance.DefaultOrgID)
|
|
// event instance.iam.project.set
|
|
assert.NotNil(t, instance.IAMProjectID)
|
|
// event instance.iam.console.set
|
|
assert.NotNil(t, instance.ConsoleAppID)
|
|
// event instance.default.language.set
|
|
assert.NotNil(t, instance.DefaultLanguage)
|
|
// event instance.added
|
|
assert.WithinRange(t, instance.CreatedAt, beforeCreate, afterCreate)
|
|
// event instance.added
|
|
assert.WithinRange(t, instance.UpdatedAt, beforeCreate, afterCreate)
|
|
}, retryDuration, tick)
|
|
})
|
|
|
|
t.Run("test instance update reduces", func(t *testing.T) {
|
|
instanceName := gofakeit.Name()
|
|
res, err := SystemClient.CreateInstance(CTX, &system.CreateInstanceRequest{
|
|
InstanceName: instanceName,
|
|
Owner: &system.CreateInstanceRequest_Machine_{
|
|
Machine: &system.CreateInstanceRequest_Machine{
|
|
UserName: "owner",
|
|
Name: "owner",
|
|
PersonalAccessToken: &system.CreateInstanceRequest_PersonalAccessToken{},
|
|
},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
t.Cleanup(func() {
|
|
_, err = SystemClient.RemoveInstance(CTX, &system.RemoveInstanceRequest{
|
|
InstanceId: res.GetInstanceId(),
|
|
})
|
|
if err != nil {
|
|
t.Logf("Failed to delete instance on cleanup: %v", err)
|
|
}
|
|
})
|
|
|
|
// check instance exists
|
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute)
|
|
assert.EventuallyWithT(t, func(t *assert.CollectT) {
|
|
instance, err := instanceRepo.Get(CTX,
|
|
database.WithCondition(instanceRepo.IDCondition(res.GetInstanceId())),
|
|
)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, instanceName, instance.Name)
|
|
}, retryDuration, tick)
|
|
|
|
instanceName += "new"
|
|
beforeUpdate := time.Now()
|
|
_, err = SystemClient.UpdateInstance(CTX, &system.UpdateInstanceRequest{
|
|
InstanceId: res.InstanceId,
|
|
InstanceName: instanceName,
|
|
})
|
|
afterUpdate := time.Now()
|
|
require.NoError(t, err)
|
|
|
|
retryDuration, tick = integration.WaitForAndTickWithMaxDuration(CTX, time.Minute)
|
|
assert.EventuallyWithT(t, func(t *assert.CollectT) {
|
|
instance, err := instanceRepo.Get(CTX,
|
|
database.WithCondition(instanceRepo.IDCondition(res.GetInstanceId())),
|
|
)
|
|
require.NoError(t, err)
|
|
// event instance.changed
|
|
assert.Equal(t, instanceName, instance.Name)
|
|
assert.WithinRange(t, instance.UpdatedAt, beforeUpdate, afterUpdate)
|
|
}, retryDuration, tick)
|
|
})
|
|
|
|
t.Run("test instance delete reduces", func(t *testing.T) {
|
|
instanceName := gofakeit.Name()
|
|
res, err := SystemClient.CreateInstance(CTX, &system.CreateInstanceRequest{
|
|
InstanceName: instanceName,
|
|
Owner: &system.CreateInstanceRequest_Machine_{
|
|
Machine: &system.CreateInstanceRequest_Machine{
|
|
UserName: "owner",
|
|
Name: "owner",
|
|
PersonalAccessToken: &system.CreateInstanceRequest_PersonalAccessToken{},
|
|
},
|
|
},
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
// check instance exists
|
|
retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute)
|
|
assert.EventuallyWithT(t, func(t *assert.CollectT) {
|
|
instance, err := instanceRepo.Get(CTX,
|
|
database.WithCondition(instanceRepo.IDCondition(res.GetInstanceId())),
|
|
)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, instanceName, instance.Name)
|
|
}, retryDuration, tick)
|
|
|
|
_, err = SystemClient.RemoveInstance(CTX, &system.RemoveInstanceRequest{
|
|
InstanceId: res.InstanceId,
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
retryDuration, tick = integration.WaitForAndTickWithMaxDuration(CTX, time.Minute)
|
|
assert.EventuallyWithT(t, func(t *assert.CollectT) {
|
|
instance, err := instanceRepo.Get(CTX,
|
|
database.WithCondition(instanceRepo.IDCondition(res.GetInstanceId())),
|
|
)
|
|
// event instance.removed
|
|
assert.Nil(t, instance)
|
|
require.ErrorIs(t, err, new(database.NoRowFoundError))
|
|
}, retryDuration, tick)
|
|
})
|
|
}
|