- нормализация исключена из процесса поиска обновлённых файлов на дис…

…ке (File Watcher)
Security-Experts-Community · Jul 16, 2024 · 640bcae · 640bcae
1 parent f3495c8
commit 640bcae
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 60 deletions.
diff --git a/...integrationTests/getExpectEventCommand.ts → ...ionTests/command/getExpectEventCommand.ts b/...integrationTests/getExpectEventCommand.ts → ...ionTests/command/getExpectEventCommand.ts
@@ -3,19 +3,19 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 
-import { IntegrationTestParams} from '../../models/command/command';
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { FileSystemHelper } from '../../helpers/fileSystemHelper';
-import { RegExpHelper } from '../../helpers/regExpHelper';
-import { TestHelper } from '../../helpers/testHelper';
-import { XpException } from '../../models/xpException';
-import { FileSystemException } from '../../models/fileSystemException';
-import { FastTest } from '../../models/tests/fastTest';
-import { TestStatus } from '../../models/tests/testStatus';
-import { IntegrationTestEditorViewProvider } from './integrationTestEditorViewProvider';
-import { JsHelper } from '../../helpers/jsHelper';
-import { Correlation } from '../../models/content/correlation';
-import { Enrichment } from '../../models/content/enrichment';
+import { IntegrationTestParams} from '../../../models/command/command';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { FileSystemHelper } from '../../../helpers/fileSystemHelper';
+import { RegExpHelper } from '../../../helpers/regExpHelper';
+import { TestHelper } from '../../../helpers/testHelper';
+import { XpException } from '../../../models/xpException';
+import { FileSystemException } from '../../../models/fileSystemException';
+import { FastTest } from '../../../models/tests/fastTest';
+import { TestStatus } from '../../../models/tests/testStatus';
+import { IntegrationTestEditorViewProvider } from '../integrationTestEditorViewProvider';
+import { JsHelper } from '../../../helpers/jsHelper';
+import { Correlation } from '../../../models/content/correlation';
+import { Enrichment } from '../../../models/content/enrichment';
 
 // TODO: вынести под общий интерфейс провайдеров
 export class GetExpectedEventCommand  {

diff --git a/...grationTests/normalizeRawEventsCommand.ts → ...ests/command/normalizeRawEventsCommand.ts b/...grationTests/normalizeRawEventsCommand.ts → ...ests/command/normalizeRawEventsCommand.ts
@@ -1,10 +1,10 @@
 import * as vscode from 'vscode';
 
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { Command, RuleCommandParams } from '../../models/command/command';
-import { SiemjManager } from '../../models/siemj/siemjManager';
-import { IntegrationTest } from '../../models/tests/integrationTest';
-import { ExceptionHelper } from '../../helpers/exceptionHelper';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { Command, RuleCommandParams } from '../../../models/command/command';
+import { SiemjManager } from '../../../models/siemj/siemjManager';
+import { IntegrationTest } from '../../../models/tests/integrationTest';
+import { ExceptionHelper } from '../../../helpers/exceptionHelper';
 
 export interface NormalizeRawEventsParams extends RuleCommandParams {
 	isEnrichmentRequired: boolean;

diff --git a/...rationTests/runIntegrationTestsCommand.ts → ...sts/command/runIntegrationTestsCommand.ts b/...rationTests/runIntegrationTestsCommand.ts → ...sts/command/runIntegrationTestsCommand.ts
@@ -1,18 +1,18 @@
 import * as vscode from 'vscode';
 import * as fs from 'fs';
 
-import { Command, RuleCommandParams } from '../../models/command/command';
-import { TestHelper } from '../../helpers/testHelper';
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { RunIntegrationTestDialog } from '../runIntegrationDialog';
-import { SiemJOutputParser } from '../../models/siemj/siemJOutputParser';
-import { IntegrationTestRunner } from '../../models/tests/integrationTestRunner';
-import { TestStatus } from '../../models/tests/testStatus';
-import { ContentItemStatus } from '../../models/content/ruleBaseItem';
-import { Log } from '../../extension';
-import { ContentTreeProvider } from '../contentTree/contentTreeProvider';
-import { FileSystemHelper } from '../../helpers/fileSystemHelper';
-import { RegExpHelper } from '../../helpers/regExpHelper';
+import { Command, RuleCommandParams } from '../../../models/command/command';
+import { TestHelper } from '../../../helpers/testHelper';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { RunIntegrationTestDialog } from '../../runIntegrationDialog';
+import { SiemJOutputParser } from '../../../models/siemj/siemJOutputParser';
+import { IntegrationTestRunner } from '../../../models/tests/integrationTestRunner';
+import { TestStatus } from '../../../models/tests/testStatus';
+import { ContentItemStatus } from '../../../models/content/ruleBaseItem';
+import { Log } from '../../../extension';
+import { ContentTreeProvider } from '../../contentTree/contentTreeProvider';
+import { FileSystemHelper } from '../../../helpers/fileSystemHelper';
+import { RegExpHelper } from '../../../helpers/regExpHelper';
 
 export class RunIntegrationTestsCommand extends Command {
 

diff --git a/.../views/integrationTests/saveAllCommand.ts → ...ntegrationTests/command/saveAllCommand.ts b/.../views/integrationTests/saveAllCommand.ts → ...ntegrationTests/command/saveAllCommand.ts
@@ -1,12 +1,12 @@
 import * as os from 'os';
 
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { ExceptionHelper } from '../../helpers/exceptionHelper';
-import { TestHelper } from '../../helpers/testHelper';
-import { Command, RuleCommandParams } from '../../models/command/command';
-import { RuleBaseItem } from '../../models/content/ruleBaseItem';
-import { XpException } from '../../models/xpException';
-import { IntegrationTest } from '../../models/tests/integrationTest';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { ExceptionHelper } from '../../../helpers/exceptionHelper';
+import { TestHelper } from '../../../helpers/testHelper';
+import { Command, RuleCommandParams } from '../../../models/command/command';
+import { RuleBaseItem } from '../../../models/content/ruleBaseItem';
+import { XpException } from '../../../models/xpException';
+import { IntegrationTest } from '../../../models/tests/integrationTest';
 
 export interface SaveAllCommandParams extends RuleCommandParams {
 	testNumber: number;

diff --git a/...ntegrationTests/showActualEventCommand.ts → ...onTests/command/showActualEventCommand.ts b/...ntegrationTests/showActualEventCommand.ts → ...onTests/command/showActualEventCommand.ts
@@ -3,14 +3,14 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 
-import { Command, IntegrationTestParams} from '../../models/command/command';
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { FileSystemHelper } from '../../helpers/fileSystemHelper';
-import { TestHelper } from '../../helpers/testHelper';
-import { XpException } from '../../models/xpException';
-import { Log } from '../../extension';
-import { FileSystemException } from '../../models/fileSystemException';
-import { VsCodeApiHelper } from '../../helpers/vsCodeApiHelper';
+import { Command, IntegrationTestParams} from '../../../models/command/command';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { FileSystemHelper } from '../../../helpers/fileSystemHelper';
+import { TestHelper } from '../../../helpers/testHelper';
+import { XpException } from '../../../models/xpException';
+import { Log } from '../../../extension';
+import { FileSystemException } from '../../../models/fileSystemException';
+import { VsCodeApiHelper } from '../../../helpers/vsCodeApiHelper';
 
 export class ShowActualEventCommand extends Command {
 	constructor(private params: IntegrationTestParams) {

diff --git a/...rationTests/showTestResultsDiffCommand.ts → ...sts/command/showTestResultsDiffCommand.ts b/...rationTests/showTestResultsDiffCommand.ts → ...sts/command/showTestResultsDiffCommand.ts
@@ -3,15 +3,15 @@ import * as path from 'path';
 import * as os from 'os';
 import * as fs from 'fs';
 
-import { Command, IntegrationTestParams} from '../../models/command/command';
-import { DialogHelper } from '../../helpers/dialogHelper';
-import { FileSystemHelper } from '../../helpers/fileSystemHelper';
-import { RegExpHelper } from '../../helpers/regExpHelper';
-import { TestHelper } from '../../helpers/testHelper';
-import { XpException } from '../../models/xpException';
-import { Log } from '../../extension';
-import { FileSystemException } from '../../models/fileSystemException';
-import { VsCodeApiHelper } from '../../helpers/vsCodeApiHelper';
+import { Command, IntegrationTestParams} from '../../../models/command/command';
+import { DialogHelper } from '../../../helpers/dialogHelper';
+import { FileSystemHelper } from '../../../helpers/fileSystemHelper';
+import { RegExpHelper } from '../../../helpers/regExpHelper';
+import { TestHelper } from '../../../helpers/testHelper';
+import { XpException } from '../../../models/xpException';
+import { Log } from '../../../extension';
+import { FileSystemException } from '../../../models/fileSystemException';
+import { VsCodeApiHelper } from '../../../helpers/vsCodeApiHelper';
 
 export class ShowTestResultsDiffCommand extends Command {
 	constructor(private params: IntegrationTestParams) {

diff --git a/client/src/views/integrationTests/integrationTestEditorViewProvider.ts b/client/src/views/integrationTests/integrationTestEditorViewProvider.ts
@@ -17,14 +17,14 @@ import { XpException } from '../../models/xpException';
 import { Enveloper } from '../../models/enveloper';
 import { ExtensionState } from '../../models/applicationState';
 import { Log } from '../../extension';
-import { ShowTestResultsDiffCommand } from './showTestResultsDiffCommand';
-import { RunIntegrationTestsCommand } from './runIntegrationTestsCommand';
-import { NormalizeRawEventsCommand } from './normalizeRawEventsCommand';
-import { GetExpectedEventCommand } from './getExpectEventCommand';
+import { ShowTestResultsDiffCommand } from './command/showTestResultsDiffCommand';
+import { RunIntegrationTestsCommand } from './command/runIntegrationTestsCommand';
+import { NormalizeRawEventsCommand } from './command/normalizeRawEventsCommand';
+import { GetExpectedEventCommand } from './command/getExpectEventCommand';
 import { StringHelper } from '../../helpers/stringHelper';
-import { SaveAllCommand } from './saveAllCommand';
+import { SaveAllCommand } from './command/saveAllCommand';
 import { Aggregation } from '../../models/content/aggregation';
-import { ShowActualEventCommand } from './showActualEventCommand';
+import { ShowActualEventCommand } from './command/showActualEventCommand';
 
 export class IntegrationTestEditorViewProvider {
 
@@ -380,6 +380,7 @@ export class IntegrationTestEditorViewProvider {
 			// Команды с запуском утилит.
 			case "NormalizeRawEventsCommand": {
 				try {
+					this.savingInProgress = true;
 					if (typeof message?.isEnrichmentRequired !== "boolean" ) {
 						DialogHelper.showInfo("The event enrichment parameter is not set");
 						return true;
@@ -402,6 +403,9 @@ export class IntegrationTestEditorViewProvider {
 				catch(error) {
 					ExceptionHelper.show(error, this.config.getMessage("View.IntegrationTests.Message.DefaultErrorEventsNormalization"));
 				}
+				finally {
+					this.savingInProgress = false;
+				}
 				break;
 			}