[7.x] [ES UI] Error handling (#68809) (#69146)

src/plugins/es_ui_shared/__packages_do_not_import__/errors/index.ts

@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { isEsError } from './is_es_error';

src/plugins/es_ui_shared/__packages_do_not_import__/errors/is_es_error.ts

@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as legacyElasticsearch from 'elasticsearch';
+
+const esErrorsParent = legacyElasticsearch.errors._Abstract;
+
+interface RequestError extends Error {
+  statusCode?: number;
+}
+
+export function isEsError(err: RequestError) {
+  const isInstanceOfEsError = err instanceof esErrorsParent;
+  const hasStatusCode = Boolean(err.statusCode);
+
+  return isInstanceOfEsError && hasStatusCode;
+}

src/plugins/es_ui_shared/kibana.json

@@ -1,5 +1,6 @@
 {
   "id": "esUiShared",
   "version": "kibana",
-  "ui": true
+  "ui": true,
+  "server": true
 }

src/plugins/es_ui_shared/server/errors/index.ts

@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { isEsError } from '../../__packages_do_not_import__/errors';

src/plugins/es_ui_shared/server/index.ts

@@ -0,0 +1,28 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { isEsError } from './errors';
+
+/** dummy plugin*/
+export function plugin() {
+  return new (class EsUiSharedPlugin {
+    setup() {}
+    start() {}
+  })();
+}

x-pack/plugins/cross_cluster_replication/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/cross_cluster_replication/server/plugin.ts

@@ -30,7 +30,7 @@ import { registerApiRoutes } from './routes';
 import { License } from './services';
 import { elasticsearchJsPlugin } from './client/elasticsearch_ccr';
 import { CrossClusterReplicationConfig } from './config';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
 
 interface CrossClusterReplicationContext {

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.test.ts

@@ -7,7 +7,7 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { IRouter, kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { formatEsError } from '../../../lib/format_es_error';
 import { License } from '../../../services';
 import { mockRouteContext } from '../test_lib';

x-pack/plugins/cross_cluster_replication/server/shared_imports.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { isEsError } from './is_es_error';
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/cross_cluster_replication/server/types.ts

@@ -9,7 +9,7 @@ import { LicensingPluginSetup } from '../../licensing/server';
 import { IndexManagementPluginSetup } from '../../index_management/server';
 import { RemoteClustersPluginSetup } from '../../remote_clusters/server';
 import { License } from './services';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
 
 export interface Dependencies {

x-pack/plugins/index_lifecycle_management/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error): boolean {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/index_lifecycle_management/server/plugin.ts

@@ -14,7 +14,7 @@ import { Dependencies } from './types';
 import { registerApiRoutes } from './routes';
 import { License } from './services';
 import { IndexLifecycleManagementConfig } from './config';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 
 const indexLifecycleDataEnricher = async (indicesList: any, callAsCurrentUser: APICaller) => {
   if (!indicesList || !indicesList.length) {

x-pack/plugins/index_lifecycle_management/server/shared_imports.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { isEsError } from './is_es_error';
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/index_lifecycle_management/server/types.ts

@@ -10,7 +10,7 @@ import { LicensingPluginSetup } from '../../licensing/server';
 import { IndexManagementPluginSetup } from '../../index_management/server';
 import { License } from './services';
 import { IndexLifecycleManagementConfig } from './config';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;

x-pack/plugins/index_management/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/index_management/server/plugin.ts

@@ -24,7 +24,7 @@ import { PLUGIN } from '../common';
 import { Dependencies } from './types';
 import { ApiRoutes } from './routes';
 import { License, IndexDataEnricher } from './services';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { elasticsearchJsPlugin } from './client/elasticsearch';
 
 export interface DataManagementContext {

x-pack/plugins/index_management/server/shared_imports.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { isEsError } from './is_es_error';
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/index_management/server/types.ts

@@ -7,7 +7,7 @@ import { ScopedClusterClient, IRouter } from 'src/core/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
 import { License, IndexDataEnricher } from './services';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 
 export interface Dependencies {
   security: SecurityPluginSetup;

x-pack/plugins/ingest_pipelines/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/ingest_pipelines/server/plugin.ts

@@ -11,7 +11,7 @@ import { PLUGIN_ID, PLUGIN_MIN_LICENSE_TYPE } from '../common/constants';
 
 import { License } from './services';
 import { ApiRoutes } from './routes';
-import { isEsError } from './lib';
+import { isEsError } from './shared_imports';
 import { Dependencies } from './types';
 
 export class IngestPipelinesPlugin implements Plugin<void, void, any, any> {

x-pack/plugins/ingest_pipelines/server/shared_imports.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { isEsError } from './is_es_error';
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/ingest_pipelines/server/types.ts

@@ -8,7 +8,7 @@ import { IRouter } from 'src/core/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
 import { License } from './services';
-import { isEsError } from './lib';
+import { isEsError } from './shared_imports';
 
 export interface Dependencies {
   security: SecurityPluginSetup;

x-pack/plugins/license_management/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/license_management/server/plugin.ts

@@ -7,7 +7,7 @@
 import { Plugin, CoreSetup } from 'kibana/server';
 
 import { ApiRoutes } from './routes';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { Dependencies } from './types';
 
 export class LicenseManagementServerPlugin implements Plugin<void, void, any, any> {

x-pack/plugins/license_management/server/shared_imports.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/license_management/server/types.ts

@@ -7,7 +7,7 @@ import { ScopedClusterClient, IRouter } from 'kibana/server';
 
 import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;

x-pack/plugins/painless_lab/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/painless_lab/server/routes/api/execute.ts

@@ -7,7 +7,7 @@ import { schema } from '@kbn/config-schema';
 
 import { API_BASE_PATH } from '../../../common/constants';
 import { RouteDependencies } from '../../types';
-import { isEsError } from '../../lib';
+import { isEsError } from '../../shared_imports';
 
 const bodySchema = schema.string();
 

x-pack/plugins/painless_lab/server/shared_imports.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/remote_clusters/server/lib/is_es_error/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/remote_clusters/server/routes/api/add_route.ts

@@ -13,7 +13,7 @@ import { serializeCluster, Cluster } from '../../../common/lib';
 import { doesClusterExist } from '../../lib/does_cluster_exist';
 import { API_BASE_PATH, PROXY_MODE, SNIFF_MODE } from '../../../common/constants';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 import { RouteDependencies } from '../../types';
 
 const bodyValidation = schema.object({

x-pack/plugins/remote_clusters/server/routes/api/delete_route.ts

@@ -14,7 +14,7 @@ import { serializeCluster } from '../../../common/lib';
 import { API_BASE_PATH } from '../../../common/constants';
 import { doesClusterExist } from '../../lib/does_cluster_exist';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 
 const paramsValidation = schema.object({
   nameOrNames: schema.string(),

x-pack/plugins/remote_clusters/server/routes/api/get_route.ts

@@ -10,7 +10,7 @@ import { RequestHandler } from 'src/core/server';
 import { deserializeCluster } from '../../../common/lib';
 import { API_BASE_PATH } from '../../../common/constants';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 import { RouteDependencies } from '../../types';
 
 export const register = (deps: RouteDependencies): void => {

x-pack/plugins/remote_clusters/server/routes/api/update_route.ts

@@ -14,7 +14,7 @@ import { serializeCluster, deserializeCluster, Cluster, ClusterInfoEs } from '..
 import { doesClusterExist } from '../../lib/does_cluster_exist';
 import { RouteDependencies } from '../../types';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 
 const bodyValidation = schema.object({
   skipUnavailable: schema.boolean(),

x-pack/plugins/remote_clusters/server/shared_imports.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/rollup/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/rollup/server/plugin.ts

@@ -35,7 +35,7 @@ import { rollupDataEnricher } from './rollup_data_enricher';
 import { IndexPatternsFetcher } from './shared_imports';
 import { registerRollupSearchStrategy } from './lib/search_strategies';
 import { elasticsearchJsPlugin } from './client/elasticsearch_rollup';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
 import { getCapabilitiesForRollupIndices } from './lib/map_capabilities';
 import { mergeCapabilitiesWithFields } from './lib/merge_capabilities_with_fields';

x-pack/plugins/rollup/server/shared_imports.ts

@@ -5,3 +5,5 @@
  */
 
 export { IndexPatternsFetcher } from '../../../../src/plugins/data/server';
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/rollup/server/types.ts

@@ -12,7 +12,7 @@ import { IndexManagementPluginSetup } from '../../index_management/server';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { License } from './services';
 import { IndexPatternsFetcher } from './shared_imports';
-import { isEsError } from './lib/is_es_error';
+import { isEsError } from './shared_imports';
 import { formatEsError } from './lib/format_es_error';
 import { getCapabilitiesForRollupIndices } from './lib/map_capabilities';
 import { mergeCapabilitiesWithFields } from './lib/merge_capabilities_with_fields';

x-pack/plugins/snapshot_restore/server/lib/index.ts

@@ -12,5 +12,4 @@ export { cleanSettings } from './clean_settings';
 export { getManagedRepositoryName } from './get_managed_repository_name';
 export { getManagedPolicyNames } from './get_managed_policy_names';
 export { deserializeRestoreShard } from './restore_serialization';
-export { isEsError } from './is_es_error';
 export { wrapEsError } from './wrap_es_error';

x-pack/plugins/snapshot_restore/server/lib/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/snapshot_restore/server/plugin.ts

@@ -23,7 +23,8 @@ import {
 import { PLUGIN } from '../common';
 import { License } from './services';
 import { ApiRoutes } from './routes';
-import { isEsError, wrapEsError } from './lib';
+import { wrapEsError } from './lib';
+import { isEsError } from './shared_imports';
 import { elasticsearchJsPlugin } from './client/elasticsearch_sr';
 import { Dependencies } from './types';
 import { SnapshotRestoreConfig } from './config';

x-pack/plugins/snapshot_restore/server/shared_imports.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';

x-pack/plugins/snapshot_restore/server/test/helpers/route_dependencies.ts

@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { License } from '../../services';
-import { isEsError, wrapEsError } from '../../lib';
+import { wrapEsError } from '../../lib';
+import { isEsError } from '../../shared_imports';
 
 const license = new License();
 license.getStatus = jest.fn().mockReturnValue({ isValid: true });

x-pack/plugins/snapshot_restore/server/types.ts

@@ -8,7 +8,8 @@ import { LicensingPluginSetup } from '../../licensing/server';
 import { SecurityPluginSetup } from '../../security/server';
 import { CloudSetup } from '../../cloud/server';
 import { License } from './services';
-import { isEsError, wrapEsError } from './lib';
+import { wrapEsError } from './lib';
+import { isEsError } from './shared_imports';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;

x-pack/plugins/watcher/server/lib/is_es_error/is_es_error.ts

@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as legacyElasticsearch from 'elasticsearch';
-
-const esErrorsParent = legacyElasticsearch.errors._Abstract;
-
-export function isEsError(err: Error) {
-  return err instanceof esErrorsParent;
-}

x-pack/plugins/watcher/server/routes/api/indices/register_get_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { reduce, size } from 'lodash';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 

x-pack/plugins/watcher/server/routes/api/register_list_fields_route.ts

@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 // @ts-ignore
 import { Fields } from '../../models/fields/index';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';

x-pack/plugins/watcher/server/routes/api/register_load_history_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../lib/is_es_error';
+import { isEsError } from '../../shared_imports';
 import { INDEX_NAMES } from '../../../common/constants';
 import { RouteDependencies } from '../../types';
 import { licensePreRoutingFactory } from '../../lib/license_pre_routing_factory';

x-pack/plugins/watcher/server/routes/api/settings/register_load_route.ts

@@ -5,7 +5,7 @@
  */
 
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 // @ts-ignore
 import { Settings } from '../../../models/settings/index';
 import { RouteDependencies } from '../../../types';

x-pack/plugins/watcher/server/routes/api/watch/action/register_acknowledge_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { get } from 'lodash';
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../../../lib/is_es_error';
+import { isEsError } from '../../../../shared_imports';
 // @ts-ignore
 import { WatchStatus } from '../../../../models/watch_status/index';
 import { RouteDependencies } from '../../../../types';

x-pack/plugins/watcher/server/routes/api/watch/register_activate_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore

x-pack/plugins/watcher/server/routes/api/watch/register_deactivate_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore

x-pack/plugins/watcher/server/routes/api/watch/register_delete_route.ts

@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 

x-pack/plugins/watcher/server/routes/api/watch/register_execute_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 
 import { RouteDependencies } from '../../../types';

x-pack/plugins/watcher/server/routes/api/watch/register_history_route.ts

@@ -9,7 +9,7 @@ import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore

x-pack/plugins/watcher/server/routes/api/watch/register_load_route.ts

@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore
 import { Watch } from '../../../models/watch/index';

x-pack/plugins/watcher/server/routes/api/watch/register_save_route.ts

@@ -8,7 +8,7 @@ import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 import { WATCH_TYPES } from '../../../../common/constants';
 import { serializeJsonWatch, serializeThresholdWatch } from '../../../../common/lib/serialization';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 

x-pack/plugins/watcher/server/routes/api/watch/register_visualize_route.ts

@@ -6,7 +6,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 

x-pack/plugins/watcher/server/routes/api/watches/register_list_route.ts

@@ -8,7 +8,7 @@ import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { fetchAllFromScroll } from '../../../lib/fetch_all_from_scroll';
 import { INDEX_NAMES, ES_SCROLL_SETTINGS } from '../../../../common/constants';
-import { isEsError } from '../../../lib/is_es_error';
+import { isEsError } from '../../../shared_imports';
 import { RouteDependencies } from '../../../types';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore

x-pack/plugins/watcher/server/shared_imports.ts

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { isEsError } from '../../../../src/plugins/es_ui_shared/server';