From f331d64bca854d9c68db3c9670ce38a7cc73920f Mon Sep 17 00:00:00 2001
From: Dominique Clarke <doclarke71@gmail.com>
Date: Thu, 13 May 2021 16:15:59 -0400
Subject: [PATCH] [Uptime] [Synthetics Integration] ensure that proxy url is
 not overwritten (#99944)

---
 .../synthetics_policy_create_extension.tsx    |  7 ++-
 ...s_policy_create_extension_wrapper.test.tsx | 58 +++++++++++++++++--
 .../synthetics_policy_edit_extension.tsx      |  7 ++-
 ...ics_policy_edit_extension_wrapper.test.tsx | 54 ++++++++++++++++-
 4 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
index 51585e227b56e..1306308f8ba4e 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension.tsx
@@ -9,7 +9,7 @@ import React, { memo, useContext, useEffect } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
 import { PackagePolicyCreateExtensionComponentProps } from '../../../../fleet/public';
 import { useTrackPageview } from '../../../../observability/public';
-import { Config, ConfigKeys } from './types';
+import { Config, ConfigKeys, DataStream } from './types';
 import {
   SimpleFieldsContext,
   HTTPAdvancedFieldsContext,
@@ -63,6 +63,11 @@ export const SyntheticsPolicyCreateExtension = memo<PackagePolicyCreateExtension
           ...httpAdvancedFields,
           ...tcpAdvancedFields,
           ...tlsFields,
+          // ensure proxyUrl is not overwritten
+          [ConfigKeys.PROXY_URL]:
+            simpleFields[ConfigKeys.MONITOR_TYPE] === DataStream.HTTP
+              ? httpAdvancedFields[ConfigKeys.PROXY_URL]
+              : tcpAdvancedFields[ConfigKeys.PROXY_URL],
         }));
       },
       250,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
