chore(tests): use a coverage server binary (#8407)

# Which Problems Are Solved

Use a single server instance for API integration tests. This optimizes
the time taken for the integration test pipeline,
because it allows running tests on multiple packages in parallel. Also,
it saves time by not start and stopping a zitadel server for every
package.

# How the Problems Are Solved

- Build a binary with `go build -race -cover ....`
- Integration tests only construct clients. The server remains running
in the background.
- The integration package and tested packages now fully utilize the API.
No more direct database access trough `query` and `command` packages.
- Use Makefile recipes to setup, start and stop the server in the
background.
- The binary has the race detector enabled
- Init and setup jobs are configured to halt immediately on race
condition
- Because the server runs in the background, races are only logged. When
the server is stopped and race logs exist, the Makefile recipe will
throw an error and print the logs.
- Makefile recipes include logic to print logs and convert coverage
reports after the server is stopped.
- Some tests need a downstream HTTP server to make requests, like quota
and milestones. A new `integration/sink` package creates an HTTP server
and uses websockets to forward HTTP request back to the test packages.
The package API uses Go channels for abstraction and easy usage.

# Additional Changes

- Integration test files already used the `//go:build integration`
directive. In order to properly split integration from unit tests,
integration test files need to be in a `integration_test` subdirectory
of their package.
- `UseIsolatedInstance` used to overwrite the `Tester.Client` for each
instance. Now a `Instance` object is returned with a gRPC client that is
connected to the isolated instance's hostname.
- The `Tester` type is now `Instance`. The object is created for the
first instance, used by default in any test. Isolated instances are also
`Instance` objects and therefore benefit from the same methods and
values. The first instance and any other us capable of creating an
isolated instance over the system API.
- All test packages run in an Isolated instance by calling
`NewInstance()`
- Individual tests that use an isolated instance use `t.Parallel()`

# Additional Context

- Closes #6684
- https://go.dev/doc/articles/race_detector
- https://go.dev/doc/build-cover

---------

Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>

internal/api/grpc/admin/integration_test/iam_member_test.go

@@ -5,6 +5,7 @@ package admin_test
 import (
 	"context"
 	"testing"
+	"time"
 
 	"github.com/brianvoe/gofakeit/v6"
 	"github.com/stretchr/testify/assert"
@@ -33,7 +34,7 @@ func TestServer_ListIAMMemberRoles(t *testing.T) {
 }
 
 func TestServer_ListIAMMembers(t *testing.T) {
-	user := Tester.CreateHumanUserVerified(AdminCTX, Tester.Organisation.ID, gofakeit.Email())
+	user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email())
 	_, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{
 		UserId: user.GetUserId(),
 		Roles:  iamRoles,
@@ -52,7 +53,7 @@ func TestServer_ListIAMMembers(t *testing.T) {
 		{
 			name: "permission error",
 			args: args{
-				ctx: Tester.WithAuthorization(CTX, integration.OrgOwner),
+				ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 				req: &admin_pb.ListIAMMembersRequest{
 					Query: &object.ListQuery{},
 					Queries: []*member.SearchQuery{{
@@ -91,26 +92,29 @@ func TestServer_ListIAMMembers(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Client.ListIAMMembers(tt.args.ctx, tt.args.req)
-			if tt.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			wantResult := tt.want.GetResult()
-			gotResult := got.GetResult()
+			assert.EventuallyWithT(t, func(ct *assert.CollectT) {
+				got, err := Client.ListIAMMembers(tt.args.ctx, tt.args.req)
+				if tt.wantErr {
+					assert.Error(ct, err)
+					return
+				}
+				require.NoError(ct, err)
+				wantResult := tt.want.GetResult()
+				gotResult := got.GetResult()
 
-			require.Len(t, gotResult, len(wantResult))
-			for i, want := range wantResult {
-				assert.Equal(t, want.GetUserId(), gotResult[i].GetUserId())
-				assert.ElementsMatch(t, want.GetRoles(), gotResult[i].GetRoles())
-			}
+				if assert.Len(ct, gotResult, len(wantResult)) {
+					for i, want := range wantResult {
+						assert.Equal(ct, want.GetUserId(), gotResult[i].GetUserId())
+						assert.ElementsMatch(ct, want.GetRoles(), gotResult[i].GetRoles())
+					}
+				}
+			}, time.Minute, time.Second)
 		})
 	}
 }
 
 func TestServer_AddIAMMember(t *testing.T) {
-	user := Tester.CreateHumanUserVerified(AdminCTX, Tester.Organisation.ID, gofakeit.Email())
+	user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email())
 	type args struct {
 		ctx context.Context
 		req *admin_pb.AddIAMMemberRequest
@@ -124,7 +128,7 @@ func TestServer_AddIAMMember(t *testing.T) {
 		{
 			name: "permission error",
 			args: args{
-				ctx: Tester.WithAuthorization(CTX, integration.OrgOwner),
+				ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 				req: &admin_pb.AddIAMMemberRequest{
 					UserId: user.GetUserId(),
 					Roles:  iamRoles,
@@ -143,7 +147,7 @@ func TestServer_AddIAMMember(t *testing.T) {
 			},
 			want: &admin_pb.AddIAMMemberResponse{
 				Details: &object.ObjectDetails{
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: Instance.ID(),
 				},
 			},
 		},
@@ -184,7 +188,7 @@ func TestServer_AddIAMMember(t *testing.T) {
 }
 
 func TestServer_UpdateIAMMember(t *testing.T) {
-	user := Tester.CreateHumanUserVerified(AdminCTX, Tester.Organisation.ID, gofakeit.Email())
+	user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email())
 	_, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{
 		UserId: user.GetUserId(),
 		Roles:  []string{"IAM_OWNER"},
@@ -204,7 +208,7 @@ func TestServer_UpdateIAMMember(t *testing.T) {
 		{
 			name: "permission error",
 			args: args{
-				ctx: Tester.WithAuthorization(CTX, integration.OrgOwner),
+				ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 				req: &admin_pb.UpdateIAMMemberRequest{
 					UserId: user.GetUserId(),
 					Roles:  iamRoles,
@@ -223,7 +227,7 @@ func TestServer_UpdateIAMMember(t *testing.T) {
 			},
 			want: &admin_pb.UpdateIAMMemberResponse{
 				Details: &object.ObjectDetails{
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: Instance.ID(),
 					ChangeDate:    timestamppb.Now(),
 				},
 			},
@@ -265,7 +269,7 @@ func TestServer_UpdateIAMMember(t *testing.T) {
 }
 
 func TestServer_RemoveIAMMember(t *testing.T) {
-	user := Tester.CreateHumanUserVerified(AdminCTX, Tester.Organisation.ID, gofakeit.Email())
+	user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email())
 	_, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{
 		UserId: user.GetUserId(),
 		Roles:  []string{"IAM_OWNER"},
@@ -285,7 +289,7 @@ func TestServer_RemoveIAMMember(t *testing.T) {
 		{
 			name: "permission error",
 			args: args{
-				ctx: Tester.WithAuthorization(CTX, integration.OrgOwner),
+				ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 				req: &admin_pb.RemoveIAMMemberRequest{
 					UserId: user.GetUserId(),
 				},
@@ -302,7 +306,7 @@ func TestServer_RemoveIAMMember(t *testing.T) {
 			},
 			want: &admin_pb.RemoveIAMMemberResponse{
 				Details: &object.ObjectDetails{
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: Instance.ID(),
 					ChangeDate:    timestamppb.Now(),
 				},
 			},

internal/api/grpc/admin/integration_test/iam_settings_test.go

@@ -17,21 +17,17 @@ import (
 )
 
 func TestServer_GetSecurityPolicy(t *testing.T) {
-	_, err := Client.SetSecurityPolicy(AdminCTX, &admin_pb.SetSecurityPolicyRequest{
+	t.Parallel()
+
+	instance := integration.NewInstance(CTX)
+	adminCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
+
+	_, err := instance.Client.Admin.SetSecurityPolicy(adminCtx, &admin_pb.SetSecurityPolicyRequest{
 		EnableIframeEmbedding: true,
 		AllowedOrigins:        []string{"foo.com", "bar.com"},
 		EnableImpersonation:   true,
 	})
 	require.NoError(t, err)
-	t.Cleanup(func() {
-		_, err := Client.SetSecurityPolicy(AdminCTX, &admin_pb.SetSecurityPolicyRequest{
-			EnableIframeEmbedding: false,
-			AllowedOrigins:        []string{},
-			EnableImpersonation:   false,
-		})
-		require.NoError(t, err)
-	})
-
 	tests := []struct {
 		name    string
 		ctx     context.Context
@@ -40,12 +36,12 @@ func TestServer_GetSecurityPolicy(t *testing.T) {
 	}{
 		{
 			name:    "permission error",
-			ctx:     Tester.WithAuthorization(CTX, integration.OrgOwner),
+			ctx:     instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 			wantErr: true,
 		},
 		{
 			name: "success",
-			ctx:  AdminCTX,
+			ctx:  adminCtx,
 			want: &admin_pb.GetSecurityPolicyResponse{
 				Policy: &settings.SecurityPolicy{
 					EnableIframeEmbedding: true,
@@ -57,7 +53,7 @@ func TestServer_GetSecurityPolicy(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			resp, err := Client.GetSecurityPolicy(tt.ctx, &admin_pb.GetSecurityPolicyRequest{})
+			resp, err := instance.Client.Admin.GetSecurityPolicy(tt.ctx, &admin_pb.GetSecurityPolicyRequest{})
 			if tt.wantErr {
 				assert.Error(t, err)
 				return
@@ -72,6 +68,11 @@ func TestServer_GetSecurityPolicy(t *testing.T) {
 }
 
 func TestServer_SetSecurityPolicy(t *testing.T) {
+	t.Parallel()
+
+	instance := integration.NewInstance(CTX)
+	adminCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
+
 	type args struct {
 		ctx context.Context
 		req *admin_pb.SetSecurityPolicyRequest
@@ -85,7 +86,7 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 		{
 			name: "permission error",
 			args: args{
-				ctx: Tester.WithAuthorization(CTX, integration.OrgOwner),
+				ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
 				req: &admin_pb.SetSecurityPolicyRequest{
 					EnableIframeEmbedding: true,
 					AllowedOrigins:        []string{"foo.com", "bar.com"},
@@ -97,7 +98,7 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 		{
 			name: "success allowed origins",
 			args: args{
-				ctx: AdminCTX,
+				ctx: adminCtx,
 				req: &admin_pb.SetSecurityPolicyRequest{
 					AllowedOrigins: []string{"foo.com", "bar.com"},
 				},
@@ -105,14 +106,14 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 			want: &admin_pb.SetSecurityPolicyResponse{
 				Details: &object.ObjectDetails{
 					ChangeDate:    timestamppb.Now(),
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: instance.ID(),
 				},
 			},
 		},
 		{
 			name: "success iframe embedding",
 			args: args{
-				ctx: AdminCTX,
+				ctx: adminCtx,
 				req: &admin_pb.SetSecurityPolicyRequest{
 					EnableIframeEmbedding: true,
 				},
@@ -120,14 +121,14 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 			want: &admin_pb.SetSecurityPolicyResponse{
 				Details: &object.ObjectDetails{
 					ChangeDate:    timestamppb.Now(),
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: instance.ID(),
 				},
 			},
 		},
 		{
 			name: "success impersonation",
 			args: args{
-				ctx: AdminCTX,
+				ctx: adminCtx,
 				req: &admin_pb.SetSecurityPolicyRequest{
 					EnableImpersonation: true,
 				},
@@ -135,14 +136,14 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 			want: &admin_pb.SetSecurityPolicyResponse{
 				Details: &object.ObjectDetails{
 					ChangeDate:    timestamppb.Now(),
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: instance.ID(),
 				},
 			},
 		},
 		{
 			name: "success all",
 			args: args{
-				ctx: AdminCTX,
+				ctx: adminCtx,
 				req: &admin_pb.SetSecurityPolicyRequest{
 					EnableIframeEmbedding: true,
 					AllowedOrigins:        []string{"foo.com", "bar.com"},
@@ -152,14 +153,14 @@ func TestServer_SetSecurityPolicy(t *testing.T) {
 			want: &admin_pb.SetSecurityPolicyResponse{
 				Details: &object.ObjectDetails{
 					ChangeDate:    timestamppb.Now(),
-					ResourceOwner: Tester.Instance.InstanceID(),
+					ResourceOwner: instance.ID(),
 				},
 			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Client.SetSecurityPolicy(tt.args.ctx, tt.args.req)
+			got, err := instance.Client.Admin.SetSecurityPolicy(tt.args.ctx, tt.args.req)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return

internal/api/grpc/admin/integration_test/information_test.go

@@ -15,6 +15,6 @@ import (
 func TestServer_Healthz(t *testing.T) {
 	ctx, cancel := context.WithTimeout(AdminCTX, time.Minute)
 	defer cancel()
-	_, err := Tester.Client.Admin.Healthz(ctx, &admin.HealthzRequest{})
+	_, err := Instance.Client.Admin.Healthz(ctx, &admin.HealthzRequest{})
 	require.NoError(t, err)
 }

internal/api/grpc/admin/integration_test/restrictions_allow_public_org_registrations_test.go

@@ -10,20 +10,20 @@ import (
 	"net/http/cookiejar"
 	"net/url"
 	"testing"
-	"time"
 
 	"github.com/muhlemmer/gu"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/zitadel/zitadel/internal/integration"
 	"github.com/zitadel/zitadel/pkg/grpc/admin"
 )
 
 func TestServer_Restrictions_DisallowPublicOrgRegistration(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
-	defer cancel()
-	domain, _, _, iamOwnerCtx := Tester.UseIsolatedInstance(t, ctx, SystemCTX)
-	regOrgUrl, err := url.Parse("http://" + domain + ":8080/ui/login/register/org")
+	t.Parallel()
+
+	instance := integration.NewInstance(CTX)
+	regOrgUrl, err := url.Parse("http://" + instance.Domain + ":8080/ui/login/register/org")
 	require.NoError(t, err)
 	// The CSRF cookie must be sent with every request.
 	// We can simulate a browser session using a cookie jar.
@@ -31,36 +31,38 @@ func TestServer_Restrictions_DisallowPublicOrgRegistration(t *testing.T) {
 	require.NoError(t, err)
 	browserSession := &http.Client{Jar: jar}
 	var csrfToken string
-	t.Run("public org registration is allowed by default", func(*testing.T) {
-		csrfToken = awaitPubOrgRegAllowed(t, iamOwnerCtx, browserSession, regOrgUrl)
+	iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
+
+	t.Run("public org registration is allowed by default", func(tt *testing.T) {
+		csrfToken = awaitPubOrgRegAllowed(tt, iamOwnerCtx, instance.Client, browserSession, regOrgUrl)
 	})
-	t.Run("disallowing public org registration disables the endpoints", func(*testing.T) {
-		_, err = Tester.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{DisallowPublicOrgRegistration: gu.Ptr(true)})
-		require.NoError(t, err)
-		awaitPubOrgRegDisallowed(t, iamOwnerCtx, browserSession, regOrgUrl, csrfToken)
+	t.Run("disallowing public org registration disables the endpoints", func(tt *testing.T) {
+		_, err = instance.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{DisallowPublicOrgRegistration: gu.Ptr(true)})
+		require.NoError(tt, err)
+		awaitPubOrgRegDisallowed(tt, iamOwnerCtx, instance.Client, browserSession, regOrgUrl, csrfToken)
 	})
-	t.Run("allowing public org registration again re-enables the endpoints", func(*testing.T) {
-		_, err = Tester.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{DisallowPublicOrgRegistration: gu.Ptr(false)})
-		require.NoError(t, err)
-		awaitPubOrgRegAllowed(t, iamOwnerCtx, browserSession, regOrgUrl)
+	t.Run("allowing public org registration again re-enables the endpoints", func(tt *testing.T) {
+		_, err = instance.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{DisallowPublicOrgRegistration: gu.Ptr(false)})
+		require.NoError(tt, err)
+		awaitPubOrgRegAllowed(tt, iamOwnerCtx, instance.Client, browserSession, regOrgUrl)
 	})
 }
 
 // awaitPubOrgRegAllowed doesn't accept a CSRF token, as we expected it to always produce a new one
-func awaitPubOrgRegAllowed(t *testing.T, ctx context.Context, client *http.Client, parsedURL *url.URL) string {
+func awaitPubOrgRegAllowed(t *testing.T, ctx context.Context, cc *integration.Client, client *http.Client, parsedURL *url.URL) string {
 	csrfToken := awaitGetSSRGetResponse(t, ctx, client, parsedURL, http.StatusOK)
 	awaitPostFormResponse(t, ctx, client, parsedURL, http.StatusOK, csrfToken)
-	restrictions, err := Tester.Client.Admin.GetRestrictions(ctx, &admin.GetRestrictionsRequest{})
+	restrictions, err := cc.Admin.GetRestrictions(ctx, &admin.GetRestrictionsRequest{})
 	require.NoError(t, err)
 	require.False(t, restrictions.DisallowPublicOrgRegistration)
 	return csrfToken
 }
 
 // awaitPubOrgRegDisallowed accepts an old CSRF token, as we don't expect to get a CSRF token from the GET request anymore
-func awaitPubOrgRegDisallowed(t *testing.T, ctx context.Context, client *http.Client, parsedURL *url.URL, reuseOldCSRFToken string) {
+func awaitPubOrgRegDisallowed(t *testing.T, ctx context.Context, cc *integration.Client, client *http.Client, parsedURL *url.URL, reuseOldCSRFToken string) {
 	awaitGetSSRGetResponse(t, ctx, client, parsedURL, http.StatusNotFound)
 	awaitPostFormResponse(t, ctx, client, parsedURL, http.StatusConflict, reuseOldCSRFToken)
-	restrictions, err := Tester.Client.Admin.GetRestrictions(ctx, &admin.GetRestrictionsRequest{})
+	restrictions, err := cc.Admin.GetRestrictions(ctx, &admin.GetRestrictionsRequest{})
 	require.NoError(t, err)
 	require.True(t, restrictions.DisallowPublicOrgRegistration)
 }
@@ -70,9 +72,9 @@ func awaitGetSSRGetResponse(t *testing.T, ctx context.Context, client *http.Clie
 	var csrfToken []byte
 	await(t, ctx, func(tt *assert.CollectT) {
 		resp, err := client.Get(parsedURL.String())
-		require.NoError(t, err)
+		require.NoError(tt, err)
 		body, err := io.ReadAll(resp.Body)
-		require.NoError(t, err)
+		require.NoError(tt, err)
 		searchField := `<input type="hidden" name="gorilla.csrf.Token" value="`
 		_, after, hasCsrfToken := bytes.Cut(body, []byte(searchField))
 		if hasCsrfToken {
@@ -89,7 +91,7 @@ func awaitPostFormResponse(t *testing.T, ctx context.Context, client *http.Clien
 		resp, err := client.PostForm(parsedURL.String(), url.Values{
 			"gorilla.csrf.Token": {csrfToken},
 		})
-		require.NoError(t, err)
+		require.NoError(tt, err)
 		assert.Equal(tt, resp.StatusCode, expectCode)
 	})
 }

internal/api/grpc/admin/integration_test/restrictions_allowed_languages_test.go

@@ -16,6 +16,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
+	"github.com/zitadel/zitadel/internal/integration"
 	"github.com/zitadel/zitadel/pkg/grpc/admin"
 	"github.com/zitadel/zitadel/pkg/grpc/management"
 	"github.com/zitadel/zitadel/pkg/grpc/text"
@@ -23,7 +24,9 @@ import (
 )
 
 func TestServer_Restrictions_AllowedLanguages(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Hour)
+	t.Parallel()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
 	defer cancel()
 
 	var (
@@ -33,68 +36,70 @@ func TestServer_Restrictions_AllowedLanguages(t *testing.T) {
 		unsupportedLanguage       = language.Afrikaans
 	)
 
-	domain, _, _, iamOwnerCtx := Tester.UseIsolatedInstance(t, ctx, SystemCTX)
+	instance := integration.NewInstance(ctx)
+	iamOwnerCtx := instance.WithAuthorization(ctx, integration.UserTypeIAMOwner)
+
 	t.Run("assumed defaults are correct", func(tt *testing.T) {
 		tt.Run("languages are not restricted by default", func(ttt *testing.T) {
-			restrictions, err := Tester.Client.Admin.GetRestrictions(iamOwnerCtx, &admin.GetRestrictionsRequest{})
+			restrictions, err := instance.Client.Admin.GetRestrictions(iamOwnerCtx, &admin.GetRestrictionsRequest{})
 			require.NoError(ttt, err)
 			require.Len(ttt, restrictions.AllowedLanguages, 0)
 		})
 		tt.Run("default language is English by default", func(ttt *testing.T) {
-			defaultLang, err := Tester.Client.Admin.GetDefaultLanguage(iamOwnerCtx, &admin.GetDefaultLanguageRequest{})
+			defaultLang, err := instance.Client.Admin.GetDefaultLanguage(iamOwnerCtx, &admin.GetDefaultLanguageRequest{})
 			require.NoError(ttt, err)
 			require.Equal(ttt, language.Make(defaultLang.Language), language.English)
 		})
 		tt.Run("the discovery endpoint returns all supported languages", func(ttt *testing.T) {
-			awaitDiscoveryEndpoint(ttt, domain, supportedLanguagesStr, nil)
+			awaitDiscoveryEndpoint(ttt, instance.Domain, supportedLanguagesStr, nil)
 		})
 	})
 	t.Run("restricting the default language fails", func(tt *testing.T) {
-		_, err := Tester.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{AllowedLanguages: &admin.SelectLanguages{List: []string{defaultAndAllowedLanguage.String()}}})
+		_, err := instance.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{AllowedLanguages: &admin.SelectLanguages{List: []string{defaultAndAllowedLanguage.String()}}})
 		expectStatus, ok := status.FromError(err)
 		require.True(tt, ok)
 		require.Equal(tt, codes.FailedPrecondition, expectStatus.Code())
 	})
 	t.Run("not defining any restrictions throws an error", func(tt *testing.T) {
-		_, err := Tester.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{})
+		_, err := instance.Client.Admin.SetRestrictions(iamOwnerCtx, &admin.SetRestrictionsRequest{})
 		expectStatus, ok := status.FromError(err)
 		require.True(tt, ok)
 		require.Equal(tt, codes.InvalidArgument, expectStatus.Code())
 	})
 	t.Run("setting the default language works", func(tt *testing.T) {
-		setAndAwaitDefaultLanguage(iamOwnerCtx, tt, defaultAndAllowedLanguage)
+		setAndAwaitDefaultLanguage(iamOwnerCtx, instance.Client, tt, defaultAndAllowedLanguage)
 	})
 	t.Run("restricting allowed languages works", func(tt *testing.T) {
-		setAndAwaitAllowedLanguages(iamOwnerCtx, tt, []string{defaultAndAllowedLanguage.String()})
+		setAndAwaitAllowedLanguages(iamOwnerCtx, instance.Client, tt, []string{defaultAndAllowedLanguage.String()})
 	})
 	t.Run("GetAllowedLanguage returns only the allowed languages", func(tt *testing.T) {
 		expectContains, expectNotContains := []string{defaultAndAllowedLanguage.String()}, []string{disallowedLanguage.String()}
-		adminResp, err := Tester.Client.Admin.GetAllowedLanguages(iamOwnerCtx, &admin.GetAllowedLanguagesRequest{})
+		adminResp, err := instance.Client.Admin.GetAllowedLanguages(iamOwnerCtx, &admin.GetAllowedLanguagesRequest{})
 		require.NoError(t, err)
 		langs := adminResp.GetLanguages()
 		assert.Condition(t, contains(langs, expectContains))
 		assert.Condition(t, not(contains(langs, expectNotContains)))
 	})
 	t.Run("setting the default language to a disallowed language fails", func(tt *testing.T) {
-		_, err := Tester.Client.Admin.SetDefaultLanguage(iamOwnerCtx, &admin.SetDefaultLanguageRequest{Language: disallowedLanguage.String()})
+		_, err := instance.Client.Admin.SetDefaultLanguage(iamOwnerCtx, &admin.SetDefaultLanguageRequest{Language: disallowedLanguage.String()})
 		expectStatus, ok := status.FromError(err)
 		require.True(tt, ok)
 		require.Equal(tt, codes.FailedPrecondition, expectStatus.Code())
 	})
 	t.Run("the list of supported languages includes the disallowed languages", func(tt *testing.T) {
-		supported, err := Tester.Client.Admin.GetSupportedLanguages(iamOwnerCtx, &admin.GetSupportedLanguagesRequest{})
+		supported, err := instance.Client.Admin.GetSupportedLanguages(iamOwnerCtx, &admin.GetSupportedLanguagesRequest{})
 		require.NoError(tt, err)
 		require.Condition(tt, contains(supported.GetLanguages(), supportedLanguagesStr))
 	})
 	t.Run("the disallowed language is not listed in the discovery endpoint", func(tt *testing.T) {
-		awaitDiscoveryEndpoint(tt, domain, []string{defaultAndAllowedLanguage.String()}, []string{disallowedLanguage.String()})
+		awaitDiscoveryEndpoint(tt, instance.Domain, []string{defaultAndAllowedLanguage.String()}, []string{disallowedLanguage.String()})
 	})
 	t.Run("the login ui is rendered in the default language", func(tt *testing.T) {
-		awaitLoginUILanguage(tt, domain, disallowedLanguage, defaultAndAllowedLanguage, "Passwort")
+		awaitLoginUILanguage(tt, instance.Domain, disallowedLanguage, defaultAndAllowedLanguage, "Passwort")
 	})
 	t.Run("preferred languages are not restricted by the supported languages", func(tt *testing.T) {
 		tt.Run("change user profile", func(ttt *testing.T) {
-			resp, err := Tester.Client.Mgmt.ListUsers(iamOwnerCtx, &management.ListUsersRequest{Queries: []*user.SearchQuery{{Query: &user.SearchQuery_UserNameQuery{UserNameQuery: &user.UserNameQuery{
+			resp, err := instance.Client.Mgmt.ListUsers(iamOwnerCtx, &management.ListUsersRequest{Queries: []*user.SearchQuery{{Query: &user.SearchQuery_UserNameQuery{UserNameQuery: &user.UserNameQuery{
 				UserName: "zitadel-admin@zitadel.localhost"}},
 			}}})
 			require.NoError(ttt, err)
@@ -102,7 +107,7 @@ func TestServer_Restrictions_AllowedLanguages(t *testing.T) {
 			humanAdmin := resp.GetResult()[0]
 			profile := humanAdmin.GetHuman().GetProfile()
 			require.NotEqual(ttt, unsupportedLanguage.String(), profile.GetPreferredLanguage())
-			_, updateErr := Tester.Client.Mgmt.UpdateHumanProfile(iamOwnerCtx, &management.UpdateHumanProfileRequest{
+			_, updateErr := instance.Client.Mgmt.UpdateHumanProfile(iamOwnerCtx, &management.UpdateHumanProfileRequest{
 				PreferredLanguage: unsupportedLanguage.String(),
 				UserId:            humanAdmin.GetId(),
 				FirstName:         profile.GetFirstName(),
@@ -115,26 +120,26 @@ func TestServer_Restrictions_AllowedLanguages(t *testing.T) {
 		})
 	})
 	t.Run("custom texts are only restricted by the supported languages", func(tt *testing.T) {
-		_, err := Tester.Client.Admin.SetCustomLoginText(iamOwnerCtx, &admin.SetCustomLoginTextsRequest{
+		_, err := instance.Client.Admin.SetCustomLoginText(iamOwnerCtx, &admin.SetCustomLoginTextsRequest{
 			Language: disallowedLanguage.String(),
 			EmailVerificationText: &text.EmailVerificationScreenText{
 				Description: "hodor",
 			},
 		})
 		assert.NoError(tt, err)
-		_, err = Tester.Client.Mgmt.SetCustomLoginText(iamOwnerCtx, &management.SetCustomLoginTextsRequest{
+		_, err = instance.Client.Mgmt.SetCustomLoginText(iamOwnerCtx, &management.SetCustomLoginTextsRequest{
 			Language: disallowedLanguage.String(),
 			EmailVerificationText: &text.EmailVerificationScreenText{
 				Description: "hodor",
 			},
 		})
 		assert.NoError(tt, err)
-		_, err = Tester.Client.Mgmt.SetCustomInitMessageText(iamOwnerCtx, &management.SetCustomInitMessageTextRequest{
+		_, err = instance.Client.Mgmt.SetCustomInitMessageText(iamOwnerCtx, &management.SetCustomInitMessageTextRequest{
 			Language: disallowedLanguage.String(),
 			Text:     "hodor",
 		})
 		assert.NoError(tt, err)
-		_, err = Tester.Client.Admin.SetDefaultInitMessageText(iamOwnerCtx, &admin.SetDefaultInitMessageTextRequest{
+		_, err = instance.Client.Admin.SetDefaultInitMessageText(iamOwnerCtx, &admin.SetDefaultInitMessageTextRequest{
 			Language: disallowedLanguage.String(),
 			Text:     "hodor",
 		})
@@ -142,27 +147,27 @@ func TestServer_Restrictions_AllowedLanguages(t *testing.T) {
 	})
 	t.Run("allowing all languages works", func(tt *testing.T) {
 		tt.Run("restricting allowed languages works", func(ttt *testing.T) {
-			setAndAwaitAllowedLanguages(iamOwnerCtx, ttt, make([]string, 0))
+			setAndAwaitAllowedLanguages(iamOwnerCtx, instance.Client, ttt, make([]string, 0))
 		})
 	})
 
 	t.Run("allowing the language makes it usable again", func(tt *testing.T) {
 		tt.Run("the previously disallowed language is listed in the discovery endpoint again", func(ttt *testing.T) {
-			awaitDiscoveryEndpoint(ttt, domain, []string{disallowedLanguage.String()}, nil)
+			awaitDiscoveryEndpoint(ttt, instance.Domain, []string{disallowedLanguage.String()}, nil)
 		})
 		tt.Run("the login ui is rendered in the previously disallowed language", func(ttt *testing.T) {
-			awaitLoginUILanguage(ttt, domain, disallowedLanguage, disallowedLanguage, "Contraseña")
+			awaitLoginUILanguage(ttt, instance.Domain, disallowedLanguage, disallowedLanguage, "Contraseña")
 		})
 	})
 }
 
-func setAndAwaitAllowedLanguages(ctx context.Context, t *testing.T, selectLanguages []string) {
-	_, err := Tester.Client.Admin.SetRestrictions(ctx, &admin.SetRestrictionsRequest{AllowedLanguages: &admin.SelectLanguages{List: selectLanguages}})
+func setAndAwaitAllowedLanguages(ctx context.Context, cc *integration.Client, t *testing.T, selectLanguages []string) {
+	_, err := cc.Admin.SetRestrictions(ctx, &admin.SetRestrictionsRequest{AllowedLanguages: &admin.SelectLanguages{List: selectLanguages}})
 	require.NoError(t, err)
 	awaitCtx, awaitCancel := context.WithTimeout(ctx, 10*time.Second)
 	defer awaitCancel()
 	await(t, awaitCtx, func(tt *assert.CollectT) {
-		restrictions, getErr := Tester.Client.Admin.GetRestrictions(awaitCtx, &admin.GetRestrictionsRequest{})
+		restrictions, getErr := cc.Admin.GetRestrictions(awaitCtx, &admin.GetRestrictionsRequest{})
 		expectLanguages := selectLanguages
 		if len(selectLanguages) == 0 {
 			expectLanguages = nil
@@ -172,13 +177,13 @@ func setAndAwaitAllowedLanguages(ctx context.Context, t *testing.T, selectLangua
 	})
 }
 
-func setAndAwaitDefaultLanguage(ctx context.Context, t *testing.T, lang language.Tag) {
-	_, err := Tester.Client.Admin.SetDefaultLanguage(ctx, &admin.SetDefaultLanguageRequest{Language: lang.String()})
+func setAndAwaitDefaultLanguage(ctx context.Context, cc *integration.Client, t *testing.T, lang language.Tag) {
+	_, err := cc.Admin.SetDefaultLanguage(ctx, &admin.SetDefaultLanguageRequest{Language: lang.String()})
 	require.NoError(t, err)
 	awaitCtx, awaitCancel := context.WithTimeout(ctx, 10*time.Second)
 	defer awaitCancel()
 	await(t, awaitCtx, func(tt *assert.CollectT) {
-		defaultLang, getErr := Tester.Client.Admin.GetDefaultLanguage(awaitCtx, &admin.GetDefaultLanguageRequest{})
+		defaultLang, getErr := cc.Admin.GetDefaultLanguage(awaitCtx, &admin.GetDefaultLanguageRequest{})
 		assert.NoError(tt, getErr)
 		assert.Equal(tt, lang.String(), defaultLang.GetLanguage())
 	})
@@ -217,16 +222,16 @@ func awaitLoginUILanguage(t *testing.T, domain string, acceptLanguage language.T
 	await(t, awaitCtx, func(tt *assert.CollectT) {
 		req, err := http.NewRequestWithContext(awaitCtx, http.MethodGet, "http://"+domain+":8080/ui/login/register", nil)
 		req.Header.Set("Accept-Language", acceptLanguage.String())
-		require.NoError(t, err)
+		require.NoError(tt, err)
 		resp, err := http.DefaultClient.Do(req)
-		require.NoError(t, err)
-		require.Equal(t, http.StatusOK, resp.StatusCode)
+		require.NoError(tt, err)
+		assert.Equal(tt, http.StatusOK, resp.StatusCode)
 		body, err := io.ReadAll(resp.Body)
 		defer func() {
-			require.NoError(t, resp.Body.Close())
+			require.NoError(tt, resp.Body.Close())
 		}()
-		require.NoError(t, err)
-		assert.Containsf(t, string(body), containsText, "login ui language is in "+expectLang.String())
+		require.NoError(tt, err)
+		assert.Containsf(tt, string(body), containsText, "login ui language is in "+expectLang.String())
 	})
 }
 

internal/api/grpc/admin/integration_test/server_test.go

@@ -16,23 +16,20 @@ import (
 )
 
 var (
-	CTX, AdminCTX, SystemCTX context.Context
-	Tester                   *integration.Tester
-	Client                   admin_pb.AdminServiceClient
+	CTX, AdminCTX context.Context
+	Instance      *integration.Instance
+	Client        admin_pb.AdminServiceClient
 )
 
 func TestMain(m *testing.M) {
 	os.Exit(func() int {
-		ctx, _, cancel := integration.Contexts(3 * time.Minute)
+		ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
 		defer cancel()
 
-		Tester = integration.NewTester(ctx)
-		defer Tester.Done()
-
+		Instance = integration.NewInstance(ctx)
 		CTX = ctx
-		AdminCTX = Tester.WithAuthorization(ctx, integration.IAMOwner)
-		SystemCTX = Tester.WithAuthorization(ctx, integration.SystemUser)
-		Client = Tester.Client.Admin
+		AdminCTX = Instance.WithAuthorization(ctx, integration.UserTypeIAMOwner)
+		Client = Instance.Client.Admin
 		return m.Run()
 	}())
 }
@@ -50,7 +47,7 @@ func await(t *testing.T, ctx context.Context, cb func(*assert.CollectT)) {
 			cb(tt)
 		},
 		time.Until(deadline),
-		100*time.Millisecond,
+		time.Second,
 		"awaiting successful callback failed",
 	)
 }