Merge branch 'master' into duplicateTitleWording

elastic · Aug 26, 2020 · 0539205 · 0539205
2 parents cdbd5a3 + 61550b7
commit 0539205
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
@@ -10,7 +10,6 @@ installNode=$1
 
 dir="$(pwd)"
 cacheDir="$HOME/.kibana"
-downloads="$cacheDir/downloads"
 
 RED='\033[0;31m'
 C_RESET='\033[0m' # Reset color
@@ -134,26 +133,6 @@ export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudf
 
 export CHECKS_REPORTER_ACTIVE=false
 
-###
-### Download Chrome and install to this shell
-###
-
-# Available using the version information search at https://omahaproxy.appspot.com/
-chromeVersion=84
-
-mkdir -p "$downloads"
-
-if [ -d $cacheDir/chrome-$chromeVersion/chrome-linux ]; then
-  echo " -- Chrome already downloaded and extracted"
-else
-  mkdir -p "$cacheDir/chrome-$chromeVersion"
-
-  echo " -- Downloading and extracting Chrome"
-  curl -o "$downloads/chrome.zip" -L "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/chrome_$chromeVersion.zip"
-  unzip -o "$downloads/chrome.zip" -d "$cacheDir/chrome-$chromeVersion"
-  export PATH="$cacheDir/chrome-$chromeVersion/chrome-linux:$PATH"
-fi
-
 # This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
 if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"

diff --git a/x-pack/plugins/ingest_manager/server/services/output.ts b/x-pack/plugins/ingest_manager/server/services/output.ts
@@ -15,7 +15,7 @@ let cachedAdminUser: null | { username: string; password: string } = null;
 
 class OutputService {
   public async getDefaultOutput(soClient: SavedObjectsClientContract) {
-    return await soClient.find<Output>({
+    return await soClient.find<OutputSOAttributes>({
       type: OUTPUT_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
@@ -42,6 +42,7 @@ class OutputService {
     }
 
     return {
+      id: outputs.saved_objects[0].id,
       ...outputs.saved_objects[0].attributes,
     };
   }

diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -496,6 +496,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         const results = await legacyClient.callAsInternalUser('ml.updateDataFrameAnalytics', {
           body: request.body,
           analyticsId,
+          ...getAuthorizationHeader(request),
         });
         return response.ok({
           body: results,