Merge branch 'main' into eui-v91.3.0

.buildkite/scripts/lifecycle/pre_command.sh

@@ -142,6 +142,12 @@ export SYNTHETICS_REMOTE_KIBANA_URL
 DEPLOY_TAGGER_SLACK_WEBHOOK_URL=${DEPLOY_TAGGER_SLACK_WEBHOOK_URL:-"$(vault_get kibana-serverless-release-tools DEPLOY_TAGGER_SLACK_WEBHOOK_URL)"}
 export DEPLOY_TAGGER_SLACK_WEBHOOK_URL
 
+GCS_SA_CDN_QA_KEY="$(vault_get gcs-sa-cdn-qa key)"
+export GCS_SA_CDN_QA_KEY
+
+GCS_SA_CDN_QA_BUCKET="$(vault_get gcs-sa-cdn-qa bucket)"
+export GCS_SA_CDN_QA_BUCKET
+
 # Setup Failed Test Reporter Elasticsearch credentials
 {
   TEST_FAILURES_ES_CLOUD_ID=$(vault_get failed_tests_reporter_es cloud_id)

.buildkite/scripts/steps/artifacts/docker_image.sh

@@ -26,7 +26,7 @@ if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
   exit 1
 fi
 
-echo "--- Build images"
+echo "--- Build Kibana"
 node scripts/build \
   --debug \
   --release \
@@ -37,8 +37,7 @@ node scripts/build \
   --skip-docker-ubuntu \
   --skip-docker-ubi \
   --skip-docker-cloud \
-  --skip-docker-contexts \
-  --skip-cdn-assets
+  --skip-docker-contexts
 
 echo "--- Tag images"
 docker rmi "$KIBANA_IMAGE"
@@ -88,12 +87,21 @@ fi
 echo "--- Build dependencies report"
 node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
 
-echo "--- Upload artifacts"
+echo "--- Upload CDN assets"
 cd target
+gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_QA_KEY")
+
+CDN_ASSETS_FOLDER=$(mktemp -d)
+tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
+
+gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_QA_BUCKET/$GIT_ABBREV_COMMIT"
+
+echo "--- Upload archives"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-x86_64.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-linux-aarch64.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image.tar.gz"
 buildkite-agent artifact upload "kibana-$BASE_VERSION-docker-image-aarch64.tar.gz"
+buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
 buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
 cd -
 

.eslintrc.js

@@ -671,7 +671,7 @@ module.exports = {
      */
     {
       files: [
-        'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
+        'packages/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/scroll_into_view_if_necessary.js',
         '**/browser_exec_scripts/**/*.js',
       ],
       rules: {

packages/kbn-ftr-common-functional-ui-services/index.ts

@@ -8,3 +8,15 @@
 
 export { services as commonFunctionalUIServices } from './services/all';
 export type { FtrProviderContext } from './services/ftr_provider_context';
+export { WebElementWrapper } from './services/web_element_wrapper';
+export type {
+  CustomCheerio,
+  CustomCheerioStatic,
+} from './services/web_element_wrapper/custom_cheerio_api';
+export { Browsers } from './services/remote/browsers';
+export {
+  NETWORK_PROFILES,
+  type NetworkOptions,
+  type NetworkProfile,
+} from './services/remote/network_profiles';
+export type { TimeoutOpt } from './types';

packages/kbn-ftr-common-functional-ui-services/services/all.ts

@@ -7,7 +7,11 @@
  */
 
 import { RetryOnStaleProvider } from './retry_on_stale';
+import { RemoteProvider } from './remote';
+import { FindProvider } from './find';
 
 export const services = {
   retryOnStale: RetryOnStaleProvider,
+  __webdriver__: RemoteProvider,
+  find: FindProvider,
 };

test/functional/services/common/find.ts → packages/kbn-ftr-common-functional-ui-services/services/find.ts

@@ -8,10 +8,12 @@
 
 import { WebDriver, WebElement, By, until } from 'selenium-webdriver';
 
-import { Browsers } from '../remote/browsers';
-import { FtrService, FtrProviderContext } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../lib/web_element_wrapper';
-import { TimeoutOpt } from './types';
+import { Browsers } from './remote/browsers';
+import type { FtrProviderContext } from './ftr_provider_context';
+import { WebElementWrapper } from './web_element_wrapper';
+import { TimeoutOpt } from '../types';
+
+import { FtrService } from './ftr_provider_context';
 
 export class FindService extends FtrService {
   private readonly log = this.ctx.getService('log');

packages/kbn-ftr-common-functional-ui-services/services/ftr_provider_context.ts

@@ -7,8 +7,13 @@
  */
 
 import { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
+import { RetryService } from '@kbn/ftr-common-functional-services';
+import { services as commonFunctionalUiServices } from './all';
 
-import type { services } from './all';
+const services = {
+  ...commonFunctionalUiServices,
+  retry: RetryService,
+};
 
 type Services = typeof services;
 

test/functional/services/remote/__tests__/remote_default_window_size.js → packages/kbn-ftr-common-functional-ui-services/services/remote/__tests__/remote_default_window_size.js

@@ -9,9 +9,12 @@
 import { fork } from 'child_process';
 
 import expect from '@kbn/expect';
+import { REPO_ROOT } from '@kbn/repo-info';
 
-const FTR_SCRIPT = require.resolve('../../../../../scripts/functional_test_runner');
-const CONFIG_PATH = require.resolve('./fixtures/several_nested_window_size_changes/config.js');
+const FTR_SCRIPT = require.resolve(`${REPO_ROOT}/scripts/functional_test_runner`);
+const CONFIG_PATH = require.resolve(
+  `${REPO_ROOT}/packages/kbn-ftr-common-functional-ui-services/services/remote/__tests__/fixtures/several_nested_window_size_changes/config.js`
+);
 const SECOND = 1000;
 
 const DEFAULT_SIZE = { width: 1600, height: 1000 };

test/functional/services/remote/index.ts → packages/kbn-ftr-common-functional-ui-services/services/remote/index.ts

@@ -7,3 +7,5 @@
  */
 
 export { RemoteProvider } from './remote';
+export { Browsers } from './browsers';
+export { NETWORK_PROFILES, type NetworkOptions, type NetworkProfile } from './network_profiles';

test/functional/services/remote/remote.ts → packages/kbn-ftr-common-functional-ui-services/services/remote/remote.ts

@@ -7,7 +7,7 @@
  */
 
 import { NoSuchSessionError, NoSuchWindowError } from 'selenium-webdriver/lib/error';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 import { initWebDriver, BrowserConfig } from './webdriver';
 import { Browsers } from './browsers';
 

test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js → packages/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/scroll_into_view_if_necessary.js

@@ -1,4 +1,4 @@
-/* eslint-disable @kbn/eslint/require-license-header */
+/* eslint-disable @kbn/eslint/require-license-header, no-var */
 
 /* @notice
  * Based on the scroll-into-view-if-necessary module from npm

test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts → packages/kbn-ftr-common-functional-ui-services/services/web_element_wrapper/web_element_wrapper.ts

@@ -15,7 +15,7 @@ import { ToolingLog } from '@kbn/tooling-log';
 import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api';
 // @ts-ignore not supported yet
 import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary';
-import { Browsers } from '../../remote/browsers';
+import { Browsers } from '../remote/browsers';
 
 interface TypeOptions {
   charByChar: boolean;

packages/kbn-ftr-common-functional-ui-services/tsconfig.json

@@ -2,18 +2,15 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types",
-    "types": [
-      "jest",
-      "node"
-    ]
+    "types": ["jest", "cheerio", "node"]
   },
-  "include": [
-    "**/*.ts",
-  ],
-  "exclude": [
-    "target/**/*"
-  ],
+  "include": ["**/*.ts"],
+  "exclude": ["target/**/*"],
   "kbn_references": [
     "@kbn/test",
+    "@kbn/tooling-log",
+    "@kbn/repo-info",
+    "@kbn/test-subj-selector",
+    "@kbn/ftr-common-functional-services"
   ]
 }

test/examples/search/warnings.ts

@@ -9,8 +9,8 @@
 import type { estypes } from '@elastic/elasticsearch';
 import expect from '@kbn/expect';
 import assert from 'assert';
+import type { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import type { FtrProviderContext } from '../../functional/ftr_provider_context';
-import type { WebElementWrapper } from '../../functional/services/lib/web_element_wrapper';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService, getPageObjects }: FtrProviderContext) {

test/functional/apps/discover/group1/_discover_accessibility.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { WebElementWrapper } from '../../../services/lib/web_element_wrapper';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {

test/functional/apps/kibana_overview/_analytics.ts

@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrProviderContext } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const find = getService('find');

test/functional/apps/management/data_views/_field_formatter.ts

@@ -8,8 +8,8 @@
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import expect from '@kbn/expect';
 import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { WebElementWrapper } from '../../../services/lib/web_element_wrapper';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');

test/functional/page_objects/console_page.ts

@@ -8,8 +8,8 @@
 
 import { Key } from 'selenium-webdriver';
 import { asyncForEach } from '@kbn/std';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export class ConsolePageObject extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');

test/functional/page_objects/dashboard_page_controls.ts

@@ -17,8 +17,8 @@ import { OptionsListSortingType } from '@kbn/controls-plugin/common/options_list
 import expect from '@kbn/expect';
 import { asyncForEach } from '@kbn/std';
 
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 interface OptionsListAdditionalSettings {
   searchTechnique?: OptionsListSearchTechnique;

test/functional/page_objects/discover_page.ts

@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export class DiscoverPageObject extends FtrService {
   private readonly retry = this.ctx.getService('retry');

test/functional/page_objects/legacy/data_table_vis.ts

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 
 export class LegacyDataTableVisPageObject extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');

test/functional/page_objects/tag_cloud_page.ts

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export class TagCloudPageObject extends FtrService {
   private readonly find = this.ctx.getService('find');

test/functional/page_objects/time_picker.ts

@@ -7,8 +7,8 @@
  */
 
 import moment from 'moment';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export type CommonlyUsed =
   | 'Today'

test/functional/page_objects/timelion_page.ts

@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
+import type { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import type { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export class TimelionPageObject extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');

test/functional/page_objects/visual_builder_page.ts

@@ -7,8 +7,8 @@
  */
 
 import type { DebugState } from '@elastic/charts';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 type Duration =
   | 'Milliseconds'

test/functional/services/combo_box.ts

@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../ftr_provider_context';
-import { WebElementWrapper } from './lib/web_element_wrapper';
 
 /**
  * wrapper around EuiComboBox interactions

test/functional/services/common/browser.ts

@@ -15,14 +15,14 @@ import Url from 'url';
 
 import { NoSuchSessionError } from 'selenium-webdriver/lib/error';
 import sharp from 'sharp';
-import { FtrService, type FtrProviderContext } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../lib/web_element_wrapper';
-import { Browsers } from '../remote/browsers';
 import {
+  WebElementWrapper,
+  Browsers,
   NETWORK_PROFILES,
   type NetworkOptions,
   type NetworkProfile,
-} from '../remote/network_profiles';
+} from '@kbn/ftr-common-functional-ui-services';
+import { FtrService, type FtrProviderContext } from '../../ftr_provider_context';
 
 export type Browser = BrowserService;
 

test/functional/services/common/index.ts

@@ -9,7 +9,6 @@
 export type { Browser } from './browser';
 export { BrowserProvider } from './browser';
 export { FailureDebuggingProvider } from './failure_debugging';
-export { FindProvider } from './find';
 export { PngService } from './png';
 export { ScreenshotsService } from './screenshots';
 export { SnapshotsService } from './snapshots';

test/functional/services/common/screenshots.ts

@@ -12,9 +12,9 @@ import { promisify } from 'util';
 
 import del from 'del';
 
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { comparePngs } from '../lib/compare_pngs';
 import { FtrProviderContext, FtrService } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../lib/web_element_wrapper';
 
 const mkdirAsync = promisify(mkdir);
 const writeFileAsync = promisify(writeFile);

test/functional/services/common/test_subjects.ts

@@ -7,9 +7,8 @@
  */
 
 import { subj as testSubjSelector } from '@kbn/test-subj-selector';
-import { WebElementWrapper } from '../lib/web_element_wrapper';
+import { WebElementWrapper, type TimeoutOpt } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../../ftr_provider_context';
-import { TimeoutOpt } from './types';
 
 interface ExistsOptions {
   timeout?: number;

test/functional/services/dashboard/expectations.ts

@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../../ftr_provider_context';
-import { WebElementWrapper } from '../lib/web_element_wrapper';
 
 export class DashboardExpectService extends FtrService {
   private readonly log = this.ctx.getService('log');

test/functional/services/dashboard/panel_actions.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { WebElementWrapper } from '../lib/web_element_wrapper';
+import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrService } from '../../ftr_provider_context';
 
 const REMOVE_PANEL_DATA_TEST_SUBJ = 'embeddablePanelAction-deletePanel';