Skip to content

[7.x] [Cross Cluster Replication] NP Shim (#60121) #60635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jloleysens merged 1 commit into from
Mar 19, 2020
Merged

[7.x] [Cross Cluster Replication] NP Shim (#60121) #60635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ins/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_add.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import '../../public/np_ready/app/services/breadcrumbs.mock';
import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './helpers';
import { indexPatterns } from '../../../../../../src/plugins/data/public';

Expand Down
3 changes: 2 additions & 1 deletion ...ns/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_edit.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { AutoFollowPatternForm } from '../../public/app/components/auto_follow_pattern_form';
import '../../public/np_ready/app/services/breadcrumbs.mock';
import { AutoFollowPatternForm } from '../../public/np_ready/app/components/auto_follow_pattern_form';
import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { AUTO_FOLLOW_PATTERN_EDIT } from './helpers/constants';

Expand Down
10 changes: 1 addition & 9 deletions ...ns/cross_cluster_replication/__jest__/client_integration/auto_follow_pattern_list.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,13 @@
* you may not use this file except in compliance with the Elastic License.
*/

import '../../public/np_ready/app/services/breadcrumbs.mock';
import { setupEnvironment, pageHelpers, nextTick, getRandomString } from './helpers';

import { getAutoFollowPatternClientMock } from '../../fixtures/auto_follow_pattern';

jest.mock('ui/new_platform');

jest.mock('ui/chrome', () => ({
addBasePath: () => 'api/cross_cluster_replication',
breadcrumbs: { set: () => {} },
getUiSettingsClient: () => ({
get: x => x,
getUpdate$: () => ({ subscribe: jest.fn() }),
}),
}));

const { setup } = pageHelpers.autoFollowPatternList;

describe('<AutoFollowPatternList />', () => {
Expand Down
3 changes: 2 additions & 1 deletion .../plugins/cross_cluster_replication/__jest__/client_integration/follower_index_add.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/

import '../../public/np_ready/app/services/breadcrumbs.mock';
import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { RemoteClustersFormField } from '../../public/app/components';
import { RemoteClustersFormField } from '../../public/np_ready/app/components';

import { indexPatterns } from '../../../../../../src/plugins/data/public';

Expand Down
3 changes: 2 additions & 1 deletion ...plugins/cross_cluster_replication/__jest__/client_integration/follower_index_edit.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/

import '../../public/np_ready/app/services/breadcrumbs.mock';
import { setupEnvironment, pageHelpers, nextTick } from './helpers';
import { FollowerIndexForm } from '../../public/app/components/follower_index_form/follower_index_form';
import { FollowerIndexForm } from '../../public/np_ready/app/components/follower_index_form/follower_index_form';
import { FOLLOWER_INDEX_EDIT } from './helpers/constants';

jest.mock('ui/new_platform');
Expand Down
9 changes: 0 additions & 9 deletions ...ugins/cross_cluster_replication/__jest__/client_integration/follower_indices_list.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ import { getFollowerIndexMock } from '../../fixtures/follower_index';

jest.mock('ui/new_platform');

jest.mock('ui/chrome', () => ({
addBasePath: () => 'api/cross_cluster_replication',
breadcrumbs: { set: () => {} },
getUiSettingsClient: () => ({
get: x => x,
getUpdate$: () => ({ subscribe: jest.fn() }),
}),
}));

const { setup } = pageHelpers.followerIndexList;

describe('<FollowerIndicesList />', () => {
Expand Down
6 changes: 3 additions & 3 deletions ...luster_replication/__jest__/client_integration/helpers/auto_follow_pattern_add.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed } from '../../../../../../test_utils';
import { AutoFollowPatternAdd } from '../../../public/app/sections/auto_follow_pattern_add';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { AutoFollowPatternAdd } from '../../../public/np_ready/app/sections/auto_follow_pattern_add';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

const testBedConfig = {
store: ccrStore,
Expand Down
6 changes: 3 additions & 3 deletions ...uster_replication/__jest__/client_integration/helpers/auto_follow_pattern_edit.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed } from '../../../../../../test_utils';
import { AutoFollowPatternEdit } from '../../../public/app/sections/auto_follow_pattern_edit';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { AutoFollowPatternEdit } from '../../../public/np_ready/app/sections/auto_follow_pattern_edit';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

import { AUTO_FOLLOW_PATTERN_EDIT_NAME } from './constants';

Expand Down
6 changes: 3 additions & 3 deletions ...uster_replication/__jest__/client_integration/helpers/auto_follow_pattern_list.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed, findTestSubject } from '../../../../../../test_utils';
import { AutoFollowPatternList } from '../../../public/app/sections/home/auto_follow_pattern_list';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { AutoFollowPatternList } from '../../../public/np_ready/app/sections/home/auto_follow_pattern_list';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

const testBedConfig = {
store: ccrStore,
Expand Down
6 changes: 3 additions & 3 deletions ...oss_cluster_replication/__jest__/client_integration/helpers/follower_index_add.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed } from '../../../../../../test_utils';
import { FollowerIndexAdd } from '../../../public/app/sections/follower_index_add';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { FollowerIndexAdd } from '../../../public/np_ready/app/sections/follower_index_add';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

const testBedConfig = {
store: ccrStore,
Expand Down
6 changes: 3 additions & 3 deletions ...ss_cluster_replication/__jest__/client_integration/helpers/follower_index_edit.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed } from '../../../../../../test_utils';
import { FollowerIndexEdit } from '../../../public/app/sections/follower_index_edit';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { FollowerIndexEdit } from '../../../public/np_ready/app/sections/follower_index_edit';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

import { FOLLOWER_INDEX_EDIT_NAME } from './constants';

Expand Down
6 changes: 3 additions & 3 deletions ...ss_cluster_replication/__jest__/client_integration/helpers/follower_index_list.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed, findTestSubject } from '../../../../../../test_utils';
import { FollowerIndicesList } from '../../../public/app/sections/home/follower_indices_list';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { FollowerIndicesList } from '../../../public/np_ready/app/sections/home/follower_indices_list';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';

const testBedConfig = {
store: ccrStore,
Expand Down
6 changes: 3 additions & 3 deletions ...acy/plugins/cross_cluster_replication/__jest__/client_integration/helpers/home.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
*/

import { registerTestBed } from '../../../../../../test_utils';
import { CrossClusterReplicationHome } from '../../../public/app/sections/home/home';
import { ccrStore } from '../../../public/app/store';
import routing from '../../../public/app/services/routing';
import { CrossClusterReplicationHome } from '../../../public/np_ready/app/sections/home/home';
import { ccrStore } from '../../../public/np_ready/app/store';
import routing from '../../../public/np_ready/app/services/routing';
import { BASE_PATH } from '../../../common/constants';

const testBedConfig = {
Expand Down
12 changes: 6 additions & 6 deletions ...cy/plugins/cross_cluster_replication/__jest__/client_integration/helpers/http_requests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'GET',
'api/cross_cluster_replication/follower_indices',
'/api/cross_cluster_replication/follower_indices',
mockResponse(defaultResponse, response)
);
};
Expand All @@ -29,7 +29,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'GET',
'api/cross_cluster_replication/auto_follow_patterns',
'/api/cross_cluster_replication/auto_follow_patterns',
mockResponse(defaultResponse, response)
);
};
Expand All @@ -39,7 +39,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'DELETE',
/api\/cross_cluster_replication\/auto_follow_patterns/,
/\/api\/cross_cluster_replication\/auto_follow_patterns/,
mockResponse(defaultResponse, response)
);
};
Expand All @@ -61,7 +61,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'GET',
'api/cross_cluster_replication/stats/auto_follow',
'/api/cross_cluster_replication/stats/auto_follow',
mockResponse(defaultResponse, response)
);
};
Expand All @@ -87,7 +87,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'GET',
/api\/cross_cluster_replication\/auto_follow_patterns\/.+/,
/\/api\/cross_cluster_replication\/auto_follow_patterns\/.+/,
mockResponse(defaultResponse, response)
);
};
Expand All @@ -105,7 +105,7 @@ const registerHttpRequestMockHelpers = server => {

server.respondWith(
'GET',
/api\/cross_cluster_replication\/follower_indices\/.+/,
/\/api\/cross_cluster_replication\/follower_indices\/.+/,
mockResponse(defaultResponse, response)
);
};
Expand Down
11 changes: 6 additions & 5 deletions ...lugins/cross_cluster_replication/__jest__/client_integration/helpers/setup_environment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import axios from 'axios';
import axiosXhrAdapter from 'axios/lib/adapters/xhr';

