Merge branch 'main' into versioning-file-upload-apis

Author: jgowdyelastic

.github/CODEOWNERS

@@ -23,7 +23,7 @@ packages/kbn-alerts-as-data-utils @elastic/response-ops
 x-pack/test/alerting_api_integration/common/plugins/alerts_restricted @elastic/response-ops
 packages/kbn-alerts-ui-shared @elastic/response-ops
 packages/kbn-ambient-common-types @elastic/kibana-operations
-packages/kbn-ambient-ftr-types @elastic/kibana-operations
+packages/kbn-ambient-ftr-types @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-ambient-storybook-types @elastic/kibana-operations
 packages/kbn-ambient-ui-types @elastic/kibana-operations
 packages/kbn-analytics @elastic/kibana-core
@@ -331,7 +331,7 @@ x-pack/examples/embedded_lens_example @elastic/kibana-visualizations
 x-pack/plugins/encrypted_saved_objects @elastic/kibana-security
 x-pack/plugins/enterprise_search @elastic/enterprise-search-frontend
 packages/kbn-es @elastic/kibana-operations
-packages/kbn-es-archiver @elastic/kibana-operations
+packages/kbn-es-archiver @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-es-errors @elastic/kibana-core
 packages/kbn-es-query @elastic/kibana-data-discovery
 packages/kbn-es-types @elastic/kibana-core @elastic/apm-ui
@@ -346,7 +346,7 @@ src/plugins/event_annotation @elastic/kibana-visualizations
 x-pack/test/plugin_api_integration/plugins/event_log @elastic/response-ops
 x-pack/plugins/event_log @elastic/response-ops
 packages/kbn-expandable-flyout @elastic/security-threat-hunting-investigations
-packages/kbn-expect @elastic/kibana-operations
+packages/kbn-expect @elastic/kibana-operations @elastic/appex-qa
 x-pack/examples/exploratory_view_example @elastic/uptime
 x-pack/plugins/exploratory_view @elastic/uptime
 src/plugins/expression_error @elastic/kibana-presentation
@@ -364,7 +364,7 @@ src/plugins/chart_expressions/expression_tagcloud @elastic/kibana-visualizations
 src/plugins/chart_expressions/expression_xy @elastic/kibana-visualizations
 examples/expressions_explorer @elastic/kibana-app-services
 src/plugins/expressions @elastic/kibana-visualizations
-packages/kbn-failed-test-reporter-cli @elastic/kibana-operations
+packages/kbn-failed-test-reporter-cli @elastic/kibana-operations @elastic/appex-qa
 x-pack/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
 x-pack/plugins/features @elastic/kibana-core
 x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core
@@ -380,8 +380,8 @@ x-pack/plugins/fleet @elastic/fleet
 packages/kbn-flot-charts @elastic/kibana-operations
 x-pack/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
 src/plugins/ftr_apis @elastic/kibana-core
-packages/kbn-ftr-common-functional-services @elastic/kibana-operations
-packages/kbn-ftr-screenshot-filename @elastic/kibana-operations
+packages/kbn-ftr-common-functional-services @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-ftr-screenshot-filename @elastic/kibana-operations @elastic/appex-qa
 x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops
 packages/kbn-generate @elastic/kibana-operations
 packages/kbn-generate-csv @elastic/appex-sharedux
@@ -423,7 +423,7 @@ test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-se
 packages/kbn-interpreter @elastic/kibana-visualizations
 packages/kbn-io-ts-utils @elastic/apm-ui
 packages/kbn-jest-serializers @elastic/kibana-operations
-packages/kbn-journeys @elastic/kibana-operations
+packages/kbn-journeys @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-json-ast @elastic/kibana-operations
 test/health_gateway/plugins/status @elastic/kibana-core
 test/plugin_functional/plugins/kbn_sample_panel_action @elastic/kibana-app-services
