Fixed tests and some changes due to comments

elastic · Aug 14, 2020 · bb9fcac · bb9fcac
1 parent 2dacff0
commit bb9fcac
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts
@@ -15,7 +15,7 @@ export function getProxyAgent(
 ): HttpsProxyAgent | HttpProxyAgent {
   logger.debug(`Create proxy agent for ${proxySettings.proxyUrl}.`);
 
-  if (/^https/.test(proxySettings.proxyUrl)) {
+  if (/^https/i.test(proxySettings.proxyUrl)) {
     const proxyUrl = new URL(proxySettings.proxyUrl);
     return new HttpsProxyAgent({
       host: proxyUrl.hostname,

diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -129,7 +129,7 @@ async function slackExecutor(
     });
     result = await webhook.send(message);
   } catch (err) {
-    logger.warn(`error on ${actionId} slack event: ${err.message}`);
+    logger.error(`error on ${actionId} slack event: ${err.message}`);
 
     if (err.original == null || err.original.response == null) {
       return serviceErrorResult(actionId, err.message);
@@ -161,7 +161,7 @@ async function slackExecutor(
         },
       }
     );
-    logger.warn(`error on ${actionId} slack action: ${errMessage}`);
+    logger.error(`error on ${actionId} slack action: ${errMessage}`);
 
     return errorResult(actionId, errMessage);
   }

diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -165,7 +165,7 @@ export async function executor(
     if (error.response) {
       const { status, statusText, headers: responseHeaders } = error.response;
       const message = `[${status}] ${statusText}`;
-      logger.warn(`error on ${actionId} webhook event: ${message}`);
+      logger.error(`error on ${actionId} webhook event: ${message}`);
       // The request was made and the server responded with a status code
       // that falls out of the range of 2xx
       // special handling for 5xx
@@ -184,7 +184,7 @@ export async function executor(
       return errorResultInvalid(actionId, message);
     }
 
-    logger.warn(`error on ${actionId} webhook action: unexpected error`);
+    logger.error(`error on ${actionId} webhook action: unexpected error`);
     return errorResultUnexpectedError(actionId);
   }
 }

diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -42,7 +42,6 @@ actionExecutor.initialize({
   encryptedSavedObjectsClient,
   eventLogger: eventLoggerMock.create(),
   preconfiguredActions: [],
-  rejectUnauthorizedCertificates: true,
 });
 
 beforeEach(() => {
@@ -315,7 +314,6 @@ test('throws an error when passing isESOUsingEphemeralEncryptionKey with value o
     encryptedSavedObjectsClient,
     eventLogger: eventLoggerMock.create(),
     preconfiguredActions: [],
-    rejectUnauthorizedCertificates: true,
   });
   await expect(
     customActionExecutor.execute(executeParams)

diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
@@ -59,8 +59,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     );
 
     const actionsProxyUrl = options.enableActionsProxy
-      ? `http://localhost:${await getPort()}`
-      : undefined;
+      ? [`--xpack.actions.proxyUrl=http://localhost:${await getPort()}`]
+      : [];
 
     return {
       testFiles: [require.resolve(`../${name}/tests/`)],
@@ -91,8 +91,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           ])}`,
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
-          `--xpack.actions.proxyUrl=${actionsProxyUrl}`,
+          ...actionsProxyUrl,
           '--xpack.actions.rejectUnauthorizedCertificates=false',
+
           '--xpack.eventLog.logEntries=true',
           `--xpack.actions.preconfigured=${JSON.stringify({
             'my-slack1': {

diff --git a/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts b/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
@@ -22,9 +22,9 @@ export const getHttpProxyServer = (
 };
 
 export const getProxyUrl = (kbnTestServerConfig: any) => {
-  const proxySlackSimulatorURL = kbnTestServerConfig
+  const proxyUrl = kbnTestServerConfig
     .find((val: string) => val.startsWith('--xpack.actions.proxyUrl='))
     .replace('--xpack.actions.proxyUrl=', '');
 
-  return new URL(proxySlackSimulatorURL);
+  return new URL(proxyUrl);
 };
diff --git a/...lerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/...lerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -229,7 +229,7 @@ export default function webhookTest({ getService }: FtrProviderContext) {
         .expect(200);
 
       expect(result.status).to.eql('error');
-      expect(result.message).to.match(/error calling webhook, unexpected error/);
+      expect(result.message).to.match(/error calling webhook, retry later/);
     });
 
     it('should handle failing webhook targets', async () => {