import { setHttpClient } from '../../../public/app/services/api';
import { setHttpClient } from '../../../public/np_ready/app/services/api';
import { init as initHttpRequests } from './http_requests';

export const setupEnvironment = () => {
// Mock Angular $q
const $q = { defer: () => ({ resolve() {} }) };
// axios has a $http like interface so using it to simulate $http
setHttpClient(axios.create({ adapter: axiosXhrAdapter }), $q);
// axios has a similar interface to HttpSetup, but we
// flatten out the response.
const client = axios.create({ adapter: axiosXhrAdapter });
client.interceptors.response.use(({ data }) => data);
setHttpClient(client);

const { server, httpRequestsMockHelpers } = initHttpRequests();

Expand Down
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/cross_cluster_replication/__jest__/client_integration/home.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import '../../public/np_ready/app/services/breadcrumbs.mock';
import { setupEnvironment, pageHelpers, nextTick } from './helpers';

jest.mock('ui/new_platform');
Expand Down
0 ...uster_replication/common/constants/app.js → ...uster_replication/common/constants/app.ts
View file
Open in desktop
File renamed without changes.
0 ...replication/common/constants/base_path.js → ...replication/common/constants/base_path.ts
View file
Open in desktop
File renamed without changes.
0 ...ter_replication/common/constants/index.js → ...ter_replication/common/constants/index.ts
View file
Open in desktop
File renamed without changes.
0 ...er_replication/common/constants/plugin.js → ...er_replication/common/constants/plugin.ts
View file
Open in desktop
File renamed without changes.
0 ..._replication/common/constants/settings.js → ..._replication/common/constants/settings.ts
View file
Open in desktop
File renamed without changes.
20 changes: 8 additions & 12 deletions x-pack/legacy/plugins/cross_cluster_replication/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@

import { resolve } from 'path';
import { PLUGIN } from './common/constants';
import { registerLicenseChecker } from './server/lib/register_license_checker';
import { registerRoutes } from './server/routes/register_routes';
import { ccrDataEnricher } from './cross_cluster_replication_data';
import { plugin } from './server/np_ready';

export function crossClusterReplication(kibana) {
return new kibana.Plugin({
Expand Down Expand Up @@ -47,15 +45,13 @@ export function crossClusterReplication(kibana) {
);
},
init: function initCcrPlugin(server) {
registerLicenseChecker(server);
registerRoutes(server);
if (
server.config().get('xpack.ccr.ui.enabled') &&
server.newPlatform.setup.plugins.indexManagement &&
server.newPlatform.setup.plugins.indexManagement.indexDataEnricher
) {
server.newPlatform.setup.plugins.indexManagement.indexDataEnricher.add(ccrDataEnricher);
}
plugin({}).setup(server.newPlatform.setup.core, {
indexManagement: server.newPlatform.setup.plugins.indexManagement,
__LEGACY: {
server,
ccrUIEnabled: server.config().get('xpack.ccr.ui.enabled'),
},
});
},
});
}
14 changes: 0 additions & 14 deletions x-pack/legacy/plugins/cross_cluster_replication/public/app/services/documentation_links.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion x-pack/legacy/plugins/cross_cluster_replication/public/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
*/

