From b713a9ca44079ab39b77cd7ed2becb650864a5a8 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Fri, 27 Mar 2020 11:13:25 -0400
Subject: [PATCH 1/3] add cloud-specific logic to remote clusters

---
 .../common/lib/cluster_serialization.test.ts  | 34 ++++++++++
 .../common/lib/cluster_serialization.ts       |  7 +-
 x-pack/plugins/remote_clusters/kibana.json    |  3 +-
 .../public/application/app_context.tsx        | 22 ++++++
 .../public/application/index.js               | 11 +--
 .../remote_cluster_form.test.js.snap          | 15 +++--
 .../remote_cluster_form.js                    | 67 ++++++++++++++++---
 .../remote_cluster_form/validators/index.js   |  1 +
 .../validators/validate_server_name.js        | 21 ++++++
 .../plugins/remote_clusters/public/plugin.ts  |  6 +-
 .../plugins/remote_clusters/public/types.ts   |  2 +
 .../plugins/remote_clusters/server/plugin.ts  |  5 +-
 .../server/routes/api/get_route.ts            |  8 ++-
 .../plugins/remote_clusters/server/types.ts   |  5 ++
 14 files changed, 180 insertions(+), 27 deletions(-)
 create mode 100644 x-pack/plugins/remote_clusters/public/application/app_context.tsx
 create mode 100644 x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js

diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
index 7fd8b4a894989..a204bd44901b7 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.test.ts
@@ -112,6 +112,40 @@ describe('cluster_serialization', () => {
           },
           'localhost:9300'
         )
