dont use on-prem settings in visualizations

thomasneirynck · thomasneirynck · commit bcaba5534f4f · 2020-11-05T13:00:31.000-05:00
diff --git a/src/plugins/maps_legacy/public/ems_settings.ts b/src/plugins/maps_legacy/public/ems_settings.ts
@@ -49,6 +49,10 @@ export class EMSSettings {
     return this._config.emsUrl!.replace(/\/$/, '');
   }
 
+  isOnPrem(): boolean {
+    return !!this._isEMSUrlSet();
+  }
+
   isConfigValid(): boolean {
     const badConfig =
       this._isEMSUrlSet() &&
diff --git a/src/plugins/maps_legacy/public/plugin.ts b/src/plugins/maps_legacy/public/plugin.ts
@@ -60,23 +60,14 @@ export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegac
   }
 
   public setup(core: CoreSetup, plugins: MapsLegacySetupDependencies) {
-    const rawConfig = this._initializerContext.config.get<MapsLegacyConfig>();
-    const emsSettings = new EMSSettings(rawConfig);
+    const config = this._initializerContext.config.get<MapsLegacyConfig>();
+    const emsSettings = new EMSSettings(config);
 
     if (!emsSettings.isConfigValid()) {
       throw new Error(
         'Should not set emsUrl when `includeElasticMapsService` or `proxyElasticMapsServiceInMaps` are overridden'
       );
     }
-
-    const config: MapsLegacyConfig = {
-      ...rawConfig,
-      emsFileApiUrl: emsSettings.getEMSFileApiUrl(),
-      emsTileApiUrl: emsSettings.getEMSTileApiUrl(),
-      emsLandingPageUrl: emsSettings.getEMSLandingPageUrl(),
-      emsFontLibraryUrl: emsSettings.getEMSFontLibraryUrl(),
-    };
-
     const kibanaVersion = this._initializerContext.env.packageInfo.version;
 
     bindSetupCoreAndPlugins(core, config, kibanaVersion);
@@ -89,6 +80,7 @@ export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegac
       getPrecision,
       config,
       getBaseMapsVis,
+      emsSettings,
     };
   }
 
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
@@ -62,15 +62,32 @@ let kibanaCommonConfig: MapsLegacyConfig;
 export const setKibanaCommonConfig = (config: MapsLegacyConfig) => (kibanaCommonConfig = config);
 export const getKibanaCommonConfig = () => kibanaCommonConfig;
 
+let emsSettings: EMSSettings;
+export const setEMSSettings = (value: EMSSettings) => {
+  emsSettings = value;
+};
+
 export const getIsEmsEnabled = () => getKibanaCommonConfig().includeElasticMapsService;
-export const getEmsFontLibraryUrl = () => getKibanaCommonConfig().emsFontLibraryUrl;
 export const getEmsTileLayerId = () => getKibanaCommonConfig().emsTileLayerId;
-export const getEmsFileApiUrl = () => getKibanaCommonConfig().emsFileApiUrl;
-export const getEmsTileApiUrl = () => getKibanaCommonConfig().emsTileApiUrl;
-export const getEmsLandingPageUrl = () => getKibanaCommonConfig().emsLandingPageUrl;
 export const getProxyElasticMapsServiceInMaps = () =>
   getKibanaCommonConfig().proxyElasticMapsServiceInMaps;
 export const getRegionmapLayers = () => _.get(getKibanaCommonConfig(), 'regionmap.layers', []);
 export const getTilemap = () => _.get(getKibanaCommonConfig(), 'tilemap', []);
 
+export const getEmsFontLibraryUrl = () => {
+  return emsSettings.getEMSFontLibraryUrl();
+};
+
+export const getEmsFileApiUrl = () => {
+  return emsSettings.getEMSFileApiUrl();
+};
+
+export const getEmsTileApiUrl = () => {
+  return emsSettings.getEMSTileApiUrl();
+};
+
+export const getEmsLandingPageUrl = () => {
+  return emsSettings.getEMSLandingPageUrl();
+};
+
 export const getShareService = () => pluginsStart.share;
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
@@ -19,6 +19,7 @@ import {
 // @ts-ignore
 import { MapView } from './inspector/views/map_view';
 import {
+  setEMSSettings,
   setKibanaCommonConfig,
   setKibanaVersion,
   setMapAppConfig,
@@ -52,6 +53,7 @@ import { LicensingPluginSetup, LicensingPluginStart } from '../../licensing/publ
 import { StartContract as FileUploadStartContract } from '../../file_upload/public';
 import { SavedObjectsStart } from '../../../../src/plugins/saved_objects/public';
 import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
+import { MapsLegacyPluginSetup } from '../../../../src/plugins/maps_legacy/public';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -61,6 +63,7 @@ export interface MapsPluginSetupDependencies {
   mapsLegacy: { config: MapsLegacyConfig };
   share: SharePluginSetup;
   licensing: LicensingPluginSetup;
+  mapsLegacy: MapsLegacyPluginSetup;
 }
 
 export interface MapsPluginStartDependencies {
@@ -106,6 +109,8 @@ export class MapsPlugin
     setMapAppConfig(config);
     setKibanaVersion(this._initializerContext.env.packageInfo.version);
 
+    setEMSSettings(plugins.mapsLegacy.emsSettings);
+
     // register url generators
     const getStartServices = async () => {
       const [coreStart] = await core.getStartServices();