import './register_routes';
import './extend_index_management';
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/cross_cluster_replication/public/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
// ccrChart__legend--small
// ccrChart__legend-isLoading

@import 'app/app';
@import 'np_ready/app/app';
0 ..._cluster_replication/public/app/_app.scss → ...replication/public/np_ready/app/_app.scss
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...oss_cluster_replication/public/app/app.js → ...er_replication/public/np_ready/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { Route, Switch, Redirect, withRouter } from 'react-router-dom';
import { fatalError } from 'ui/notify';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n/react';

Expand All @@ -21,7 +20,8 @@ import {
EuiTitle,
} from '@elastic/eui';

import { BASE_PATH } from '../../common/constants';
import { BASE_PATH } from '../../../common/constants';
import { getFatalErrors } from './services/notifications';
import { SectionError } from './components';
import routing from './services/routing';
import { loadPermissions } from './services/api';
Expand Down Expand Up @@ -81,7 +81,7 @@ class AppComponent extends Component {
});
} catch (error) {
// Expect an error in the shape provided by Angular's $http service.
if (error && error.data) {
if (error && error.body) {
return this.setState({
isFetchingPermissions: false,
fetchPermissionError: error,
Expand All @@ -90,7 +90,7 @@ class AppComponent extends Component {

// This error isn't an HTTP error, so let the fatal error screen tell the user something
// unexpected happened.
fatalError(
getFatalErrors().add(
error,
i18n.translate('xpack.crossClusterReplication.app.checkPermissionsFatalErrorTitle', {
defaultMessage: 'Cross-Cluster Replication app',
Expand Down
0 ...s__/auto_follow_pattern_form.test.js.snap → ...s__/auto_follow_pattern_form.test.js.snap
View file
Open in desktop
File renamed without changes.
0 ...o_follow_pattern_action_menu.container.ts → ...o_follow_pattern_action_menu.container.ts
View file
Open in desktop
File renamed without changes.
0 ..._menu/auto_follow_pattern_action_menu.tsx → ..._menu/auto_follow_pattern_action_menu.tsx
View file
Open in desktop
File renamed without changes.
0 .../auto_follow_pattern_action_menu/index.ts → .../auto_follow_pattern_action_menu/index.ts
View file
Open in desktop
File renamed without changes.
0 .../auto_follow_pattern_delete_provider.d.ts → .../auto_follow_pattern_delete_provider.d.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ts/auto_follow_pattern_delete_provider.js → ...ts/auto_follow_pattern_delete_provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
import { EuiConfirmModal, EuiOverlayMask } from '@elastic/eui';

import { deleteAutoFollowPattern } from '../store/actions';
import { arrify } from '../../../common/services/utils';
import { arrify } from '../../../../common/services/utils';

class AutoFollowPatternDeleteProviderUi extends PureComponent {
state = {
Expand Down
4 changes: 2 additions & 2 deletions ...pp/components/auto_follow_pattern_form.js → ...pp/components/auto_follow_pattern_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import {
EuiTitle,
} from '@elastic/eui';

import { indices } from '../../../../../../../src/plugins/es_ui_shared/public';
import { indexPatterns } from '../../../../../../../src/plugins/data/public';
import { indices } from '../../../../../../../../src/plugins/es_ui_shared/public';
import { indexPatterns } from '../../../../../../../../src/plugins/data/public';

import routing from '../services/routing';
import { extractQueryParams } from '../services/query_params';
Expand Down
0 ...mponents/auto_follow_pattern_form.test.js → ...mponents/auto_follow_pattern_form.test.js
View file
Open in desktop
File renamed without changes.
0 ...ts/auto_follow_pattern_indices_preview.js → ...ts/auto_follow_pattern_indices_preview.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ponents/auto_follow_pattern_page_title.js → ...ponents/auto_follow_pattern_page_title.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
EuiTitle,
} from '@elastic/eui';

import { autoFollowPatternUrl } from '../services/documentation_links';
import { getAutoFollowPatternUrl } from '../services/documentation_links';

export const AutoFollowPatternPageTitle = ({ title }) => (
<Fragment>
Expand All @@ -35,7 +35,7 @@ export const AutoFollowPatternPageTitle = ({ title }) => (
<EuiButtonEmpty
size="s"
flush="right"
href={autoFollowPatternUrl}
href={getAutoFollowPatternUrl()}
target="_blank"
iconType="help"
data-test-subj="docsButton"
Expand Down
2 changes: 1 addition & 1 deletion ...nts/auto_follow_pattern_request_flyout.js → ...nts/auto_follow_pattern_request_flyout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
EuiTitle,
} from '@elastic/eui';

import { serializeAutoFollowPattern } from '../../../common/services/auto_follow_pattern_serialization';
import { serializeAutoFollowPattern } from '../../../../common/services/auto_follow_pattern_serialization';

export class AutoFollowPatternRequestFlyout extends PureComponent {
static propTypes = {
Expand Down
0 ...pshots__/follower_index_form.test.js.snap → ...pshots__/follower_index_form.test.js.snap
View file
Open in desktop
File renamed without changes.
Loading