@@ -665,10 +665,10 @@ src/plugins/telemetry_management_section @elastic/kibana-core
 src/plugins/telemetry @elastic/kibana-core
 test/plugin_functional/plugins/telemetry @elastic/kibana-core
 packages/kbn-telemetry-tools @elastic/kibana-core
-packages/kbn-test @elastic/kibana-operations
+packages/kbn-test @elastic/kibana-operations @elastic/appex-qa
 x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
-packages/kbn-test-jest-helpers @elastic/kibana-operations
-packages/kbn-test-subj-selector @elastic/kibana-operations
+packages/kbn-test-jest-helpers @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-test-subj-selector @elastic/kibana-operations @elastic/appex-qa
 x-pack/examples/testing_embedded_lens @elastic/kibana-visualizations
 packages/kbn-text-based-editor @elastic/kibana-visualizations
 src/plugins/text_based_languages @elastic/kibana-visualizations

.github/workflows/deploy-my-kibana.yml

@@ -2,7 +2,7 @@
 ##
 ## This the automation to let Observability team members to deploy a Kibana instance
 ## using the Observability test environments.
-## It will deploy a new instance for those who add a comment /oblt-deploy or /oblt-deploy-serverless
+## It will deploy a new instance for those who add a comment /oblt-deploy
 ## only supported for Elasticians.
 ##
 ## Owner: @elastic/observablt-robots
@@ -28,15 +28,3 @@ jobs:
           vaultUrl: ${{ secrets.OBLT_VAULT_ADDR }}
           vaultRoleId: ${{ secrets.OBLT_VAULT_ROLE_ID }}
           vaultSecretId: ${{ secrets.OBLT_VAULT_SECRET_ID }}
-          serverless: false
-
-  deploy-my-kibana-serverless:
-    if: ${{ github.event.issue.pull_request && github.event.comment.body == '/oblt-deploy-serverless'}}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: elastic/apm-pipeline-library/.github/actions/deploy-my-kibana@current
-        with:
-          vaultUrl: ${{ secrets.OBLT_VAULT_ADDR }}
-          vaultRoleId: ${{ secrets.OBLT_VAULT_ROLE_ID }}
-          vaultSecretId: ${{ secrets.OBLT_VAULT_SECRET_ID }}
-          serverless: true

.github/workflows/oblt-github-commands.yml

