log error instead of throw (#66254)

neptunian · elasticmachine · neptunian · commit fac47edbf7e3 · 2020-05-12T20:41:29.000-04:00
Co-authored-by: Elastic Machine &lt;elasticmachine@users.noreply.github.com&gt;
diff --git a/x-pack/plugins/ingest_manager/server/services/app_context.ts b/x-pack/plugins/ingest_manager/server/services/app_context.ts
@@ -21,7 +21,7 @@ class AppContextService {
   private isProductionMode: boolean = false;
   private kibanaVersion: string | undefined;
   private cloud?: CloudSetup;
-  private logger?: Logger;
+  private logger: Logger | undefined;
   private httpSetup?: HttpServiceSetup;
 
   public async start(appContext: IngestManagerAppContext) {
@@ -53,7 +53,7 @@ class AppContextService {
 
   public getSecurity() {
     if (!this.security) {
-      throw new Error('Secury service not set.');
+      throw new Error('Security service not set.');
     }
     return this.security;
   }
@@ -63,6 +63,9 @@ class AppContextService {
   }
 
   public getLogger() {
+    if (!this.logger) {
+      throw new Error('Logger not set.');
+    }
     return this.logger;
   }
 
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/index_pattern/install.ts
@@ -13,6 +13,7 @@ import * as Registry from '../../registry';
 import { loadFieldsFromYaml, Fields, Field } from '../../fields/field';
 import { getPackageKeysByStatus } from '../../packages/get';
 import { InstallationStatus, RegistryPackage, CallESAsCurrentUser } from '../../../../types';
+import { appContextService } from '../../../../services';
 
 interface FieldFormatMap {
   [key: string]: FieldFormatMapItem;
@@ -366,10 +367,11 @@ const getFieldFormatParams = (field: Field): FieldFormatParams => {
   return params;
 };
 
-export const ensureDefaultIndices = async (callCluster: CallESAsCurrentUser) =>
+export const ensureDefaultIndices = async (callCluster: CallESAsCurrentUser) => {
   // create placeholder indices to supress errors in the kibana Dashboards app
   // that no matching indices exist https://github.com/elastic/kibana/issues/62343
-  Promise.all(
+  const logger = appContextService.getLogger();
+  return Promise.all(
     Object.keys(IndexPatternType).map(async indexPattern => {
       const defaultIndexPatternName = indexPattern + INDEX_PATTERN_PLACEHOLDER_SUFFIX;
       const indexExists = await callCluster('indices.exists', { index: defaultIndexPatternName });
@@ -386,9 +388,9 @@ export const ensureDefaultIndices = async (callCluster: CallESAsCurrentUser) =>
             },
           });
         } catch (putErr) {
-          // throw new Error(`${defaultIndexPatternName} could not be created`);
-          throw new Error(putErr);
+          logger.error(`${defaultIndexPatternName} could not be created`);
         }
       }
     })
   );
+};

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class AppContextService {`
`21`	`21`	`private isProductionMode: boolean = false;`
`22`	`22`	`private kibanaVersion: string \| undefined;`
`23`	`23`	`private cloud?: CloudSetup;`
`24`		`- private logger?: Logger;`
	`24`	`+ private logger: Logger \| undefined;`
`25`	`25`	`private httpSetup?: HttpServiceSetup;`
`26`	`26`
`27`	`27`	`public async start(appContext: IngestManagerAppContext) {`
`@@ -53,7 +53,7 @@ class AppContextService {`
`53`	`53`
`54`	`54`	`public getSecurity() {`
`55`	`55`	`if (!this.security) {`
`56`		`- throw new Error('Secury service not set.');`
	`56`	`+ throw new Error('Security service not set.');`
`57`	`57`	`}`
`58`	`58`	`return this.security;`
`59`	`59`	`}`
`@@ -63,6 +63,9 @@ class AppContextService {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public getLogger() {`
	`66`	`+ if (!this.logger) {`
	`67`	`+ throw new Error('Logger not set.');`
	`68`	`+ }`
`66`	`69`	`return this.logger;`
`67`	`70`	`}`
`68`	`71`