fix schema validation for update_route + add test

elastic · Mar 27, 2020 · 64226f8 · 64226f8
1 parent 097d085
commit 64226f8
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 0 deletions.
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
@@ -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
@@ -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({