fix

Author: Gwynbleidd0241

cmd/seq-ui/main.go

@@ -163,10 +163,10 @@ func initApp(ctx context.Context, cfg config.Config) *api.Registrar {
 		userProfileV1 = userprofile_v1.New(svc, p)
 		dashboardsV1 = dashboards_v1.New(svc, p)
 
-		asyncSearchesService = asyncsearches.New(ctx, repo, defaultClient, cfg.Handlers.AsyncSearch.AdminUsers)
+		asyncSearchesService = asyncsearches.New(ctx, repo, defaultClient, cfg.Handlers.AsyncSearch)
 	}
 
-	seqApiV1 := seqapi_v1.New(*cfg.Handlers, seqDBClients, inmemWithRedisCache, redisCache, asyncSearchesService, p)
+	seqApiV1 := seqapi_v1.New(cfg.Handlers.SeqAPI, seqDBClients, inmemWithRedisCache, redisCache, asyncSearchesService, p)
 
 	logger.Info("initializing clickhouse")
 	ch, err := initClickHouse(ctx, cfg.Server.CH)

docs/en/02-configuration.md

@@ -809,19 +809,19 @@ Config for `/massexport` API handlers.
 
 ### Async Search
 
-Configuration for async request.
+Configuration for async search request.
 
 **`async_search`** *`AsyncSearch`* *`optional`*
 
-Поля `AsyncSearch`:
+Fields `AsyncSearch`:
 
 + **`admin_users`** *`[]string`* *`optional`*
 
   List of users allowed to cancel or delete async requests created by other users.
 
 + **`query_length_limit`** *`int`* *`default=1000`*
 
-  Maximum length of `request.query` in async searches list responses.
+  Maximum length of `request.query` in async searches list responses. Requests exceeding the limit will be truncated to it
 
 ## Tracing
 

docs/ru/02-configuration.md

@@ -811,17 +811,17 @@ handlers:
 
 **`async_search`** *`AsyncSearch`* *`optional`*
 
-Настройка функциональности отложенных запросов.
+Настройка функциональности отложенных поисковых запросов.
 
 Поля `AsyncSearch`:
 
 + **`admin_users`** *`[]string`* *`optional`*
 
   Список пользователей, которые могут отменять или удалять отложенные поиски других пользователей.
 
-+ **`query_length_limit`** *`int`* *`default=1000`*
++ **`list_query_length_limit`** *`int`* *`default=1000`*
 
-  Максимальная длина `request.query` в ответе списка отложенных запросов.
+  Максимальная длина `request.query` в ответе списка отложенных запросов. Запросы, превышающие лимит, будут обрезаны до этого значения.
 
 ## Tracing
 

internal/api/seqapi/v1/grpc/aggregation_test.go

