TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-06 17:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use integration package for name generation (#10591)

Browse Source 
# Which Problems Are Solved

Integration test failed sometimes with `organization already
exists`-errors.

# How the Problems Are Solved

Use a consistent function to generate name used for organization
creation.

# Additional Changes

Correct a eventual consistent test for username around organization
domain changes with eventual consistent loop.

# Additional Context

None

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>

(cherry picked from commit 5721b63bcb)
This commit is contained in:
Stefan Benz
2025-08-29 14:56:16 +02:00
committed by Livio Spring
parent 678f9ad448
commit d0d8e904c4
19 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go
View File

@@ -256,7 +256,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.CreateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
request.UserId = userResp.GetId()
@@ -282,7 +282,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.CreateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
request.UserId = userResp.GetId()
@@ -862,7 +862,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
request.UserId = userResp.GetId()
@@ -886,7 +886,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
@@ -914,7 +914,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
@@ -942,7 +942,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
request.UserId = userResp.GetId()
@@ -1480,7 +1480,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
creationDate := time.Now().UTC()
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
request.UserId = userResp.GetId()
@@ -1504,7 +1504,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
creationDate := time.Now().UTC()
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
@@ -1529,7 +1529,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
creationDate := time.Now().UTC()
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
instance.DeleteProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())

2
internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go
View File

@@ -21,7 +21,7 @@ func TestServer_ListAdministrators(t *testing.T) {
projectName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), projectName, false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
userProjectResp := instance.CreateMachineUser(iamOwnerCtx)