+      ).toEqual({
+        name: 'test_cluster',
+        proxyAddress: 'localhost:9300',
+        mode: 'proxy',
+        hasDeprecatedProxySetting: true,
+        isConnected: true,
+        connectedNodesCount: 1,
+        maxConnectionsPerCluster: 3,
+        initialConnectTimeout: '30s',
+        skipUnavailable: false,
+        transportPingSchedule: '-1',
+        transportCompress: false,
+      });
+    });
+
+    it('should deserialize a cluster that contains a deprecated proxy address and is in cloud', () => {
+      expect(
+        deserializeCluster(
+          'test_cluster',
+          {
+            seeds: ['localhost:9300'],
+            connected: true,
+            num_nodes_connected: 1,
+            max_connections_per_cluster: 3,
+            initial_connect_timeout: '30s',
+            skip_unavailable: false,
+            transport: {
+              ping_schedule: '-1',
+              compress: false,
+            },
+          },
+          'localhost:9300',
+          true
+        )
       ).toEqual({
         name: 'test_cluster',
         proxyAddress: 'localhost:9300',
diff --git a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
index 3d8ffa13b8218..07dbe8da28d8a 100644
--- a/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
+++ b/x-pack/plugins/remote_clusters/common/lib/cluster_serialization.ts
@@ -68,7 +68,8 @@ export interface ClusterSettingsPayloadEs {
 export function deserializeCluster(
   name: string,
   esClusterObject: ClusterInfoEs,
-  deprecatedProxyAddress?: string | undefined
+  deprecatedProxyAddress?: string | undefined,
+  isCloudEnabled?: boolean | undefined
 ): Cluster {
   if (!name || !esClusterObject || typeof esClusterObject !== 'object') {
     throw new Error('Unable to deserialize cluster');
@@ -117,7 +118,7 @@ export function deserializeCluster(
   // If a user has a remote cluster with the deprecated proxy setting,
   // we transform the data to support the new implementation and also flag the deprecation
   if (deprecatedProxyAddress) {
-    // Create server name (address, without port), since field doesn't exist in deprecated implementation
+    // Cloud-specific logic: Create default server name, since field doesn't exist in deprecated implementation
     const defaultServerName = deprecatedProxyAddress.split(':')[0];
 
     deserializedClusterObject = {
@@ -126,7 +127,7 @@ export function deserializeCluster(
       seeds: undefined,
       hasDeprecatedProxySetting: true,
       mode: PROXY_MODE,
-      serverName: defaultServerName,
+      serverName: isCloudEnabled ? defaultServerName : undefined,
     };
   }
 
diff --git a/x-pack/plugins/remote_clusters/kibana.json b/x-pack/plugins/remote_clusters/kibana.json
index 8922bf621aa03..f1b9d20f762d3 100644
--- a/x-pack/plugins/remote_clusters/kibana.json
+++ b/x-pack/plugins/remote_clusters/kibana.json
@@ -11,7 +11,8 @@
     "indexManagement"
   ],
   "optionalPlugins": [
-    "usageCollection"
+    "usageCollection",
+    "cloud"
   ],
   "server": true,
   "ui": true
diff --git a/x-pack/plugins/remote_clusters/public/application/app_context.tsx b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
new file mode 100644
index 0000000000000..86c0b401d416d
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/app_context.tsx
@@ -0,0 +1,22 @@
+/*
+ * 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 React, { createContext } from 'react';
+
+export interface Context {
+  isCloudEnabled: boolean;
+}
+
+export const AppContext = createContext<Context>({} as any);
+
+export const AppContextProvider = ({
+  children,
+  context,
+}: {
+  children: React.ReactNode;
+  context: Context;
+}) => {
+  return <AppContext.Provider value={context}>{children}</AppContext.Provider>;
+};
diff --git a/x-pack/plugins/remote_clusters/public/application/index.js b/x-pack/plugins/remote_clusters/public/application/index.js
index 0b8b26ace5daa..f2d788c741342 100644
--- a/x-pack/plugins/remote_clusters/public/application/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/index.js
@@ -11,14 +11,17 @@ import { Provider } from 'react-redux';
 
 import { App } from './app';
 import { remoteClustersStore } from './store';
+import { AppContextProvider } from './app_context';
 
-export const renderApp = (elem, I18nContext) => {
+export const renderApp = (elem, I18nContext, appDependencies) => {
   render(
     <I18nContext>
       <Provider store={remoteClustersStore}>
-        <HashRouter>
-          <App />
-        </HashRouter>
+        <AppContextProvider context={appDependencies}>
+          <HashRouter>
+            <App />
+          </HashRouter>
+        </AppContextProvider>
       </Provider>
     </I18nContext>,
     elem
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index 6ff8c538ca89c..4c109c557fdb0 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -5,7 +5,6 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
   disabledFields={Object {}}
   fields={
     Object {
-      "mode": "sniff",
       "name": "",
       "nodeConnections": 3,
       "proxyAddress": "",
@@ -805,6 +804,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                     data-test-subj="remoteClusterFormServerNameFormRow"
                     describedByIds={Array []}
                     display="row"
+                    error={null}
                     fullWidth={true}
                     hasChildLabel={true}
                     hasEmptyLabelSpace={false}
@@ -827,10 +827,11 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                         }
                       />
                     }
+                    isInvalid={false}
                     label={
                       <FormattedMessage
                         defaultMessage="Server name (optional)"
-                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
                         values={Object {}}
                       />
                     }
@@ -845,18 +846,21 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                         className="euiFormRow__labelWrapper"
                       >
                         <EuiFormLabel
+                          aria-invalid={false}
                           className="euiFormRow__label"
                           htmlFor="mockId"
                           isFocused={false}
+                          isInvalid={false}
                           type="label"
                         >
                           <label
+                            aria-invalid={false}
                             className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
                           >
                             <FormattedMessage
                               defaultMessage="Server name (optional)"
-                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
                               values={Object {}}
                             >
                               Server name (optional)
@@ -871,6 +875,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                           aria-describedby="mockId-help"
                           fullWidth={true}
                           id="mockId"
+                          isInvalid={false}
                           onBlur={[Function]}
                           onChange={[Function]}
                           onFocus={[Function]}
@@ -886,7 +891,9 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                               <div
                                 className="euiFormControlLayout__childrenWrapper"
                               >
-                                <EuiValidatableControl>
+                                <EuiValidatableControl
+                                  isInvalid={false}
+                                >
                                   <input
                                     aria-describedby="mockId-help"
                                     className="euiFieldText euiFieldText--fullWidth"
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index 7d3ed0708ae54..c98bd73bf83a0 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -42,15 +42,22 @@ import {
 
 import { RequestFlyout } from './request_flyout';
 
-import { validateName, validateSeeds, validateProxy, validateSeed } from './validators';
+import {
+  validateName,
+  validateSeeds,
+  validateProxy,
+  validateSeed,
+  validateServerName,
+} from './validators';
 
 import { SNIFF_MODE, PROXY_MODE } from '../../../../../common/constants';
 
+import { AppContext } from '../../../app_context';
+
 const defaultFields = {
   name: '',
   seeds: [],
   skipUnavailable: false,
-  mode: SNIFF_MODE,
   nodeConnections: 3,
   proxyAddress: '',
   proxySocketConnections: 18,
@@ -75,11 +82,17 @@ export class RemoteClusterForm extends Component {
     disabledFields: {},
   };
 
-  constructor(props) {
-    super(props);
+  static contextType = AppContext;
+
+  constructor(props, context) {
+    super(props, context);
 
     const { fields, disabledFields } = props;
-    const fieldsState = merge({}, defaultFields, fields);
+    const { isCloudEnabled } = context;
+
+    // Connection mode should default to "proxy" in cloud
+    const defaultMode = isCloudEnabled ? PROXY_MODE : SNIFF_MODE;
+    const fieldsState = merge({}, { ...defaultFields, mode: defaultMode }, fields);
 
     this.generateId = htmlIdGenerator();
     this.state = {
@@ -100,12 +113,15 @@ export class RemoteClusterForm extends Component {
   };
 
   getFieldsErrors(fields, seedInput = '') {
-    const { name, seeds, mode, proxyAddress } = fields;
+    const { name, seeds, mode, proxyAddress, serverName } = fields;
+    const { isCloudEnabled } = this.context;
 
     return {
       name: validateName(name),
       seeds: mode === SNIFF_MODE ? validateSeeds(seeds, seedInput) : null,
       proxyAddress: mode === PROXY_MODE ? validateProxy(proxyAddress) : null,
+      // server name is only required in cloud when proxy mode is enabled
+      serverName: isCloudEnabled && mode === PROXY_MODE ? validateServerName(serverName) : null,
     };
   }
 
@@ -349,9 +365,11 @@ export class RemoteClusterForm extends Component {
     const {
       areErrorsVisible,
       fields: { proxyAddress, proxySocketConnections, serverName },
-      fieldsErrors: { proxyAddress: errorProxyAddress },
+      fieldsErrors: { proxyAddress: errorProxyAddress, serverName: errorServerName },
     } = this.state;
 
+    const { isCloudEnabled } = this.context;
+
     return (
       <>
         <EuiFormRow
@@ -413,11 +431,20 @@ export class RemoteClusterForm extends Component {
         </EuiFormRow>
         <EuiFormRow
           data-test-subj="remoteClusterFormServerNameFormRow"
+          isInvalid={Boolean(areErrorsVisible && errorServerName)}
+          error={errorServerName}
           label={
-            <FormattedMessage
-              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
-              defaultMessage="Server name (optional)"
-            />
+            isCloudEnabled ? (
+              <FormattedMessage
+                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameRequiredLabel"
+                defaultMessage="Server name"
+              />
+            ) : (
+              <FormattedMessage
+                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameOptionalLabel"
+                defaultMessage="Server name (optional)"
+              />
+            )
           }
           helpText={
             <FormattedMessage
@@ -440,6 +467,7 @@ export class RemoteClusterForm extends Component {
           <EuiFieldText
             value={serverName}
             onChange={e => this.onFieldsChange({ serverName: e.target.value })}
+            isInvalid={Boolean(areErrorsVisible && errorServerName)}
             fullWidth
           />
         </EuiFormRow>
@@ -452,6 +480,8 @@ export class RemoteClusterForm extends Component {
       fields: { mode },
     } = this.state;
 
+    const { isCloudEnabled } = this.context;
+
     return (
       <EuiDescribedFormGroup
         title={
@@ -485,6 +515,21 @@ export class RemoteClusterForm extends Component {
                 }
               />
             </EuiFormRow>
+            {isCloudEnabled && mode === PROXY_MODE ? (
+              <>
+                <EuiSpacer size="s" />
+                <EuiCallOut
+                  title={
+                    <FormattedMessage
+                      id="xpack.remoteClusters.cloudClusterInformationTitle"
+                      defaultMessage="You can find the proxy address and server name of your cluster in the Security section of your deployment."
+                    />
+                  }
+                  iconType="pin"
+                  size="s"
+                />
+              </>
+            ) : null}
           </>
         }
         fullWidth
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
index ec5f0b1166ce5..a731da362382b 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/index.js
@@ -8,3 +8,4 @@ export { validateName } from './validate_name';
 export { validateProxy } from './validate_proxy';
 export { validateSeeds } from './validate_seeds';
 export { validateSeed } from './validate_seed';
+export { validateServerName } from './validate_server_name';
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js
new file mode 100644
index 0000000000000..197d36445d756
--- /dev/null
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/validators/validate_server_name.js
@@ -0,0 +1,21 @@
+/*
+ * 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 React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export function validateServerName(serverName) {
+  if (!serverName || !serverName.trim()) {
+    return (
+      <FormattedMessage
+        id="xpack.remoteClusters.form.errors.serverNameMissing"
+        defaultMessage="A server name is required."
+      />
+    );
+  }
+
+  return null;
+}
diff --git a/x-pack/plugins/remote_clusters/public/plugin.ts b/x-pack/plugins/remote_clusters/public/plugin.ts
index 0fc70cdb60f95..d110c461c1e3f 100644
--- a/x-pack/plugins/remote_clusters/public/plugin.ts
+++ b/x-pack/plugins/remote_clusters/public/plugin.ts
@@ -19,7 +19,7 @@ export class RemoteClustersUIPlugin implements Plugin<void, void, Dependencies,
 
   setup(
     { notifications: { toasts }, http, getStartServices }: CoreSetup,
-    { management, usageCollection }: Dependencies
+    { management, usageCollection, cloud }: Dependencies
   ) {
     const {
       ui: { enabled: isRemoteClustersUiEnabled },
@@ -48,8 +48,10 @@ export class RemoteClustersUIPlugin implements Plugin<void, void, Dependencies,
           initNotification(toasts, fatalErrors);
           initHttp(http);
 
+          const isCloudEnabled = Boolean(cloud?.isCloudEnabled);
+
           const { renderApp } = await import('./application');
-          return renderApp(element, i18nContext);
+          return renderApp(element, i18nContext, { isCloudEnabled });
         },
       });
     }
diff --git a/x-pack/plugins/remote_clusters/public/types.ts b/x-pack/plugins/remote_clusters/public/types.ts
index cee65f40c44ee..933cb54e3b29e 100644
--- a/x-pack/plugins/remote_clusters/public/types.ts
+++ b/x-pack/plugins/remote_clusters/public/types.ts
@@ -8,10 +8,12 @@ import { ManagementSetup } from 'src/plugins/management/public';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 import { RegisterManagementAppArgs } from 'src/plugins/management/public';
 import { I18nStart } from 'kibana/public';
+import { CloudSetup } from '../../cloud/public';
 
 export interface Dependencies {
   management: ManagementSetup;
   usageCollection: UsageCollectionSetup;
+  cloud: CloudSetup;
 }
 
 export interface ClientConfigType {
diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts
index 9461503a59c70..837d53c7dbc1b 100644
--- a/x-pack/plugins/remote_clusters/server/plugin.ts
+++ b/x-pack/plugins/remote_clusters/server/plugin.ts
@@ -32,7 +32,7 @@ export class RemoteClustersServerPlugin implements Plugin<void, void, any, any>
 
   async setup(
     { http, elasticsearch: elasticsearchService }: CoreSetup,
-    { licensing }: Dependencies
+    { licensing, cloud }: Dependencies
   ) {
     const elasticsearch = await elasticsearchService.adminClient;
     const router = http.createRouter();
@@ -41,6 +41,9 @@ export class RemoteClustersServerPlugin implements Plugin<void, void, any, any>
       elasticsearchService,
       router,
       getLicenseStatus: () => this.licenseStatus,
+      config: {
+        isCloudEnabled: Boolean(cloud?.isCloudEnabled),
+      },
     };
 
     // Register routes
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
index 8938f342674f0..078e1073d1568 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.ts
@@ -33,6 +33,7 @@ export const register = (deps: RouteDependencies): void => {
         const cluster = clustersByName[clusterName];
         const isTransient = transientClusterNames.includes(clusterName);
         const isPersistent = persistentClusterNames.includes(clusterName);
+        const { config } = deps;
 
         // If the cluster hasn't been stored in the cluster state, then it's defined by the
         // node's config file.
@@ -46,7 +47,12 @@ export const register = (deps: RouteDependencies): void => {
           : undefined;
 
         return {
-          ...deserializeCluster(clusterName, cluster, deprecatedProxyAddress),
+          ...deserializeCluster(
+            clusterName,
+            cluster,
+            deprecatedProxyAddress,
+            config.isCloudEnabled
+          ),
           isConfiguredByNode,
         };
       });
diff --git a/x-pack/plugins/remote_clusters/server/types.ts b/x-pack/plugins/remote_clusters/server/types.ts
index 708b1daf4bbad..85678cba92f19 100644
--- a/x-pack/plugins/remote_clusters/server/types.ts
+++ b/x-pack/plugins/remote_clusters/server/types.ts
@@ -6,9 +6,11 @@
 
 import { IRouter, ElasticsearchServiceSetup, IClusterClient } from 'kibana/server';
 import { LicensingPluginSetup } from '../../licensing/server';
+import { CloudSetup } from '../../cloud/server';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;
+  cloud: CloudSetup;
 }
 
 export interface RouteDependencies {
@@ -16,6 +18,9 @@ export interface RouteDependencies {
   getLicenseStatus: () => LicenseStatus;
   elasticsearchService: ElasticsearchServiceSetup;
   elasticsearch: IClusterClient;
+  config: {
+    isCloudEnabled: boolean;
+  };
 }
 
 export interface LicenseStatus {

From 097d0850b93da4754d45553e2e5037f7b6c01624 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Fri, 27 Mar 2020 12:38:15 -0400
Subject: [PATCH 2/3] fix TS

---
 x-pack/plugins/remote_clusters/public/application/index.d.ts | 5 ++++-
 .../remote_clusters/server/routes/api/add_route.test.ts      | 3 +++
 .../remote_clusters/server/routes/api/delete_route.test.ts   | 3 +++
 .../remote_clusters/server/routes/api/get_route.test.ts      | 3 +++
 .../remote_clusters/server/routes/api/update_route.test.ts   | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/remote_clusters/public/application/index.d.ts b/x-pack/plugins/remote_clusters/public/application/index.d.ts
index b5c5ad5522134..b021dca51bacd 100644
--- a/x-pack/plugins/remote_clusters/public/application/index.d.ts
+++ b/x-pack/plugins/remote_clusters/public/application/index.d.ts
@@ -8,5 +8,8 @@ import { RegisterManagementAppArgs, I18nStart } from '../types';
 
 export declare const renderApp: (
   elem: HTMLElement | null,
-  I18nContext: I18nStart['Context']
+  I18nContext: I18nStart['Context'],
+  appDependencies: {
+    isCloudEnabled?: boolean;
+  }
 ) => ReturnType<RegisterManagementAppArgs['mount']>;
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
index 34d741aa4b7da..2b8b3bf1a5e59 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/add_route.test.ts
@@ -34,6 +34,9 @@ describe('ADD remote clusters', () => {
         getLicenseStatus: () => licenseCheckResult,
         elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
         elasticsearch: elasticsearchMock,
+        config: {
+          isCloudEnabled: false,
+        },
       };
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
index ec14336da08d4..69f84b7ef5e16 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/delete_route.test.ts
@@ -36,6 +36,9 @@ describe('DELETE remote clusters', () => {
         getLicenseStatus: () => licenseCheckResult,
         elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
         elasticsearch: elasticsearchMock,
+        config: {
+          isCloudEnabled: false,
+        },
       };
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
index d81b50f1148de..deaf251c80c17 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/get_route.test.ts
@@ -35,6 +35,9 @@ describe('GET remote clusters', () => {
         getLicenseStatus: () => licenseCheckResult,
         elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
         elasticsearch: elasticsearchMock,
+        config: {
+          isCloudEnabled: false,
+        },
       };
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
index 84ba9587ddfa6..12665c6be7949 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
@@ -43,6 +43,9 @@ describe('UPDATE remote clusters', () => {
         getLicenseStatus: () => licenseCheckResult,
         elasticsearchService: elasticsearchServiceMock.createInternalSetup(),
         elasticsearch: elasticsearchMock,
+        config: {
+          isCloudEnabled: false,
+        },
       };
 
       const mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();

From 64226f86f82192c65b761e11dd4e512da445485c Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Fri, 27 Mar 2020 14:18:56 -0400
Subject: [PATCH 3/3] fix schema validation for update_route + add test

---
 .../server/routes/api/update_route.test.ts    | 79 +++++++++++++++++++
 .../server/routes/api/update_route.ts         |  1 +
 2 files changed, 80 insertions(+)

diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
index 12665c6be7949..b2a443c41fbf9 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts
@@ -174,6 +174,85 @@ describe('UPDATE remote clusters', () => {
         },
       },
     });
+    updateRemoteClustersTest('updates v1 proxy cluster', {
+      apiResponses: [
+        async () => ({
+          test: {
+            connected: true,
+            initial_connect_timeout: '30s',
+            skip_unavailable: false,
+            seeds: ['127.0.0.1:9300'],
+          },
+        }),
+        async () => ({
+          acknowledged: true,
+          persistent: {
+            cluster: {
+              remote: {
+                test: {
+                  connected: true,
+                  proxy_address: '127.0.0.1:9300',
+                  initial_connect_timeout: '30s',
+                  skip_unavailable: true,
+                  mode: 'proxy',
+                  proxy_socket_connections: 18,
+                },
+              },
+            },
+          },
+          transient: {},
+        }),
+      ],
+      params: {
+        name: 'test',
+      },
+      payload: {
+        proxyAddress: '127.0.0.1:9300',
+        skipUnavailable: true,
+        mode: 'proxy',
+        hasDeprecatedProxySetting: true,
+        serverName: '',
+        proxySocketConnections: 18,
+      },
+      asserts: {
+        apiArguments: [
+          ['cluster.remoteInfo'],
+          [
+            'cluster.putSettings',
+            {
+              body: {
+                persistent: {
+                  cluster: {
+                    remote: {
+                      test: {
+                        proxy_address: '127.0.0.1:9300',
+                        skip_unavailable: true,
+                        mode: 'proxy',
+                        node_connections: null,
+                        seeds: null,
+                        proxy_socket_connections: 18,
+                        server_name: null,
+                        proxy: null,
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          ],
+        ],
+        statusCode: 200,
+        result: {
+          initialConnectTimeout: '30s',
+          isConfiguredByNode: false,
+          isConnected: true,
+          proxyAddress: '127.0.0.1:9300',
+          name: 'test',
+          skipUnavailable: true,
+          mode: 'proxy',
+        },
+      },
+    });
   });
 
   describe('failure', () => {
diff --git a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
index 47b0d4ad2def2..02a63783154df 100644
--- a/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
+++ b/x-pack/plugins/remote_clusters/server/routes/api/update_route.ts
@@ -24,6 +24,7 @@ const bodyValidation = schema.object({
   proxyAddress: schema.nullable(schema.string()),
   proxySocketConnections: schema.nullable(schema.number()),
   serverName: schema.nullable(schema.string()),
+  hasDeprecatedProxySetting: schema.maybe(schema.boolean()),
 });
 
 const paramsValidation = schema.object({