Skip to content

Commit

Permalink
Merge branch 'main' into reporting/move-error-codes-to-output
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Feb 23, 2022
2 parents 6c9ec7b + f96af16 commit f59992d
Show file tree
Hide file tree
Showing 74 changed files with 1,446 additions and 503 deletions.
80 changes: 0 additions & 80 deletions .github/workflows/label-qa-fixed-in.yml

This file was deleted.

4 changes: 2 additions & 2 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ oss plugins.
|The service exposed by this plugin informs consumers whether they should optimize for non-interactivity. In this way plugins can avoid loading unnecessary code, data or other services.
|{kib-repo}blob/{branch}/src/plugins/share/README.md[share]
|{kib-repo}blob/{branch}/src/plugins/share/README.mdx[share]
|The share plugin contains various utilities for displaying sharing context menu,
generating deep links to other apps, and creating short URLs.
generating deep links to other apps using locators, and creating short URLs.
|{kib-repo}blob/{branch}/src/plugins/shared_ux/README.md[sharedUX]
Expand Down
2 changes: 1 addition & 1 deletion docs/user/security/session-management.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ When you log in, {kib} creates a session that is used to authenticate subsequent

When your session expires, or you log out, {kib} will invalidate your cookie and remove session information from the index. {kib} also periodically invalidates and removes any expired sessions that weren't explicitly invalidated.

To manage user sessions programmatically, {kib} exposes <<session-management-api, session management APIs>>.
To manage user sessions programmatically, {kib} exposes <<session-management-api, session management APIs>>. For details, check out <<security-session-and-cookie-settings, Session and cookie security settings>>.

[[session-idle-timeout]]
==== Session idle timeout
Expand Down
3 changes: 3 additions & 0 deletions examples/share_examples/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Share plugin examples

Small demos of share plugin usage.
14 changes: 14 additions & 0 deletions examples/share_examples/kibana.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"id": "shareExamples",
"kibanaVersion": "kibana",
"version": "0.0.1",
"server": false,
"ui": true,
"owner": {
"name": "App Services",
"githubTeam": "kibana-app-services"
},
"description": "Small demos of share plugin usage",
"requiredPlugins": ["share"],
"optionalPlugins": []
}
11 changes: 11 additions & 0 deletions examples/share_examples/public/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* 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 { ShareDemoPlugin } from './plugin';

export const plugin = () => new ShareDemoPlugin();
42 changes: 42 additions & 0 deletions examples/share_examples/public/plugin.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* 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 { SharePluginStart, SharePluginSetup } from '../../../src/plugins/share/public';
import { Plugin, CoreSetup, CoreStart } from '../../../src/core/public';

interface SetupDeps {
share: SharePluginSetup;
}

interface StartDeps {
share: SharePluginStart;
}