index ff05636e7774b..a16f2ba87d79a 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_create_extension_wrapper.test.tsx
@@ -70,8 +70,8 @@ const defaultNewPolicy: NewPackagePolicy = {
               type: 'text',
             },
             timeout: {
-              value: 1600,
-              type: 'integer',
+              value: '16s',
+              type: 'text',
             },
             max_redirects: {
               value: 0,
@@ -173,7 +173,7 @@ const defaultNewPolicy: NewPackagePolicy = {
               type: 'text',
             },
             timeout: {
-              type: 'integer',
+              type: 'text',
             },
             max_redirects: {
               type: 'integer',
@@ -246,7 +246,7 @@ const defaultNewPolicy: NewPackagePolicy = {
               type: 'text',
             },
             timeout: {
-              type: 'integer',
+              type: 'text',
             },
             max_redirects: {
               type: 'integer',
@@ -311,7 +311,7 @@ describe('<SyntheticsPolicyCreateExtension />', () => {
     });
   });
 
-  it('handles updating each field', async () => {
+  it('handles updating fields', async () => {
     const { getByLabelText } = render(<WrappedComponent />);
     const url = getByLabelText('URL') as HTMLInputElement;
     const proxyUrl = getByLabelText('Proxy URL') as HTMLInputElement;
@@ -336,6 +336,54 @@ describe('<SyntheticsPolicyCreateExtension />', () => {
     expect(apmServiceName.value).toEqual('APM Service');
     expect(maxRedirects.value).toEqual('2');
     expect(timeout.value).toEqual('3');
+
+    await waitFor(() => {
+      expect(onChange).toBeCalledWith({
+        isValid: true,
+        updatedPolicy: {
+          ...defaultNewPolicy,
+          inputs: [
+            {
+              ...defaultNewPolicy.inputs[0],
+              streams: [
+                {
+                  ...defaultNewPolicy.inputs[0].streams[0],
+                  vars: {
+                    ...defaultNewPolicy.inputs[0].streams[0].vars,
+                    urls: {
+                      value: 'http://elastic.co',
+                      type: 'text',
+                    },
+                    proxy_url: {
+                      value: 'http://proxy.co',
+                      type: 'text',
+                    },
+                    schedule: {
+                      value: '"@every 1m"',
+                      type: 'text',
+                    },
+                    'service.name': {
+                      value: 'APM Service',
+                      type: 'text',
+                    },
+                    max_redirects: {
+                      value: '2',
+                      type: 'integer',
+                    },
+                    timeout: {
+                      value: '3s',
+                      type: 'text',
+                    },
+                  },
+                },
+              ],
+            },
+            defaultNewPolicy.inputs[1],
+            defaultNewPolicy.inputs[2],
+          ],
+        },
+      });
+    });
   });
 
   it('handles calling onChange', async () => {
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
index 386d99add87b6..e29a5c6a363ed 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension.tsx
@@ -15,7 +15,7 @@ import {
   TCPAdvancedFieldsContext,
   TLSFieldsContext,
 } from './contexts';
-import { Config, ConfigKeys } from './types';
+import { Config, ConfigKeys, DataStream } from './types';
 import { CustomFields } from './custom_fields';
 import { useUpdatePolicy } from './use_update_policy';
 import { validate } from './validation';
@@ -48,6 +48,11 @@ export const SyntheticsPolicyEditExtension = memo<SyntheticsPolicyEditExtensionP
           ...httpAdvancedFields,
           ...tcpAdvancedFields,
           ...tlsFields,
+          // ensure proxyUrl is not overwritten
+          [ConfigKeys.PROXY_URL]:
+            simpleFields[ConfigKeys.MONITOR_TYPE] === DataStream.HTTP
+              ? httpAdvancedFields[ConfigKeys.PROXY_URL]
+              : tcpAdvancedFields[ConfigKeys.PROXY_URL],
         }));
       },
       250,
diff --git a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
index 03e0b338dfd72..e6981b9a850e1 100644
--- a/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
+++ b/x-pack/plugins/uptime/public/components/fleet_package/synthetics_policy_edit_extension_wrapper.test.tsx
@@ -173,7 +173,7 @@ const defaultNewPolicy: NewPackagePolicy = {
               type: 'text',
             },
             timeout: {
-              type: 'integer',
+              type: 'text',
             },
             max_redirects: {
               type: 'integer',
@@ -247,7 +247,7 @@ const defaultNewPolicy: NewPackagePolicy = {
               type: 'text',
             },
             timeout: {
-              type: 'integer',
+              type: 'text',
             },
             max_redirects: {
               type: 'integer',
@@ -339,7 +339,7 @@ describe('<SyntheticsPolicyEditExtension />', () => {
     expect(queryByLabelText('Monitor type')).not.toBeInTheDocument();
   });
 
-  it('handles updating each field', async () => {
+  it('handles updating fields', async () => {
     const { getByLabelText } = render(<WrappedComponent />);
     const url = getByLabelText('URL') as HTMLInputElement;
     const proxyUrl = getByLabelText('Proxy URL') as HTMLInputElement;
@@ -364,6 +364,54 @@ describe('<SyntheticsPolicyEditExtension />', () => {
     expect(apmServiceName.value).toEqual('APM Service');
     expect(maxRedirects.value).toEqual('2');
     expect(timeout.value).toEqual('3');
+
+    await waitFor(() => {
+      expect(onChange).toBeCalledWith({
+        isValid: true,
+        updatedPolicy: {
+          ...defaultNewPolicy,
+          inputs: [
+            {
+              ...defaultNewPolicy.inputs[0],
+              streams: [
+                {
+                  ...defaultNewPolicy.inputs[0].streams[0],
+                  vars: {
+                    ...defaultNewPolicy.inputs[0].streams[0].vars,
+                    urls: {
+                      value: 'http://elastic.co',
+                      type: 'text',
+                    },
+                    proxy_url: {
+                      value: 'http://proxy.co',
+                      type: 'text',
+                    },
+                    schedule: {
+                      value: '"@every 1m"',
+                      type: 'text',
+                    },
+                    'service.name': {
+                      value: 'APM Service',
+                      type: 'text',
+                    },
+                    max_redirects: {
+                      value: '2',
+                      type: 'integer',
+                    },
+                    timeout: {
+                      value: '3s',
+                      type: 'text',
+                    },
+                  },
+                },
+              ],
+            },
+            defaultNewPolicy.inputs[1],
+            defaultNewPolicy.inputs[2],
+          ],
+        },
+      });
+    });
   });
 
   it('handles calling onChange', async () => {