merge conflicts

Author: wim07101993

cmd/server/server.go

@@ -32,7 +32,6 @@ import (
 	"github.com/zitadel/nextgen/internal/instrumentation"
 	"github.com/zitadel/nextgen/internal/instrumentation/zlog"
 	"github.com/zitadel/nextgen/internal/instrumentation/zotel"
-	"github.com/zitadel/nextgen/internal/secrets"
 	"github.com/zitadel/nextgen/internal/service"
 	"github.com/zitadel/nextgen/internal/staticui/console"
 	"github.com/zitadel/nextgen/internal/staticui/login"

internal/api/integration_test/helpers/schema.go

@@ -87,7 +87,7 @@ func (h *Harness) CreateUserSchema(t *testing.T, project *domain.Project, schema
 
 	resp, err := client.CreateSchema(t.Context(), req, params)
 	require.NoError(t, err)
-	require.IsType(t, &api.CreateSchemaResponse{}, resp)
+	require.IsType(t, &api.CreateSchemaResponse{}, resp, MustMarshal(t, resp))
 	return resp.(*api.CreateSchemaResponse).ID
 }