@@ -50,7 +50,6 @@ jobs:
 
               Just comment with:
               - \`/oblt-deploy\` : Deploy a Kibana instance using the Observability test environments.
-              - \`/oblt-deploy-serverless\` : Deploy a Kibana instance using the Observability `serverless` test environment [only for main].
               - \`run\` \`elasticsearch-ci/docs\` : Re-trigger the docs validation. (use unformatted text in the comment!)
 
               </p>

packages/core/chrome/core-chrome-browser/src/project_navigation.ts

@@ -25,7 +25,6 @@ export interface ChromeProjectNavigationNode {
   id?: string;
   link?: ChromeProjectNavigationLink;
   children?: ChromeProjectNavigationNode[];
-
   title?: string;
   icon?: string;
 }

packages/core/saved-objects/core-saved-objects-base-server-internal/index.ts

@@ -44,6 +44,7 @@ export type {
 export { parseObjectKey, getObjectKey, getIndexForType } from './src/utils';
 export {
   modelVersionVirtualMajor,
+  globalSwitchToModelVersionAt,
   assertValidModelVersion,
   isVirtualModelVersion,
   virtualVersionToModelVersion,

packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/constants.ts

@@ -10,3 +10,8 @@
  * The major version that is used to represent model versions.
  */
 export const modelVersionVirtualMajor = 10;
+
+/**
+ * The stack version where all types will be forced to switch to using the model version system.
+ */
+export const globalSwitchToModelVersionAt = '8.10.0';

packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/index.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-export { modelVersionVirtualMajor } from './constants';
+export { modelVersionVirtualMajor, globalSwitchToModelVersionAt } from './constants';
 export {
   assertValidModelVersion,
   isVirtualModelVersion,

packages/core/saved-objects/core-saved-objects-server-internal/src/apply_type_defaults.test.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
+import { globalSwitchToModelVersionAt } from '@kbn/core-saved-objects-base-server-internal';
+import { applyTypeDefaults } from './apply_type_defaults';
+
+const createType = (parts: Partial<SavedObjectsType> = {}): SavedObjectsType => ({
+  name: 'test',
+  namespaceType: 'single',
+  hidden: false,
+  mappings: { properties: {} },
+  ...parts,
+});
+
+describe('applyTypeDefaults', () => {
+  describe('switchToModelVersionAt', () => {
+    it(`keeps the type's switchToModelVersionAt if lesser than the global version`, () => {
+      const type = createType({
+        switchToModelVersionAt: '8.4.0',
+      });
+
+      const result = applyTypeDefaults(type);
+      expect(result.switchToModelVersionAt).toEqual('8.4.0');
+    });
+
+    it(`sets switchToModelVersionAt to the global version if unspecified`, () => {
+      const type = createType({
+        switchToModelVersionAt: undefined,
+      });
+
+      const result = applyTypeDefaults(type);
+      expect(result.switchToModelVersionAt).toEqual(globalSwitchToModelVersionAt);
+    });
+
+    it(`throws if switchToModelVersionAt is invalid`, () => {
+      const type = createType({
+        switchToModelVersionAt: 'foobar',
+      });
+
+      expect(() => applyTypeDefaults(type)).toThrowErrorMatchingInlineSnapshot(
+        `"Type test: invalid switchToModelVersionAt provided: foobar"`
+      );
+    });
+
+    it(`throws if type version is greater than the global version`, () => {
+      const type = createType({
+        switchToModelVersionAt: '9.2.0',
+      });
+
+      expect(() => applyTypeDefaults(type)).toThrowErrorMatchingInlineSnapshot(
+        `"Type test: provided switchToModelVersionAt (9.2.0) is higher than maximum (8.10.0)"`
+      );
+    });
+  });
+});

packages/core/saved-objects/core-saved-objects-server-internal/src/apply_type_defaults.ts

@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import Semver from 'semver';
+import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
+import { globalSwitchToModelVersionAt } from '@kbn/core-saved-objects-base-server-internal';
+
+/**
+ * Apply global defaults to the provided SO type.
+ */
+export const applyTypeDefaults = (type: SavedObjectsType): SavedObjectsType => {
+  let switchToModelVersionAt = type.switchToModelVersionAt;
+  if (switchToModelVersionAt) {
+    if (!Semver.valid(switchToModelVersionAt)) {
+      throw new Error(
+        `Type ${type.name}: invalid switchToModelVersionAt provided: ${switchToModelVersionAt}`
+      );
+    }
+    if (Semver.gt(switchToModelVersionAt, globalSwitchToModelVersionAt)) {
+      throw new Error(
+        `Type ${type.name}: provided switchToModelVersionAt (${switchToModelVersionAt}) is higher than maximum (${globalSwitchToModelVersionAt})`
+      );
+    }
+  } else {
+    switchToModelVersionAt = globalSwitchToModelVersionAt;
+  }
+
+  return {
+    ...type,
+    switchToModelVersionAt,
+  };
+};

packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.test.mocks.ts

@@ -50,3 +50,12 @@ export const registerRoutesMock = jest.fn();
 jest.doMock('./routes', () => ({
   registerRoutes: registerRoutesMock,
 }));
+
+export const applyTypeDefaultsMock = jest.fn();
+jest.doMock('./apply_type_defaults', () => {
+  const actual = jest.requireActual('./apply_type_defaults');
+  return {
+    ...actual,
+    applyTypeDefaults: applyTypeDefaultsMock,
+  };
+});