From d0d8e904c4f8999f1da0ef59d6fb0b4bcf09b9ee Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:56:16 +0200 Subject: [PATCH] chore: use integration package for name generation (#10591) # 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 (cherry picked from commit 5721b63bcb5d923be22767d2e79567305be9e982) --- .../app/v2beta/integration_test/app_test.go | 2 +- .../integration_test/administrator_test.go | 18 ++++----- .../v2beta/integration_test/query_test.go | 2 +- .../oidc/v2beta/integration_test/oidc_test.go | 22 +++++----- .../org/v2/integration_test/query_test.go | 7 ++-- .../org/v2beta/integration_test/org_test.go | 40 ++++++++++--------- .../v2beta/integration_test/query_test.go | 22 +++++----- .../v3alpha/integration_test/email_test.go | 6 +-- .../v3alpha/integration_test/phone_test.go | 6 +-- .../v3alpha/integration_test/user_test.go | 14 +++---- .../grpc/user/v2/integration_test/key_test.go | 3 +- .../user/v2/integration_test/metadata_test.go | 14 +++---- .../user/v2/integration_test/user_test.go | 6 +-- .../v2beta/integration_test/query_test.go | 15 ++++--- .../user/v2beta/integration_test/user_test.go | 6 +-- .../api/oidc/integration_test/oidc_test.go | 2 +- .../oidc/integration_test/userinfo_test.go | 2 +- .../api/scim/integration_test/bulk_test.go | 2 +- .../api/scim/integration_test/scim_test.go | 6 +-- 19 files changed, 97 insertions(+), 98 deletions(-) diff --git a/internal/api/grpc/app/v2beta/integration_test/app_test.go b/internal/api/grpc/app/v2beta/integration_test/app_test.go index c78b8613c41..080029c37d5 100644 --- a/internal/api/grpc/app/v2beta/integration_test/app_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/app_test.go @@ -422,7 +422,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { } func TestUpdateApplication(t *testing.T) { - orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, integration.OrganizationName(), gofakeit.Email()) pNotInCtx := instance.CreateProject(IAMOwnerCtx, t, orgNotInCtx.GetOrganizationId(), gofakeit.AppName(), false, false) p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) diff --git a/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go b/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go index 24ab0114f7d..5dc57901634 100644 --- a/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go +++ b/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go @@ -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()) diff --git a/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go b/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go index a7ca752315c..a7a5f10efeb 100644 --- a/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go @@ -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) diff --git a/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go b/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go index 303cdd3ad5e..4e4023b8e57 100644 --- a/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go +++ b/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go @@ -388,7 +388,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { projectID, clientID := createOIDCApplication(ctx, t, true, true) projectID2, _ := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID2, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) @@ -403,7 +403,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) @@ -424,7 +424,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) @@ -445,7 +445,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -469,7 +469,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) @@ -529,7 +529,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) @@ -548,7 +548,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -561,7 +561,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) @@ -581,7 +581,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -610,7 +610,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -623,7 +623,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) diff --git a/internal/api/grpc/org/v2/integration_test/query_test.go b/internal/api/grpc/org/v2/integration_test/query_test.go index b2f27dbe62b..680bb643f7e 100644 --- a/internal/api/grpc/org/v2/integration_test/query_test.go +++ b/internal/api/grpc/org/v2/integration_test/query_test.go @@ -106,7 +106,7 @@ func TestServer_ListOrganizations(t *testing.T) { func(ctx context.Context, request *org.ListOrganizationsRequest) ([]orgAttr, error) { count := 3 orgs := make([]orgAttr, count) - prefix := fmt.Sprintf("ListOrgs-%s", gofakeit.AppName()) + prefix := integration.OrganizationName() for i := 0; i < count; i++ { name := prefix + strconv.Itoa(i) orgs[i] = createOrganization(ctx, name) @@ -275,8 +275,7 @@ func TestServer_ListOrganizations(t *testing.T) { &org.ListOrganizationsRequest{}, func(ctx context.Context, request *org.ListOrganizationsRequest) ([]orgAttr, error) { orgs := make([]orgAttr, 1) - name := fmt.Sprintf("ListOrgs-%s", gofakeit.AppName()) - orgs[0] = createOrganization(ctx, name) + orgs[0] = createOrganization(ctx, integration.OrganizationName()) domain := gofakeit.DomainName() _, err := Instance.Client.Mgmt.AddOrgDomain(integration.SetOrgID(ctx, orgs[0].ID), &management.AddOrgDomainRequest{ Domain: domain, @@ -311,7 +310,7 @@ func TestServer_ListOrganizations(t *testing.T) { Queries: []*org.SearchQuery{}, }, func(ctx context.Context, request *org.ListOrganizationsRequest) ([]orgAttr, error) { - name := gofakeit.Name() + name := integration.OrganizationName() orgResp := createOrganization(ctx, name) deactivateOrgResp := Instance.DeactivateOrganization(ctx, orgResp.ID) request.Queries = []*org.SearchQuery{ diff --git a/internal/api/grpc/org/v2beta/integration_test/org_test.go b/internal/api/grpc/org/v2beta/integration_test/org_test.go index 00941945f79..1e3f8aeff1d 100644 --- a/internal/api/grpc/org/v2beta/integration_test/org_test.go +++ b/internal/api/grpc/org/v2beta/integration_test/org_test.go @@ -1132,29 +1132,31 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { }) require.NoError(t, err) - // check both users: the first one must be untouched, the second one must be updated - users, err := Instance.Client.UserV2.ListUsers(CTX, &user.ListUsersRequest{ - Queries: []*user.SearchQuery{ - { - Query: &user.SearchQuery_InUserIdsQuery{ - InUserIdsQuery: &user.InUserIDQuery{UserIds: []string{ownUser.GetUserId(), otherUser.GetUserId()}}, + require.EventuallyWithT(t, func(collect *assert.CollectT) { + // check both users: the first one must be untouched, the second one must be updated + users, err := Instance.Client.UserV2.ListUsers(CTX, &user.ListUsersRequest{ + Queries: []*user.SearchQuery{ + { + Query: &user.SearchQuery_InUserIdsQuery{ + InUserIdsQuery: &user.InUserIDQuery{UserIds: []string{ownUser.GetUserId(), otherUser.GetUserId()}}, + }, }, }, - }, - }) - require.NoError(t, err) - require.Len(t, users.GetResult(), 2) + }) + require.NoError(t, err) + require.Len(t, users.GetResult(), 2) - for _, u := range users.GetResult() { - if u.GetUserId() == ownUser.GetUserId() { - assert.Equal(t, username, u.GetPreferredLoginName()) - continue + for _, u := range users.GetResult() { + if u.GetUserId() == ownUser.GetUserId() { + assert.Equal(collect, username, u.GetPreferredLoginName()) + continue + } + if u.GetUserId() == otherUser.GetUserId() { + assert.NotEqual(collect, otherUsername, u.GetPreferredLoginName()) + assert.Contains(collect, u.GetPreferredLoginName(), "@temporary.") + } } - if u.GetUserId() == otherUser.GetUserId() { - assert.NotEqual(t, otherUsername, u.GetPreferredLoginName()) - assert.Contains(t, u.GetPreferredLoginName(), "@temporary.") - } - } + }, 5*time.Second, time.Second, "user not updated in time") } func TestServer_ListOrganizationDomains(t *testing.T) { diff --git a/internal/api/grpc/project/v2beta/integration_test/query_test.go b/internal/api/grpc/project/v2beta/integration_test/query_test.go index de69fb6de30..e579fcc8a3a 100644 --- a/internal/api/grpc/project/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/query_test.go @@ -509,8 +509,8 @@ func TestServer_ListProjects(t *testing.T) { dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { orgID := instance.DefaultOrg.GetId() - orgName := gofakeit.AppName() - projectName := gofakeit.AppName() + orgName := integration.OrganizationName() + projectName := integration.ProjectName() orgResp := instance.CreateOrganization(iamOwnerCtx, orgName, gofakeit.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), projectName, true, true) projectGrantResp := instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID) @@ -633,7 +633,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) resp := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -851,7 +851,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) resp1 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false) resp2 := createProject(iamOwnerCtx, instancePermissionV2, t, orgID, true, false) resp3 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, true) @@ -884,8 +884,8 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { orgID := instancePermissionV2.DefaultOrg.GetId() - orgName := gofakeit.AppName() - projectName := gofakeit.AppName() + orgName := integration.OrganizationName() + projectName := integration.ProjectName() orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, orgName, gofakeit.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), projectName, true, true) projectGrantResp := instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID) @@ -1366,7 +1366,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1390,7 +1390,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1439,7 +1439,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { name := gofakeit.AppName() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -1502,7 +1502,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { name2 := gofakeit.AppName() name3 := gofakeit.AppName() orgID := instancePermissionV2.DefaultOrg.GetId() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) project1Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, name1, false, false) project2Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false) project3Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false) @@ -1800,7 +1800,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go index 44c5bd3185d..f276b8cce1c 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go @@ -33,7 +33,7 @@ func TestServer_SetContactEmail(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -378,7 +378,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -567,7 +567,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go index da72dd23cef..578a3ed07e4 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go @@ -32,7 +32,7 @@ func TestServer_SetContactPhone(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -305,7 +305,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -496,7 +496,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go index 94076be0158..1755a4a7c11 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go @@ -49,7 +49,7 @@ func TestServer_CreateUser(t *testing.T) { } }`) permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -257,7 +257,7 @@ func TestServer_PatchUser(t *testing.T) { } }`) permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) type res struct { want *resource_object.Details @@ -662,7 +662,7 @@ func TestServer_DeleteUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -878,7 +878,7 @@ func TestServer_LockUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -1079,7 +1079,7 @@ func TestServer_UnlockUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -1261,7 +1261,7 @@ func TestServer_DeactivateUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -1462,7 +1462,7 @@ func TestServer_ActivateUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, gofakeit.Name(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string diff --git a/internal/api/grpc/user/v2/integration_test/key_test.go b/internal/api/grpc/user/v2/integration_test/key_test.go index 0ff7087a162..6f44200eca7 100644 --- a/internal/api/grpc/user/v2/integration_test/key_test.go +++ b/internal/api/grpc/user/v2/integration_test/key_test.go @@ -4,7 +4,6 @@ package user_test import ( "context" - "fmt" "slices" "testing" "time" @@ -377,7 +376,7 @@ func TestServer_ListKeys(t *testing.T) { want *user.ListKeysResponse } OrgCTX := CTX - otherOrg := Instance.CreateOrganization(SystemCTX, fmt.Sprintf("ListKeys-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(SystemCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ diff --git a/internal/api/grpc/user/v2/integration_test/metadata_test.go b/internal/api/grpc/user/v2/integration_test/metadata_test.go index c1e3bced0af..07fa5a22264 100644 --- a/internal/api/grpc/user/v2/integration_test/metadata_test.go +++ b/internal/api/grpc/user/v2/integration_test/metadata_test.go @@ -19,7 +19,7 @@ import ( ) func TestServer_SetUserMetadata(t *testing.T) { - iamOwnerCTX := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCTX := Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) tests := []struct { name string @@ -31,7 +31,7 @@ func TestServer_SetUserMetadata(t *testing.T) { }{ { name: "missing permission", - ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeNoPermission), + ctx: Instance.WithAuthorizationToken(context.Background(), integration.UserTypeNoPermission), dep: func(req *user.SetUserMetadataRequest) { req.UserId = Instance.CreateUserTypeHuman(CTX, gofakeit.Email()).GetId() }, @@ -77,7 +77,7 @@ func TestServer_SetUserMetadata(t *testing.T) { }, { name: "update user metadata", - ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner), + ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner), dep: func(req *user.SetUserMetadataRequest) { req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() Instance.SetUserMetadata(iamOwnerCTX, req.UserId, "key1", "value1") @@ -89,7 +89,7 @@ func TestServer_SetUserMetadata(t *testing.T) { }, { name: "update user metadata with same value", - ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner), + ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner), dep: func(req *user.SetUserMetadataRequest) { req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() Instance.SetUserMetadata(iamOwnerCTX, req.UserId, "key1", "value1") @@ -132,7 +132,7 @@ func assertSetUserMetadataResponse(t *testing.T, creationDate, changeDate time.T } func TestServer_ListUserMetadata(t *testing.T) { - iamOwnerCTX := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCTX := Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) type args struct { ctx context.Context @@ -149,7 +149,7 @@ func TestServer_ListUserMetadata(t *testing.T) { { name: "missing permission", args: args{ - ctx: Instance.WithAuthorization(context.Background(), integration.UserTypeNoPermission), + ctx: Instance.WithAuthorizationToken(context.Background(), integration.UserTypeNoPermission), dep: func(ctx context.Context, request *user.ListUserMetadataRequest, response *user.ListUserMetadataResponse) { userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() request.UserId = userID @@ -281,7 +281,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes } func TestServer_DeleteUserMetadata(t *testing.T) { - iamOwnerCTX := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCTX := Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) tests := []struct { name string diff --git a/internal/api/grpc/user/v2/integration_test/user_test.go b/internal/api/grpc/user/v2/integration_test/user_test.go index 80ff8e43941..68ab8ff7cdf 100644 --- a/internal/api/grpc/user/v2/integration_test/user_test.go +++ b/internal/api/grpc/user/v2/integration_test/user_test.go @@ -1884,7 +1884,7 @@ func TestServer_DeleteUser(t *testing.T) { func TestServer_StartIdentityProviderIntent(t *testing.T) { idpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) orgIdpResp := Instance.AddOrgGenericOAuthProvider(CTX, Instance.DefaultOrg.Id) - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("NotDefaultOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) notDefaultOrgIdpResp := Instance.AddOrgGenericOAuthProvider(IamCTX, orgResp.OrganizationId) samlIdpID := Instance.AddSAMLProvider(IamCTX) samlRedirectIdpID := Instance.AddSAMLRedirectProvider(IamCTX, "") @@ -4631,7 +4631,7 @@ func TestServer_CreateUser_And_Compare(t *testing.T) { func TestServer_CreateUser_Permission(t *testing.T) { newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) type args struct { ctx context.Context req *user.CreateUserRequest @@ -5302,7 +5302,7 @@ func TestServer_UpdateUser_And_Compare(t *testing.T) { func TestServer_UpdateUser_Permission(t *testing.T) { newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newHumanUserID := newOrg.CreatedAdmins[0].GetUserId() machineUserResp, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: newOrg.OrganizationId, diff --git a/internal/api/grpc/user/v2beta/integration_test/query_test.go b/internal/api/grpc/user/v2beta/integration_test/query_test.go index 73bff3fd0da..e1b2d27f077 100644 --- a/internal/api/grpc/user/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/query_test.go @@ -5,7 +5,6 @@ package user_test import ( "context" "errors" - "fmt" "slices" "testing" "time" @@ -82,7 +81,7 @@ func setPermissionCheckV2Flag(t *testing.T, setFlag bool) { } func TestServer_GetUserByID(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context req *user.GetUserByIDRequest @@ -246,7 +245,7 @@ func TestServer_GetUserByID(t *testing.T) { func TestServer_GetUserByID_Permission(t *testing.T) { timeNow := time.Now().UTC() newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context @@ -438,7 +437,7 @@ func TestServer_ListUsers(t *testing.T) { require.NoError(t, err) }() - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListUsersOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context req *user.ListUsersRequest @@ -979,7 +978,7 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgResp := Instance.CreateOrganization(ctx, fmt.Sprintf("ListUsersResourceowner-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) infos := createUsers(ctx, orgResp.OrganizationId, 3, false) request.Queries = []*user.SearchQuery{} @@ -1065,7 +1064,7 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests.OrganizationId)) @@ -1111,8 +1110,8 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) - orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) // info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} diff --git a/internal/api/grpc/user/v2beta/integration_test/user_test.go b/internal/api/grpc/user/v2beta/integration_test/user_test.go index dd75986a3fa..6bae84c24b1 100644 --- a/internal/api/grpc/user/v2beta/integration_test/user_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/user_test.go @@ -641,7 +641,7 @@ func TestServer_AddHumanUser(t *testing.T) { } func TestServer_AddHumanUser_Permission(t *testing.T) { - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddHuman-%s", gofakeit.AppName()), gofakeit.Email()) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context req *user.AddHumanUserRequest @@ -1194,7 +1194,7 @@ func TestServer_UpdateHumanUser(t *testing.T) { } func TestServer_UpdateHumanUser_Permission(t *testing.T) { - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("UpdateHuman-%s", gofakeit.AppName()), gofakeit.Email()) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context @@ -1885,7 +1885,7 @@ func TestServer_AddIDPLink(t *testing.T) { func TestServer_StartIdentityProviderIntent(t *testing.T) { idpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) orgIdpID := Instance.AddOrgGenericOAuthProvider(CTX, Instance.DefaultOrg.Id) - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("NotDefaultOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) notDefaultOrgIdpID := Instance.AddOrgGenericOAuthProvider(IamCTX, orgResp.OrganizationId) samlIdpID := Instance.AddSAMLProvider(IamCTX) samlRedirectIdpID := Instance.AddSAMLRedirectProvider(IamCTX, "") diff --git a/internal/api/oidc/integration_test/oidc_test.go b/internal/api/oidc/integration_test/oidc_test.go index d3d80b0557f..1f857b9466d 100644 --- a/internal/api/oidc/integration_test/oidc_test.go +++ b/internal/api/oidc/integration_test/oidc_test.go @@ -123,7 +123,7 @@ func Test_ZITADEL_API_missing_authentication(t *testing.T) { func Test_ZITADEL_API_missing_mfa_policy(t *testing.T) { clientID, _ := createClient(t, Instance) - org := Instance.CreateOrganization(CTXIAM, fmt.Sprintf("ZITADEL_API_MISSING_MFA_%s", gofakeit.AppName()), gofakeit.Email()) + org := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), gofakeit.Email()) userID := org.CreatedAdmins[0].GetUserId() Instance.SetUserPassword(CTXIAM, userID, integration.UserPassword, false) authRequestID := createAuthRequest(t, Instance, clientID, redirectURI, oidc.ScopeOpenID, zitadelAudienceScope) diff --git a/internal/api/oidc/integration_test/userinfo_test.go b/internal/api/oidc/integration_test/userinfo_test.go index 2a31dd964b6..24b51015a78 100644 --- a/internal/api/oidc/integration_test/userinfo_test.go +++ b/internal/api/oidc/integration_test/userinfo_test.go @@ -296,7 +296,7 @@ func addProjectRolesGrants(t *testing.T, userID, projectID string, roles ...stri // addProjectOrgGrant adds a new organization which will be granted on the projectID with the specified roles. // The userID will be granted in the new organization to the project with the same roles. func addProjectOrgGrant(t *testing.T, userID, projectID string, roles ...string) (grantedOrgID string) { - grantedOrg := Instance.CreateOrganization(CTXIAM, fmt.Sprintf("ZITADEL_GRANTED_%s", gofakeit.AppName()), gofakeit.Email()) + grantedOrg := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), gofakeit.Email()) projectGrant, err := Instance.Client.Mgmt.AddProjectGrant(CTX, &management.AddProjectGrantRequest{ ProjectId: projectID, GrantedOrgId: grantedOrg.GetOrganizationId(), diff --git a/internal/api/scim/integration_test/bulk_test.go b/internal/api/scim/integration_test/bulk_test.go index c2f430c1b7c..7b959a395bc 100644 --- a/internal/api/scim/integration_test/bulk_test.go +++ b/internal/api/scim/integration_test/bulk_test.go @@ -50,7 +50,7 @@ func init() { func TestBulk(t *testing.T) { iamOwnerCtx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, gofakeit.Name(), gofakeit.Email()) + secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) createdSecondaryOrgUser := createHumanUser(t, iamOwnerCtx, secondaryOrg.OrganizationId, 0) bulkMinimalUpdateSecondaryOrgJson := test.Must(json.Marshal(buildMinimalUpdateRequest(createdSecondaryOrgUser.UserId))) diff --git a/internal/api/scim/integration_test/scim_test.go b/internal/api/scim/integration_test/scim_test.go index 7b16671f1f2..e32a720ec4a 100644 --- a/internal/api/scim/integration_test/scim_test.go +++ b/internal/api/scim/integration_test/scim_test.go @@ -32,10 +32,10 @@ func TestMain(m *testing.M) { Instance = integration.NewInstance(ctx) - CTX = Instance.WithAuthorization(ctx, integration.UserTypeOrgOwner) + CTX = Instance.WithAuthorizationToken(ctx, integration.UserTypeOrgOwner) - iamOwnerCtx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - SecondaryOrganization = Instance.CreateOrganization(iamOwnerCtx, gofakeit.Name(), gofakeit.Email()) + iamOwnerCtx := Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + SecondaryOrganization = Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) return m.Run() }())