From f343ee0f31d8b9e961c3f40b839402e48512c291 Mon Sep 17 00:00:00 2001 From: Iraq Jaber Date: Mon, 16 Jun 2025 09:56:37 +0200 Subject: [PATCH] fixup! Merge branch 'clean-transactional-propsal' into instance_table --- .../database/events_testing/instance_test.go | 15 +- .../database/repository/repository_test.go | 2 +- .../database/repository/user_test.go.orig | 142 ------------------ .../storage/database/repository/user_test.go_ | 77 ---------- 4 files changed, 14 insertions(+), 222 deletions(-) delete mode 100644 backend/v3/storage/database/repository/user_test.go.orig delete mode 100644 backend/v3/storage/database/repository/user_test.go_ diff --git a/backend/v3/storage/database/events_testing/instance_test.go b/backend/v3/storage/database/events_testing/instance_test.go index 0446130431..dba35b52ea 100644 --- a/backend/v3/storage/database/events_testing/instance_test.go +++ b/backend/v3/storage/database/events_testing/instance_test.go @@ -142,13 +142,24 @@ func TestServer_TestInstanceDeleteReduces(t *testing.T) { }) require.NoError(t, err) + instanceRepo := repository.InstanceRepository(pool) + + // check instance exists + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) + assert.EventuallyWithT(t, func(ttt *assert.CollectT) { + instance, err := instanceRepo.Get(CTX, + instanceRepo.NameCondition(database.TextOperationEqual, instanceName), + ) + require.NoError(ttt, err) + require.Equal(ttt, instanceName, instance.Name) + }, retryDuration, tick) + _, err = SystemClient.RemoveInstance(CTX, &system.RemoveInstanceRequest{ InstanceId: res.InstanceId, }) require.NoError(t, err) - instanceRepo := repository.InstanceRepository(pool) - retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) + retryDuration, tick = integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) assert.EventuallyWithT(t, func(ttt *assert.CollectT) { instance, err := instanceRepo.Get(CTX, instanceRepo.NameCondition(database.TextOperationEqual, instanceName), diff --git a/backend/v3/storage/database/repository/repository_test.go b/backend/v3/storage/database/repository/repository_test.go index f60d6a60f7..fc7c823e7b 100644 --- a/backend/v3/storage/database/repository/repository_test.go +++ b/backend/v3/storage/database/repository/repository_test.go @@ -23,7 +23,7 @@ func runTests(m *testing.M) int { ctx := context.Background() pool, stop, err = newEmbeededDB(ctx) if err != nil { - log.Print(err) + log.Printf("error with embedded postgres database: %v", err) return 1 } defer stop() diff --git a/backend/v3/storage/database/repository/user_test.go.orig b/backend/v3/storage/database/repository/user_test.go.orig deleted file mode 100644 index 6f7ecd5592..0000000000 --- a/backend/v3/storage/database/repository/user_test.go.orig +++ /dev/null @@ -1,142 +0,0 @@ -package repository_test - -// import ( -// "context" -// "testing" - -// "github.com/stretchr/testify/assert" -<<<<<<< HEAD -// "go.uber.org/mock/gomock" - -// "github.com/zitadel/zitadel/backend/v3/storage/database" -// "github.com/zitadel/zitadel/backend/v3/storage/database/dbmock" -// "github.com/zitadel/zitadel/backend/v3/storage/database/repository" -// ) - -// func TestQueryUser(t *testing.T) { -// t.Skip("tests are meant as examples and are not real tests") -// t.Run("User filters", func(t *testing.T) { -// client := dbmock.NewMockClient(gomock.NewController(t)) - -// user := repository.UserRepository(client) -// u, err := user.Get(context.Background(), -// database.WithCondition( -// database.And( -// database.Or( -// user.IDCondition("test"), -// user.IDCondition("2"), -// ), -// user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// ), -// ), -// database.WithOrderBy(user.CreatedAtColumn()), -// ) - -// assert.NoError(t, err) -// assert.NotNil(t, u) -// }) - -// t.Run("machine and human filters", func(t *testing.T) { -// client := dbmock.NewMockClient(gomock.NewController(t)) - -// user := repository.UserRepository(client) -// machine := user.Machine() -// human := user.Human() -// email, err := human.GetEmail(context.Background(), database.And( -// user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// database.Or( -// machine.DescriptionCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// human.EmailVerifiedCondition(true), -// database.IsNotNull(machine.DescriptionColumn()), -// ), -// )) - -// assert.NoError(t, err) -// assert.NotNil(t, email) -// }) -// } - -// type dbInstruction string - -// func TestArg(t *testing.T) { -// var bla any = "asdf" -// instr, ok := bla.(dbInstruction) -// assert.False(t, ok) -// assert.Empty(t, instr) -// bla = dbInstruction("asdf") -// instr, ok = bla.(dbInstruction) -// assert.True(t, ok) -// assert.Equal(t, instr, dbInstruction("asdf")) -// } - -======= -// "github.com/zitadel/zitadel/backend/v3/storage/database" -// "github.com/zitadel/zitadel/backend/v3/storage/database/dbmock" -// "github.com/zitadel/zitadel/backend/v3/storage/database/repository" -// "go.uber.org/mock/gomock" -// ) - -// func TestQueryUser(t *testing.T) { -// t.Skip("tests are meant as examples and are not real tests") -// t.Run("User filters", func(t *testing.T) { -// client := dbmock.NewMockClient(gomock.NewController(t)) - -// user := repository.UserRepository(client) -// u, err := user.Get(context.Background(), -// database.WithCondition( -// database.And( -// database.Or( -// user.IDCondition("test"), -// user.IDCondition("2"), -// ), -// user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// ), -// ), -// database.WithOrderBy(user.CreatedAtColumn()), -// ) - -// assert.NoError(t, err) -// assert.NotNil(t, u) -// }) - -// t.Run("machine and human filters", func(t *testing.T) { -// client := dbmock.NewMockClient(gomock.NewController(t)) - -// user := repository.UserRepository(client) -// machine := user.Machine() -// human := user.Human() -// email, err := human.GetEmail(context.Background(), database.And( -// user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// database.Or( -// machine.DescriptionCondition(database.TextOperationStartsWithIgnoreCase, "test"), -// human.EmailVerifiedCondition(true), -// database.IsNotNull(machine.DescriptionColumn()), -// ), -// )) - -// assert.NoError(t, err) -// assert.NotNil(t, email) -// }) -// } - -// type dbInstruction string - -// func TestArg(t *testing.T) { -// var bla any = "asdf" -// instr, ok := bla.(dbInstruction) -// assert.False(t, ok) -// assert.Empty(t, instr) -// bla = dbInstruction("asdf") -// instr, ok = bla.(dbInstruction) -// assert.True(t, ok) -// assert.Equal(t, instr, dbInstruction("asdf")) -// } - ->>>>>>> clean-transactional-propsal -// func TestWriteUser(t *testing.T) { -// t.Skip("tests are meant as examples and are not real tests") -// t.Run("update user", func(t *testing.T) { -// user := repository.UserRepository(nil) -// user.Human().Update(context.Background(), user.IDCondition("test"), user.SetUsername("test")) -// }) -// } diff --git a/backend/v3/storage/database/repository/user_test.go_ b/backend/v3/storage/database/repository/user_test.go_ deleted file mode 100644 index b25cdfd220..0000000000 --- a/backend/v3/storage/database/repository/user_test.go_ +++ /dev/null @@ -1,77 +0,0 @@ -package repository_test - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "go.uber.org/mock/gomock" - - "github.com/zitadel/zitadel/backend/v3/storage/database" - "github.com/zitadel/zitadel/backend/v3/storage/database/dbmock" - "github.com/zitadel/zitadel/backend/v3/storage/database/repository" -) - -func TestQueryUser(t *testing.T) { - t.Skip("tests are meant as examples and are not real tests") - t.Run("User filters", func(t *testing.T) { - client := dbmock.NewMockClient(gomock.NewController(t)) - - user := repository.UserRepository(client) - u, err := user.Get(context.Background(), - database.WithCondition( - database.And( - database.Or( - user.IDCondition("test"), - user.IDCondition("2"), - ), - user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), - ), - ), - database.WithOrderBy(user.CreatedAtColumn()), - ) - - assert.NoError(t, err) - assert.NotNil(t, u) - }) - - t.Run("machine and human filters", func(t *testing.T) { - client := dbmock.NewMockClient(gomock.NewController(t)) - - user := repository.UserRepository(client) - machine := user.Machine() - human := user.Human() - email, err := human.GetEmail(context.Background(), database.And( - user.UsernameCondition(database.TextOperationStartsWithIgnoreCase, "test"), - database.Or( - machine.DescriptionCondition(database.TextOperationStartsWithIgnoreCase, "test"), - human.EmailVerifiedCondition(true), - database.IsNotNull(machine.DescriptionColumn()), - ), - )) - - assert.NoError(t, err) - assert.NotNil(t, email) - }) -} - -type dbInstruction string - -func TestArg(t *testing.T) { - var bla any = "asdf" - instr, ok := bla.(dbInstruction) - assert.False(t, ok) - assert.Empty(t, instr) - bla = dbInstruction("asdf") - instr, ok = bla.(dbInstruction) - assert.True(t, ok) - assert.Equal(t, instr, dbInstruction("asdf")) -} - -func TestWriteUser(t *testing.T) { - t.Skip("tests are meant as examples and are not real tests") - t.Run("update user", func(t *testing.T) { - user := repository.UserRepository(nil) - user.Human().Update(context.Background(), user.IDCondition("test"), user.SetUsername("test")) - }) -}