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 <[email protected]>
This commit is contained in:
Stefan Benz
2025-08-29 14:56:16 +02:00
committed by GitHub
co-authored by Livio Spring
parent 832e78f9bc
commit 5721b63bcb
21 changed files with 114 additions and 115 deletions
@@ -36,7 +36,7 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: CTX,
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp.GetOrganizationId(), true)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -56,7 +56,7 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp.GetOrganizationId(), true)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -82,7 +82,7 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp.GetOrganizationId(), true)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -131,7 +131,7 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
settingsResp := instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp.GetOrganizationId(), true)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -163,11 +163,11 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp1 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp1 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
settingsResp1 := instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp1.GetOrganizationId(), true)
orgResp2 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp2 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
settingsResp2 := instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp2.GetOrganizationId(), true)
orgResp3 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp3 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
settingsResp3 := instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp3.GetOrganizationId(), true)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -211,11 +211,11 @@ func TestServer_ListOrganizationSettings(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *settings.ListOrganizationSettingsRequest, response *settings.ListOrganizationSettingsResponse) {
orgResp1 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp1 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp1.GetOrganizationId(), false)
orgResp2 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp2 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
settingsResp2 := instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp2.GetOrganizationId(), true)
orgResp3 := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email())
orgResp3 := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
instance.SetOrganizationSettings(iamOwnerCtx, t, orgResp3.GetOrganizationId(), false)
request.Filters[0].Filter = &settings.OrganizationSettingsSearchFilter_InOrganizationIdsFilter{
@@ -236,7 +236,7 @@ func TestServer_SetOrganizationSettings(t *testing.T) {
{
name: "success no changes",
prepare: func(req *settings.SetOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
},
args: args{
@@ -251,7 +251,7 @@ func TestServer_SetOrganizationSettings(t *testing.T) {
{
name: "success user uniqueness",
prepare: func(req *settings.SetOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
},
args: args{
@@ -268,7 +268,7 @@ func TestServer_SetOrganizationSettings(t *testing.T) {
{
name: "success no change",
prepare: func(req *settings.SetOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
},
args: args{
@@ -339,7 +339,7 @@ func TestServer_DeleteOrganizationSettings(t *testing.T) {
{
name: "permission error",
prepare: func(t *testing.T, req *settings.DeleteOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
instance.SetOrganizationSettings(iamOwnerCTX, t, orgResp.GetOrganizationId(), true)
},
@@ -377,7 +377,7 @@ func TestServer_DeleteOrganizationSettings(t *testing.T) {
{
name: "success user uniqueness",
prepare: func(t *testing.T, req *settings.DeleteOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
instance.SetOrganizationSettings(iamOwnerCTX, t, orgResp.GetOrganizationId(), true)
},
@@ -393,7 +393,7 @@ func TestServer_DeleteOrganizationSettings(t *testing.T) {
{
name: "success no existing",
prepare: func(t *testing.T, req *settings.DeleteOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
},
args: args{
@@ -408,7 +408,7 @@ func TestServer_DeleteOrganizationSettings(t *testing.T) {
{
name: "success already deleted",
prepare: func(t *testing.T, req *settings.DeleteOrganizationSettingsRequest) {
orgResp := instance.CreateOrganization(iamOwnerCTX, gofakeit.Company(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCTX, integration.OrganizationName(), gofakeit.Email())
req.OrganizationId = orgResp.GetOrganizationId()
instance.SetOrganizationSettings(iamOwnerCTX, t, orgResp.GetOrganizationId(), true)
instance.DeleteOrganizationSettings(iamOwnerCTX, t, orgResp.GetOrganizationId())