Split detection_engine_api_integration rule exception list tests

spalger · Apr 28, 2022 · 9205afb · 9205afb
1 parent da1aa12
commit 9205afb
Show file tree

Hide file tree

Showing 30 changed files with 139 additions and 37 deletions.
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/README.md b/x-pack/test/detection_engine_api_integration/security_and_spaces/README.md
@@ -4,4 +4,30 @@ The tests take a while so they have been broken up into groups with their own `c
 
 Want to change the groups to something more logical? Have fun! Just make sure that each group executes on CI in less than 10 minutes or so. We don't currently have any mechanism for validating this right now, you just need to look at the times in the log output on CI, but we'll be working on tooling for making this information more accessible soon.
 
-- Kibana Operations
+- Kibana Operations
+
+# Rule Exception List Tests
+
+These tests are currently in group7-9.
+
+These are tests for rule exception lists where we test each data type
+
+- date
+- double
+- float
+- integer
+- ip
+- keyword
+- long
+- text
+
+Against the operator types of:
+
+- "is"
+- "is not"
+- "is one of"
+- "is not one of"
+- "exists"
+- "does not exist"
+- "is in list"
+- "is not in list"
diff --git a/...integration/security_and_spaces/group4/exception_operators_data_types/README.md b/...integration/security_and_spaces/group4/exception_operators_data_types/README.md
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group4/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group4/index.ts
@@ -10,6 +10,6 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('detection engine api security and spaces enabled - group 4', function () {
-    loadTestFile(require.resolve('./exception_operators_data_types'));
+    loadTestFile(require.resolve('./telemetry'));
   });
 };
diff --git a/...ity_and_spaces/group7/telemetry/README.md → ...ity_and_spaces/group4/telemetry/README.md b/...ity_and_spaces/group7/telemetry/README.md → ...ity_and_spaces/group4/telemetry/README.md
diff --git a/...rity_and_spaces/group7/telemetry/index.ts → ...rity_and_spaces/group4/telemetry/index.ts b/...rity_and_spaces/group7/telemetry/index.ts → ...rity_and_spaces/group4/telemetry/index.ts
diff --git a/.../group7/telemetry/task_based/all_types.ts → .../group4/telemetry/task_based/all_types.ts b/.../group7/telemetry/task_based/all_types.ts → .../group4/telemetry/task_based/all_types.ts
diff --git a/...7/telemetry/task_based/detection_rules.ts → ...4/telemetry/task_based/detection_rules.ts b/...7/telemetry/task_based/detection_rules.ts → ...4/telemetry/task_based/detection_rules.ts
diff --git a/...p7/telemetry/task_based/security_lists.ts → ...p4/telemetry/task_based/security_lists.ts b/...p7/telemetry/task_based/security_lists.ts → ...p4/telemetry/task_based/security_lists.ts
diff --git a/...p7/telemetry/usage_collector/all_types.ts → ...p4/telemetry/usage_collector/all_types.ts b/...p7/telemetry/usage_collector/all_types.ts → ...p4/telemetry/usage_collector/all_types.ts
diff --git a/.../usage_collector/detection_rule_status.ts → .../usage_collector/detection_rule_status.ts b/.../usage_collector/detection_rule_status.ts → .../usage_collector/detection_rule_status.ts
diff --git a/...emetry/usage_collector/detection_rules.ts → ...emetry/usage_collector/detection_rules.ts b/...emetry/usage_collector/detection_rules.ts → ...emetry/usage_collector/detection_rules.ts
diff --git a/...p4/exception_operators_data_types/date.ts → ...p7/exception_operators_data_types/date.ts b/...p4/exception_operators_data_types/date.ts → ...p7/exception_operators_data_types/date.ts
diff --git a/.../exception_operators_data_types/double.ts → .../exception_operators_data_types/double.ts b/.../exception_operators_data_types/double.ts → .../exception_operators_data_types/double.ts
diff --git a/...4/exception_operators_data_types/float.ts → ...7/exception_operators_data_types/float.ts b/...4/exception_operators_data_types/float.ts → ...7/exception_operators_data_types/float.ts
diff --git a/...engine_api_integration/security_and_spaces/group7/exception_operators_data_types/index.ts b/...engine_api_integration/security_and_spaces/group7/exception_operators_data_types/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Detection exceptions data types and operators', function () {
+    describe('', function () {
+      this.tags('ciGroup23');
+
+      loadTestFile(require.resolve('./date'));
+      loadTestFile(require.resolve('./double'));
+      loadTestFile(require.resolve('./float'));
+      loadTestFile(require.resolve('./integer'));
+    });
+  });
+};
diff --git a/...exception_operators_data_types/integer.ts → ...exception_operators_data_types/integer.ts b/...exception_operators_data_types/integer.ts → ...exception_operators_data_types/integer.ts
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group7/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group7/index.ts
@@ -10,6 +10,6 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('detection engine api security and spaces enabled - group 7', function () {
-    loadTestFile(require.resolve('./telemetry'));
+    loadTestFile(require.resolve('./exception_operators_data_types'));
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/config.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+// eslint-disable-next-line import/no-default-export
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../config.base.ts'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/...engine_api_integration/security_and_spaces/group8/exception_operators_data_types/index.ts b/...engine_api_integration/security_and_spaces/group8/exception_operators_data_types/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Detection exceptions data types and operators', function () {
+    describe('', function () {
+      this.tags('ciGroup24');
+
+      loadTestFile(require.resolve('./keyword'));
+      loadTestFile(require.resolve('./keyword_array'));
+      loadTestFile(require.resolve('./long'));
+      loadTestFile(require.resolve('./text'));
+    });
+  });
+};
diff --git a/...exception_operators_data_types/keyword.ts → ...exception_operators_data_types/keyword.ts b/...exception_operators_data_types/keyword.ts → ...exception_operators_data_types/keyword.ts
diff --git a/...ion_operators_data_types/keyword_array.ts → ...ion_operators_data_types/keyword_array.ts b/...ion_operators_data_types/keyword_array.ts → ...ion_operators_data_types/keyword_array.ts
diff --git a/...p4/exception_operators_data_types/long.ts → ...p8/exception_operators_data_types/long.ts b/...p4/exception_operators_data_types/long.ts → ...p8/exception_operators_data_types/long.ts
diff --git a/...p4/exception_operators_data_types/text.ts → ...p8/exception_operators_data_types/text.ts b/...p4/exception_operators_data_types/text.ts → ...p8/exception_operators_data_types/text.ts
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('detection engine api security and spaces enabled - group 8', function () {
+    loadTestFile(require.resolve('./exception_operators_data_types'));
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group9/config.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group9/config.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+// eslint-disable-next-line import/no-default-export
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../config.base.ts'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/...4/exception_operators_data_types/index.ts → ...9/exception_operators_data_types/index.ts b/...4/exception_operators_data_types/index.ts → ...9/exception_operators_data_types/index.ts
@@ -10,22 +10,9 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('Detection exceptions data types and operators', function () {
-    describe('', function () {
-      this.tags('ciGroup23');
-
-      loadTestFile(require.resolve('./date'));
-      loadTestFile(require.resolve('./double'));
-      loadTestFile(require.resolve('./float'));
-      loadTestFile(require.resolve('./integer'));
-    });
-
     describe('', function () {
       this.tags('ciGroup24');
 
-      loadTestFile(require.resolve('./keyword'));
-      loadTestFile(require.resolve('./keyword_array'));
-      loadTestFile(require.resolve('./long'));
-      loadTestFile(require.resolve('./text'));
       loadTestFile(require.resolve('./text_array'));
     });
 

diff --git a/...oup4/exception_operators_data_types/ip.ts → ...oup9/exception_operators_data_types/ip.ts b/...oup4/exception_operators_data_types/ip.ts → ...oup9/exception_operators_data_types/ip.ts
diff --git a/...xception_operators_data_types/ip_array.ts → ...xception_operators_data_types/ip_array.ts b/...xception_operators_data_types/ip_array.ts → ...xception_operators_data_types/ip_array.ts
diff --git a/...eption_operators_data_types/text_array.ts → ...eption_operators_data_types/text_array.ts b/...eption_operators_data_types/text_array.ts → ...eption_operators_data_types/text_array.ts
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group9/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group9/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('detection engine api security and spaces enabled - group 9', function () {
+    loadTestFile(require.resolve('./exception_operators_data_types'));
+  });
+};