From 151a3f6b362059f8113a2c32f885a962856080de Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Tue, 28 Jul 2020 15:56:46 -0600
Subject: [PATCH] Remove deprecated portions from config and tests

---
 .../public/map/service_settings.test.js        | 18 ++++--------------
 .../__tests__/region_map_visualization.js      |  8 ++------
 src/plugins/tile_map/config.ts                 |  9 ---------
 .../__tests__/coordinate_maps_visualization.js |  8 ++------
 src/plugins/tile_map/server/index.ts           |  1 -
 5 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/src/plugins/maps_legacy/public/map/service_settings.test.js b/src/plugins/maps_legacy/public/map/service_settings.test.js
index c89bf51e04bcd..b924c3bb53056 100644
--- a/src/plugins/maps_legacy/public/map/service_settings.test.js
+++ b/src/plugins/maps_legacy/public/map/service_settings.test.js
@@ -156,13 +156,8 @@ describe('service_settings (FKA tile_map test)', function () {
         serviceSettings = makeServiceSettings(
           {},
           {
-            deprecated: {
-              isOverridden: true,
-              config: {
-                url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                options: { minZoom: 0, maxZoom: 20 },
-              },
-            },
+            url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            options: { minZoom: 0, maxZoom: 20 },
           }
         );
 
@@ -247,13 +242,8 @@ describe('service_settings (FKA tile_map test)', function () {
             includeElasticMapsService: false,
           },
           {
-            deprecated: {
-              isOverridden: true,
-              config: {
-                url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                options: { minZoom: 0, maxZoom: 20 },
-              },
-            },
+            url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            options: { minZoom: 0, maxZoom: 20 },
           }
         );
         const tilemapServices = await serviceSettings.getTMSServices();
diff --git a/src/plugins/region_map/public/__tests__/region_map_visualization.js b/src/plugins/region_map/public/__tests__/region_map_visualization.js
index 0a2a18c7cef4f..648193e8e2490 100644
--- a/src/plugins/region_map/public/__tests__/region_map_visualization.js
+++ b/src/plugins/region_map/public/__tests__/region_map_visualization.js
@@ -111,12 +111,8 @@ describe('RegionMapsVisualizationTests', function () {
         emsLandingPageUrl: '',
       };
       const tilemapsConfig = {
-        deprecated: {
-          config: {
-            options: {
-              attribution: '123',
-            },
-          },
+        options: {
+          attribution: '123',
         },
       };
       const serviceSettings = new ServiceSettings(mapConfig, tilemapsConfig);
diff --git a/src/plugins/tile_map/config.ts b/src/plugins/tile_map/config.ts
index 435e52103d156..e754c84291116 100644
--- a/src/plugins/tile_map/config.ts
+++ b/src/plugins/tile_map/config.ts
@@ -21,15 +21,6 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   url: schema.maybe(schema.string()),
-  deprecated: schema.any({
-    defaultValue: {
-      config: {
-        options: {
-          attribution: '',
-        },
-      },
-    },
-  }),
   options: schema.object({
     attribution: schema.string({ defaultValue: '' }),
     minZoom: schema.number({ defaultValue: 0, min: 0 }),
diff --git a/src/plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
index 9ff25ce674d3d..f2830e58e0eea 100644
--- a/src/plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
+++ b/src/plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -98,12 +98,8 @@ describe('CoordinateMapsVisualizationTest', function () {
         emsLandingPageUrl: '',
       };
       const tilemapsConfig = {
-        deprecated: {
-          config: {
-            options: {
-              attribution: '123',
-            },
-          },
+        options: {
+          attribution: '123',
         },
       };
 
diff --git a/src/plugins/tile_map/server/index.ts b/src/plugins/tile_map/server/index.ts
index 3381553fe9364..4bf8c98c99d2c 100644
--- a/src/plugins/tile_map/server/index.ts
+++ b/src/plugins/tile_map/server/index.ts
@@ -23,7 +23,6 @@ import { configSchema, ConfigSchema } from '../config';
 export const config: PluginConfigDescriptor<ConfigSchema> = {
   exposeToBrowser: {
     url: true,
-    deprecated: true,
     options: true,
   },
   schema: configSchema,