export class ShareDemoPlugin implements Plugin<void, void, SetupDeps, StartDeps> {
public setup(core: CoreSetup<StartDeps>, { share }: SetupDeps) {
share.register({
id: 'demo',
getShareMenuItems: (context) => [
{
panel: {
id: 'demo',
title: 'Panel title',
content: 'Panel content',
},
shareMenuItem: {
name: 'Demo list item (from share_example plugin)',
},
},
],
});
}

public start(core: CoreStart, { share }: StartDeps) {}

public stop() {}
}
18 changes: 18 additions & 0 deletions examples/share_examples/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "./target/types"
},
"include": [
"index.ts",
"public/**/*.ts",
"public/**/*.tsx",
"server/**/*.ts",
"../../typings/**/*"
],
"exclude": [],
"references": [
{ "path": "../../src/core/tsconfig.json" },
{ "path": "../../src/plugins/share/tsconfig.json" },
]
}
3 changes: 2 additions & 1 deletion nav-kibana-dev.docnav.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
},
{ "id": "kibDevTutorialCI" },
{ "id": "kibDevTutorialServerEndpoint" },
{ "id": "kibDevTutorialAdvancedSettings"}
{ "id": "kibDevTutorialAdvancedSettings"},
{ "id": "kibDevSharePluginReadme"}
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-es/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test',
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-es'],
};
2 changes: 1 addition & 1 deletion packages/kbn-es/jest.integration.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test/jest_integration',
preset: '@kbn/test/jest_integration_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-es'],
};
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test',
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-optimizer'],
};
2 changes: 1 addition & 1 deletion packages/kbn-optimizer/jest.integration.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test/jest_integration',
preset: '@kbn/test/jest_integration_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-optimizer'],
};
2 changes: 1 addition & 1 deletion packages/kbn-plugin-generator/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test',
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-plugin-generator'],
};
2 changes: 1 addition & 1 deletion packages/kbn-plugin-generator/jest.integration.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test/jest_integration',
preset: '@kbn/test/jest_integration_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-plugin-generator'],
};
2 changes: 1 addition & 1 deletion packages/kbn-plugin-helpers/jest.integration.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test/jest_integration',
preset: '@kbn/test/jest_integration_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-plugin-helpers'],
};
2 changes: 2 additions & 0 deletions packages/kbn-test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ filegroup(
NPM_MODULE_EXTRA_FILES = [
"jest-preset.js",
"jest_integration/jest-preset.js",
"jest_integration_node/jest-preset.js",
"jest_node/jest-preset.js",
"jest.config.js",
"README.md",
"package.json",
Expand Down
5 changes: 3 additions & 2 deletions packages/kbn-test/jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,15 @@ module.exports = {
// The paths to modules that run some code to configure or set up the testing environment before each test
setupFiles: [
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/polyfills.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/polyfills.jsdom.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/enzyme.js',
],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
setupFilesAfterEnv: [
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/setup_test.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.eui.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/react_testing_library.js',
],

Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-test/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test',
preset: '@kbn/test/jest_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-test'],
};
2 changes: 1 addition & 1 deletion packages/kbn-test/jest.integration.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

module.exports = {
preset: '@kbn/test/jest_integration',
preset: '@kbn/test/jest_integration_node',
rootDir: '../..',
roots: ['<rootDir>/packages/kbn-test'],
};
3 changes: 2 additions & 1 deletion packages/kbn-test/jest_integration/jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ module.exports = {
),
setupFilesAfterEnv: [
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/after_env.integration.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.eui.js',
],
reporters: [
'default',
Expand Down
46 changes: 46 additions & 0 deletions packages/kbn-test/jest_integration_node/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* 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.
*/

const preset = require('../jest-preset');

/** @typedef {import("@jest/types").Config.InitialOptions} JestConfig */
/** @type {JestConfig} */
module.exports = {
...preset,
testMatch: ['**/integration_tests**/*.test.{js,mjs,ts,tsx}'],
testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
(pattern) => !pattern.includes('integration_tests')
),
setupFilesAfterEnv: [
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/after_env.integration.js',
'<rootDir>/node_modules/@kbn/test/target_node/jest/setup/mocks.moment_timezone.js',
],
reporters: [
'default',
[
'@kbn/test/target_node/jest/junit_reporter',
{
rootDirectory: '.',
reportName: 'Jest Integration Tests',
},
],
[
'@kbn/test/target_node/jest/ci_stats_jest_reporter',
{
testGroupType: 'Jest Integration Tests',
},
],
],
coverageReporters: !!process.env.CI
? [['json', { file: 'jest-integration.json' }]]
: ['html', 'text'],

testEnvironment: 'node',
snapshotSerializers: [],
setupFiles: ['<rootDir>/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'],
};
16 changes: 16 additions & 0 deletions packages/kbn-test/jest_node/jest-preset.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* 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.
*/

const preset = require('../jest-preset');

module.exports = {
...preset,
testEnvironment: 'node',
snapshotSerializers: [],
setupFiles: ['<rootDir>/node_modules/@kbn/test/target_node/jest/setup/babel_polyfill.js'],
};
Loading

0 comments on commit f59992d

Please sign in to comment.