@@ -30,7 +30,7 @@ func TestGetAggregation(t *testing.T) {
 		apiErr    bool
 		clientErr error
 
-		cfg config.Handlers
+		cfg config.SeqAPI
 	}{
 		{
 			name: "ok_single_agg",
@@ -47,11 +47,9 @@ func TestGetAggregation(t *testing.T) {
 					Code: seqapi.ErrorCode_ERROR_CODE_NO,
 				},
 			},
-			cfg: config.Handlers{
-				SeqAPI: config.SeqAPI{
-					SeqAPIOptions: &config.SeqAPIOptions{
-						MaxAggregationsPerRequest: 4,
-					},
+			cfg: config.SeqAPI{
+				SeqAPIOptions: &config.SeqAPIOptions{
+					MaxAggregationsPerRequest: 4,
 				},
 			},
 		},
@@ -73,11 +71,9 @@ func TestGetAggregation(t *testing.T) {
 					Code: seqapi.ErrorCode_ERROR_CODE_NO,
 				},
 			},
-			cfg: config.Handlers{
-				SeqAPI: config.SeqAPI{
-					SeqAPIOptions: &config.SeqAPIOptions{
-						MaxAggregationsPerRequest: 3,
-					},
+			cfg: config.SeqAPI{
+				SeqAPIOptions: &config.SeqAPIOptions{
+					MaxAggregationsPerRequest: 3,
 				},
 			},
 		},
@@ -90,11 +86,9 @@ func TestGetAggregation(t *testing.T) {
 					{Field: "test3"},
 				},
 			},
-			cfg: config.Handlers{
-				SeqAPI: config.SeqAPI{
-					SeqAPIOptions: &config.SeqAPIOptions{
-						MaxAggregationsPerRequest: 2,
-					},
+			cfg: config.SeqAPI{
+				SeqAPIOptions: &config.SeqAPIOptions{
+					MaxAggregationsPerRequest: 2,
 				},
 			},
 			apiErr: true,
@@ -107,11 +101,9 @@ func TestGetAggregation(t *testing.T) {
 				To:       timestamppb.New(to),
 				AggField: "test2",
 			},
-			cfg: config.Handlers{
-				SeqAPI: config.SeqAPI{
-					SeqAPIOptions: &config.SeqAPIOptions{
-						MaxAggregationsPerRequest: 1,
-					},
+			cfg: config.SeqAPI{
+				SeqAPIOptions: &config.SeqAPIOptions{
+					MaxAggregationsPerRequest: 1,
 				},
 			},
 			clientErr: errors.New("client error"),

internal/api/seqapi/v1/grpc/api.go

@@ -32,7 +32,7 @@ type apiParams struct {
 type API struct {
 	seqapi.UnimplementedSeqAPIServiceServer
 
-	config              config.Handlers
+	config              config.SeqAPI
 	params              apiParams
 	paramsByEnv         map[string]apiParams
 	inmemWithRedisCache cache.Cache
@@ -44,31 +44,31 @@ type API struct {
 }
 
 func New(
-	cfg config.Handlers,
+	cfg config.SeqAPI,
 	seqDBСlients map[string]seqdb.Client,
 	inmemWithRedisCache cache.Cache,
 	redisCache cache.Cache,
 	asyncSearches *asyncsearches.Service,
 	p *profiles.Profiles,
 ) *API {
 	var globalfCache *fieldsCache
-	if cfg.SeqAPI.FieldsCacheTTL > 0 {
-		globalfCache = newFieldsCache(cfg.SeqAPI.FieldsCacheTTL)
+	if cfg.FieldsCacheTTL > 0 {
+		globalfCache = newFieldsCache(cfg.FieldsCacheTTL)
 	}
 
-	globalMasker, err := mask.New(cfg.SeqAPI.Masking)
+	globalMasker, err := mask.New(cfg.Masking)
 	if err != nil {
 		logger.Fatal("failed to init masking", zap.Error(err))
 	}
 
-	globalPinnedFields := parsePinnedFields(cfg.SeqAPI.PinnedFields)
+	globalPinnedFields := parsePinnedFields(cfg.PinnedFields)
 
 	var params apiParams
 	var paramsByEnv map[string]apiParams
 
-	if len(cfg.SeqAPI.Envs) > 0 {
+	if len(cfg.Envs) > 0 {
 		paramsByEnv = make(map[string]apiParams)
-		for envName, envConfig := range cfg.SeqAPI.Envs {
+		for envName, envConfig := range cfg.Envs {
 			client := seqDBСlients[envConfig.SeqDB]
 			options := envConfig.Options
 
@@ -101,7 +101,7 @@ func New(
 
 		params = apiParams{
 			client:       client,
-			options:      cfg.SeqAPI.SeqAPIOptions,
+			options:      cfg.SeqAPIOptions,
 			fieldsCache:  globalfCache,
 			masker:       globalMasker,
 			pinnedFields: globalPinnedFields,
@@ -117,7 +117,7 @@ func New(
 		nowFn:               time.Now,
 		asyncSearches:       asyncSearches,
 		profiles:            p,
-		envsResponse:        parseEnvs(cfg.SeqAPI),
+		envsResponse:        parseEnvs(cfg),
 	}
 }
 
@@ -191,12 +191,12 @@ func (a *API) GetEnvFromContext(ctx context.Context) string {
 }
 
 func (a *API) GetParams(env string) (apiParams, error) {
-	if len(a.config.SeqAPI.Envs) == 0 {
+	if len(a.config.Envs) == 0 {
 		return a.params, nil
 	}
 
 	if env == "" {
-		env = a.config.SeqAPI.DefaultEnv
+		env = a.config.DefaultEnv
 	}
 
 	params, exists := a.paramsByEnv[env]

internal/api/seqapi/v1/grpc/cluster_status_test.go

@@ -64,7 +64,7 @@ func TestStatus(t *testing.T) {
 			seqDbMock.EXPECT().Status(gomock.Any(), nil).
 				Return(proto.Clone(tt.resp), tt.clientErr).Times(1)
 
-			cfg := config.Handlers{}
+			cfg := config.SeqAPI{}
 
 			seqData := test.APITestData{
 				Cfg: cfg,

internal/api/seqapi/v1/grpc/events_test.go

@@ -102,11 +102,9 @@ func TestGetEvent(t *testing.T) {
 			t.Parallel()
 
 			seqData := test.APITestData{
-				Cfg: config.Handlers{
-					SeqAPI: config.SeqAPI{
-						SeqAPIOptions: &config.SeqAPIOptions{
-							EventsCacheTTL: cacheTTL,
-						},
+				Cfg: config.SeqAPI{
+					SeqAPIOptions: &config.SeqAPIOptions{
+						EventsCacheTTL: cacheTTL,
 					},
 				},
 			}
@@ -366,12 +364,10 @@ func TestGetEventWithMasking(t *testing.T) {
 			curEID := curEData.id
 
 			seqData := test.APITestData{
-				Cfg: config.Handlers{
-					SeqAPI: config.SeqAPI{
-						SeqAPIOptions: &config.SeqAPIOptions{
-							EventsCacheTTL: cacheTTL,
-							Masking:        tt.maskingCfg,
-						},
+				Cfg: config.SeqAPI{
+					SeqAPIOptions: &config.SeqAPIOptions{
+						EventsCacheTTL: cacheTTL,
+						Masking:        tt.maskingCfg,
 					},
 				},
 			}

internal/api/seqapi/v1/grpc/fields_test.go

@@ -106,11 +106,9 @@ func TestGetFieldsCached(t *testing.T) {
 	const ttl = 20 * time.Millisecond
 
 	seqData := test.APITestData{
-		Cfg: config.Handlers{
-			SeqAPI: config.SeqAPI{
-				SeqAPIOptions: &config.SeqAPIOptions{
-					FieldsCacheTTL: ttl,
-				},
+		Cfg: config.SeqAPI{
+			SeqAPIOptions: &config.SeqAPIOptions{
+				FieldsCacheTTL: ttl,
 			},
 		},
 		Mocks: test.Mocks{
@@ -156,11 +154,9 @@ func TestGetPinnedFields(t *testing.T) {
 			t.Parallel()
 
 			seqData := test.APITestData{
-				Cfg: config.Handlers{
-					SeqAPI: config.SeqAPI{
-						SeqAPIOptions: &config.SeqAPIOptions{
-							PinnedFields: tt.fields,
-						},
+				Cfg: config.SeqAPI{
+					SeqAPIOptions: &config.SeqAPIOptions{
+						PinnedFields: tt.fields,
 					},
 				},
 			}