Skip to content

[Reporting] Correct CSV and ILM tests when run against ES 8.0 #123981

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
tsullivan merged 13 commits into from
Feb 3, 2022
Merged

[Reporting] Correct CSV and ILM tests when run against ES 8.0 #123981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
336d360
Fix Reporting ILM Tests
tsullivan Jan 20, 2022
08125e9
fix discover functional csv tests
tsullivan Jan 27, 2022
1a52a26
fix generateCsv tests
tsullivan Jan 27, 2022
0974ab9
fix csv snapshots
tsullivan Jan 27, 2022
5f33d98
wip ilm
tsullivan Jan 28, 2022
e435a9a
fix snapshot
tsullivan Jan 28, 2022
de67f44
clean up
tsullivan Jan 28, 2022
b42aa67
fix test
tsullivan Jan 28, 2022
eabce36
Merge branch '7.17' into reporting/test-reenable-7.17
kibanamachine Jan 31, 2022
64edacf
use super user for unsetting ILM policy...
jloleysens Jan 31, 2022
b5a67f7
Merge branch '7.17' into reporting/test-reenable-7.17
kibanamachine Feb 1, 2022
c192ef9
make ILM tests work for 7.17 and 7.17/8.0 mixed mode
jloleysens Feb 2, 2022
5b1b993
move super test without auth
jloleysens Feb 2, 2022
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
4 changes: 3 additions & 1 deletion x-pack/plugins/reporting/server/routes/deprecations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* 2.0.
*/
import { errors } from '@elastic/elasticsearch';
import { SecurityHasPrivilegesIndexPrivilegesCheck } from '@elastic/elasticsearch/api/types';
import { RequestHandler } from 'src/core/server';
import {
API_MIGRATE_ILM_POLICY_URL,
Expand Down Expand Up @@ -39,7 +40,8 @@ export const registerDeprecationsRoutes = (reporting: ReportingCore, logger: Log
{
privileges: ['manage'], // required to do anything with the reporting indices
names: [store.getReportingIndexPattern()],
},
allow_restricted_indices: true,
} as SecurityHasPrivilegesIndexPrivilegesCheck,
Comment on lines +43 to +44
Copy link
Copy Markdown
Contributor

@jloleysens jloleysens Feb 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be forward ported (and the import statement above)

Copy link
Copy Markdown
Contributor

@jloleysens jloleysens Feb 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah nvm, this is already the case in main 🤦🏻

],
},
});
Expand Down
6,192 changes: 6,189 additions & 3 deletions x-pack/test/functional/apps/discover/__snapshots__/reporting.snap
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 27 additions & 14 deletions x-pack/test/functional/apps/discover/reporting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ getService, getPageObjects }: FtrProviderContext) {
const log = getService('log');
const es = getService('es');
const esVersion = getService('esVersion');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const browser = getService('browser');
Expand All @@ -37,8 +37,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
};

describe('Discover CSV Export', function () {
this.onlyEsVersion('<=7');

before('initialize tests', async () => {
log.debug('ReportingPage:initTests');
await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
Expand All @@ -49,12 +47,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
after('clean up archives', async () => {
await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
await kibanaServer.importExport.unload(ecommerceSOPath);
await es.deleteByQuery({
index: '.reporting-*',
refresh: true,
body: { query: { match_all: {} } },
});
await esArchiver.emptyKibanaIndex();
});

describe('Check Available', () => {
Expand All @@ -72,12 +64,33 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
});
});

describe('Generate CSV: new search', () => {
beforeEach(async () => {
await kibanaServer.importExport.load(ecommerceSOPath);
await PageObjects.common.navigateToApp('discover');
await PageObjects.discover.selectIndexPattern('ecommerce');
const describeIfEs7 = esVersion.matchRange('<8') ? describe : describe.skip;
const describeIfEs8 = esVersion.matchRange('>=8') ? describe : describe.skip;

const newSearchBeforeEach = async () => {
await kibanaServer.importExport.load(ecommerceSOPath);
await PageObjects.common.navigateToApp('discover');
await PageObjects.discover.selectIndexPattern('ecommerce');
};

describeIfEs8('Generate: CSV: new search (8.x)', () => {
beforeEach(newSearchBeforeEach);

it('generates a report from a new search with data: default', async () => {
await PageObjects.discover.clickNewSearchButton();
await PageObjects.reporting.setTimepickerInEcommerceDataRange();

const res = await getReport();
expect(res.status).to.equal(200);
expect(res.get('content-type')).to.equal('text/csv; charset=utf-8');

const csvFile = res.text;
expectSnapshot(csvFile).toMatch();
});
});

describeIfEs7('Generate CSV: new search (7.17)', () => {
beforeEach(newSearchBeforeEach);

it('generates a report from a new search with data: default', async () => {
await PageObjects.discover.clickNewSearchButton();
Expand Down
88 changes: 85 additions & 3 deletions ...eporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 41 additions & 1 deletion ...reporting_api_integration/reporting_and_security/__snapshots__/generate_csv_discover.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading