[Synthetics] Organise api tests (#144407)

elastic · Nov 3, 2022 · 59d1fed · 59d1fed
1 parent 51d0a32
commit 59d1fed
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 46 deletions.
diff --git a/x-pack/test/api_integration/apis/index.ts b/x-pack/test/api_integration/apis/index.ts
@@ -22,6 +22,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./console'));
     loadTestFile(require.resolve('./management'));
     loadTestFile(require.resolve('./uptime'));
+    loadTestFile(require.resolve('./synthetics'));
     loadTestFile(require.resolve('./maps'));
     loadTestFile(require.resolve('./security_solution'));
     loadTestFile(require.resolve('./transform'));

diff --git a/...tegration/apis/uptime/rest/add_monitor.ts → ...ntegration/apis/synthetics/add_monitor.ts b/...tegration/apis/uptime/rest/add_monitor.ts → ...ntegration/apis/synthetics/add_monitor.ts
@@ -4,9 +4,9 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import expect from '@kbn/expect';
 import uuid from 'uuid';
 import { omit } from 'lodash';
-import expect from '@kbn/expect';
 import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_management';
 import { ConfigKey, DataStream, HTTPFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters';
@@ -15,10 +15,11 @@ import { DEFAULT_FIELDS } from '@kbn/synthetics-plugin/common/constants/monitor_
 import { ALL_SPACES_ID } from '@kbn/security-plugin/common/constants';
 import { syntheticsMonitorType } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/synthetics_monitor';
 import { format as formatUrl } from 'url';
+
 import supertest from 'supertest';
 import { serviceApiKeyPrivileges } from '@kbn/synthetics-plugin/server/synthetics_service/get_api_key';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('AddNewMonitors', function () {

diff --git a/...time/rest/add_monitor_private_location.ts → ...ynthetics/add_monitor_private_location.ts b/...time/rest/add_monitor_private_location.ts → ...ynthetics/add_monitor_private_location.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import { ConfigKey, HTTPFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters';
 import { omit } from 'lodash';
 import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_management';
 import { PackagePolicy } from '@kbn/fleet-plugin/common';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
-import { comparePolicies, getTestSyntheticsPolicy } from './sample_data/test_policy';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
+import { comparePolicies, getTestSyntheticsPolicy } from '../uptime/rest/sample_data/test_policy';
 import { PrivateLocationTestService } from './services/private_location_test_service';
 
 export default function ({ getService }: FtrProviderContext) {

diff --git a/...n/apis/uptime/rest/add_monitor_project.ts → ...on/apis/synthetics/add_monitor_project.ts b/...n/apis/uptime/rest/add_monitor_project.ts → ...on/apis/synthetics/add_monitor_project.ts
@@ -6,17 +6,20 @@
  */
 import fetch, { BodyInit, HeadersInit, Response } from 'node-fetch';
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import { format as formatUrl } from 'url';
 import { ConfigKey, ProjectMonitorsRequest } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters';
 import { syntheticsMonitorType } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/synthetics_monitor';
 import { PackagePolicy } from '@kbn/fleet-plugin/common';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
-import { comparePolicies, getTestProjectSyntheticsPolicy } from './sample_data/test_policy';
+import {
+  comparePolicies,
+  getTestProjectSyntheticsPolicy,
+} from '../uptime/rest/sample_data/test_policy';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('AddProjectMonitors', function () {

diff --git a/...ration/apis/uptime/rest/delete_monitor.ts → ...gration/apis/synthetics/delete_monitor.ts b/...ration/apis/uptime/rest/delete_monitor.ts → ...gration/apis/synthetics/delete_monitor.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import { HTTPFields, MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
 
 export default function ({ getService }: FtrProviderContext) {

diff --git a/...pis/uptime/rest/delete_monitor_project.ts → ...apis/synthetics/delete_monitor_project.ts b/...pis/uptime/rest/delete_monitor_project.ts → ...apis/synthetics/delete_monitor_project.ts
@@ -5,16 +5,16 @@
  * 2.0.
  */
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import { format as formatUrl } from 'url';
 import { ConfigKey, ProjectMonitorsRequest } from '@kbn/synthetics-plugin/common/runtime_types';
 import { INSUFFICIENT_FLEET_PERMISSIONS } from '@kbn/synthetics-plugin/server/synthetics_service/project_monitor/project_monitor_formatter';
 import { REQUEST_TOO_LARGE } from '@kbn/synthetics-plugin/server/routes/monitor_cruds/delete_monitor_project';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { syntheticsMonitorType } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/synthetics_monitor';
 import { PackagePolicy } from '@kbn/fleet-plugin/common';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
 import { parseStreamApiResponse } from './add_monitor_project';
 

diff --git a/...egration/apis/uptime/rest/edit_monitor.ts → ...tegration/apis/synthetics/edit_monitor.ts b/...egration/apis/uptime/rest/edit_monitor.ts → ...tegration/apis/synthetics/edit_monitor.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import { omit } from 'lodash';
 import { SimpleSavedObject } from '@kbn/core/public';
 import { secretKeys } from '@kbn/synthetics-plugin/common/constants/monitor_management';
 import { ConfigKey, HTTPFields, MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
 
 export default function ({ getService }: FtrProviderContext) {

diff --git a/...tegration/apis/uptime/rest/get_monitor.ts → ...ntegration/apis/synthetics/get_monitor.ts b/...tegration/apis/uptime/rest/get_monitor.ts → ...ntegration/apis/synthetics/get_monitor.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect';
 import { SimpleSavedObject } from '@kbn/core/public';
 import { MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('getSyntheticsMonitors', function () {

diff --git a/.../apis/uptime/rest/get_monitor_overview.ts → ...n/apis/synthetics/get_monitor_overview.ts b/.../apis/uptime/rest/get_monitor_overview.ts → ...n/apis/synthetics/get_monitor_overview.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect';
 import { SimpleSavedObject } from '@kbn/core/public';
 import { MonitorFields } from '@kbn/synthetics-plugin/common/runtime_types';
 import { SYNTHETICS_API_URLS, API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('[GET] /internal/synthetics/overview', function () {

diff --git a/...n/apis/uptime/rest/get_monitor_project.ts → ...on/apis/synthetics/get_monitor_project.ts b/...n/apis/uptime/rest/get_monitor_project.ts → ...on/apis/synthetics/get_monitor_project.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import uuid from 'uuid';
-import expect from '@kbn/expect';
 import type SuperTest from 'supertest';
 import { format as formatUrl } from 'url';
 import {
@@ -14,8 +13,9 @@ import {
   ProjectMonitorMetaData,
 } from '@kbn/synthetics-plugin/common/runtime_types';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { getFixtureJson } from './helper/get_fixture_json';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
 import { parseStreamApiResponse } from './add_monitor_project';
 

diff --git a/x-pack/test/api_integration/apis/synthetics/index.ts b/x-pack/test/api_integration/apis/synthetics/index.ts
@@ -0,0 +1,30 @@
+/*
+ * 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 '../../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
+
+  describe('synthetics CRUD routes', () => {
+    before(async () => {
+      await esDeleteAllIndices('heartbeat*');
+      await esDeleteAllIndices('synthetics*');
+    });
+
+    loadTestFile(require.resolve('./get_monitor'));
+    loadTestFile(require.resolve('./get_monitor_overview'));
+    loadTestFile(require.resolve('./add_monitor'));
+    loadTestFile(require.resolve('./add_monitor_project'));
+    loadTestFile(require.resolve('./get_monitor_project'));
+    loadTestFile(require.resolve('./add_monitor_private_location'));
+    loadTestFile(require.resolve('./edit_monitor'));
+    loadTestFile(require.resolve('./delete_monitor'));
+    loadTestFile(require.resolve('./delete_monitor_project'));
+    loadTestFile(require.resolve('./synthetics_enablement'));
+  });
+}
diff --git a/...services/private_location_test_service.ts → ...services/private_location_test_service.ts b/...services/private_location_test_service.ts → ...services/private_location_test_service.ts
@@ -7,8 +7,8 @@
 
 import { privateLocationsSavedObjectName } from '@kbn/synthetics-plugin/common/saved_objects/private_locations';
 import { privateLocationsSavedObjectId } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/private_locations';
-import { FtrProviderContext } from '../../../../ftr_provider_context';
-import { KibanaSupertestProvider } from '../../../../../../../test/api_integration/services/supertest';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { KibanaSupertestProvider } from '../../../../../../test/api_integration/services/supertest';
 
 export class PrivateLocationTestService {
   private supertestAPI: ReturnType<typeof KibanaSupertestProvider>;

diff --git a/...apis/uptime/rest/synthetics_enablement.ts → .../apis/synthetics/synthetics_enablement.ts b/...apis/uptime/rest/synthetics_enablement.ts → .../apis/synthetics/synthetics_enablement.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect';
 import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { serviceApiKeyPrivileges } from '@kbn/synthetics-plugin/server/synthetics_service/get_api_key';
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   describe('/internal/uptime/service/enablement', () => {

diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -72,18 +72,5 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./monitor_states_real_data'));
       loadTestFile(require.resolve('./uptime_zip_url_deprecation.ts'));
     });
-
-    describe('uptime CRUD routes', () => {
-      loadTestFile(require.resolve('./get_monitor'));
-      loadTestFile(require.resolve('./get_monitor_overview'));
-      loadTestFile(require.resolve('./add_monitor'));
-      loadTestFile(require.resolve('./add_monitor_project'));
-      loadTestFile(require.resolve('./get_monitor_project'));
-      loadTestFile(require.resolve('./add_monitor_private_location'));
-      loadTestFile(require.resolve('./edit_monitor'));
-      loadTestFile(require.resolve('./delete_monitor'));
-      loadTestFile(require.resolve('./delete_monitor_project'));
-      loadTestFile(require.resolve('./synthetics_enablement'));
-    });
   });
 }