From 27e239cf5f763c7b859abc872d952f5b456779d4 Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Thu, 3 Sep 2020 14:26:12 -0700 Subject: [PATCH 1/7] lens reporting test --- x-pack/test/functional/apps/lens/lens_reporting.ts | 9 +++++++++ x-pack/test/functional/config.js | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index 4974b63be6f72c..bbc7661da19009 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -12,10 +12,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const es = getService('es'); const esArchiver = getService('esArchiver'); const listingTable = getService('listingTable'); + const security = getService('security'); + // https://github.com/elastic/kibana/issues/76709 describe('lens reporting', () => { before(async () => { await esArchiver.loadIfNeeded('lens/reporting'); + await security.testUser.setRoles([ + 'global_visualize_read', + 'test_logstash_reader', + 'global_dashboard_read', + 'reporting_user', + ]); }); after(async () => { @@ -25,6 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { refresh: true, body: { query: { match_all: {} } }, }); + await security.testUser.restoreDefaults(); }); it('should not cause PDF reports to fail', async () => { diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index 16e2cd1559fce1..fff6bbe4f61a6f 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -236,6 +236,17 @@ export default async function ({ readConfigFile }) { ], }, + global_dashboard_read: { + kibana: [ + { + feature: { + dashboard: ['read'], + }, + spaces: ['*'], + }, + ], + }, + global_discover_read: { kibana: [ { From dcd898394e182a9b1e08e39fe1fae23aff57df94 Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Thu, 10 Sep 2020 11:32:05 +0200 Subject: [PATCH 2/7] update chromedriver to 85 --- package.json | 2 +- yarn.lock | 27 ++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 95a6de337f62a0..2461d04362af43 100644 --- a/package.json +++ b/package.json @@ -359,7 +359,7 @@ "chai": "3.5.0", "chance": "1.0.18", "cheerio": "0.22.0", - "chromedriver": "^84.0.0", + "chromedriver": "^85.0.1", "classnames": "2.2.6", "compare-versions": "3.5.1", "d3": "3.5.17", diff --git a/yarn.lock b/yarn.lock index 105c5e3cba5ae7..1534ef123788d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5482,13 +5482,6 @@ agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" -agent-base@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" - integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== - dependencies: - es6-promisify "^5.0.0" - agentkeepalive@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c" @@ -8495,16 +8488,16 @@ chrome-trace-event@^1.0.2: dependencies: tslib "^1.9.0" -chromedriver@^84.0.0: - version "84.0.0" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-84.0.0.tgz#980d72bf0990bbfbce282074d15448296c55d89d" - integrity sha512-fNX9eT1C38D1W8r5ss9ty42eDK+GIkCZVKukfeDs0XSBeKfyT0o/vbMdPr9MUkWQ+vIcFAS5hFGp9E3+xoaMeQ== +chromedriver@^85.0.1: + version "85.0.1" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-85.0.1.tgz#2e1b571845253368fcd112108f23eb9c778f7982" + integrity sha512-z8je3U4tXFZnx7AloRabM4Ep1lpFJvHxLoGuRvLg33Qy0UKk/z6OXmHUO2z6DKE0Oe6CFpjj/bdhuQ8dfvq9ug== dependencies: "@testim/chrome-version" "^1.0.7" axios "^0.19.2" del "^5.1.0" - extract-zip "^2.0.0" - https-proxy-agent "^2.2.4" + extract-zip "^2.0.1" + https-proxy-agent "^5.0.0" mkdirp "^1.0.4" tcp-port-used "^1.0.1" @@ -15557,14 +15550,6 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" -https-proxy-agent@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" - integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== - dependencies: - agent-base "^4.3.0" - debug "^3.1.0" - https-proxy-agent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" From 5148d075b163c3b0f096b985981209cadc38ff39 Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Thu, 10 Sep 2020 10:43:32 -0700 Subject: [PATCH 3/7] checking bug fix --- x-pack/test/functional/apps/lens/lens_reporting.ts | 3 +-- x-pack/test/functional/config.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index bbc7661da19009..fcbb612c84a840 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -14,14 +14,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const listingTable = getService('listingTable'); const security = getService('security'); - // https://github.com/elastic/kibana/issues/76709 describe('lens reporting', () => { before(async () => { await esArchiver.loadIfNeeded('lens/reporting'); await security.testUser.setRoles([ 'global_visualize_read', 'test_logstash_reader', - 'global_dashboard_read', + 'global_dashboard_all', 'reporting_user', ]); }); diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index fff6bbe4f61a6f..3cb59f51c6e5e8 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -247,6 +247,17 @@ export default async function ({ readConfigFile }) { ], }, + global_dashboard_all: { + kibana: [ + { + feature: { + dashboard: ['all'], + }, + spaces: ['*'], + }, + ], + }, + global_discover_read: { kibana: [ { From 8003f1865f355d9ef88d5fb47f165203568ac17a Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Thu, 10 Sep 2020 13:20:05 -0700 Subject: [PATCH 4/7] hitting another bug - added as a comment --- x-pack/test/functional/apps/lens/lens_reporting.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index fcbb612c84a840..d7c84ca1adbca0 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -14,13 +14,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const listingTable = getService('listingTable'); const security = getService('security'); + // https://github.com/elastic/kibana/issues/77246 ( with the dashboard_read permissions- hitting a telemetry 403) describe('lens reporting', () => { before(async () => { await esArchiver.loadIfNeeded('lens/reporting'); await security.testUser.setRoles([ - 'global_visualize_read', 'test_logstash_reader', - 'global_dashboard_all', + 'global_dashboard_read', 'reporting_user', ]); }); From eede93b2ea47fd76b69cfcfdf85e2819e82a4b35 Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Mon, 14 Sep 2020 10:48:05 -0700 Subject: [PATCH 5/7] Revert "update chromedriver to 85" This reverts commit dcd898394e182a9b1e08e39fe1fae23aff57df94. --- package.json | 2 +- yarn.lock | 27 +++++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 2461d04362af43..95a6de337f62a0 100644 --- a/package.json +++ b/package.json @@ -359,7 +359,7 @@ "chai": "3.5.0", "chance": "1.0.18", "cheerio": "0.22.0", - "chromedriver": "^85.0.1", + "chromedriver": "^84.0.0", "classnames": "2.2.6", "compare-versions": "3.5.1", "d3": "3.5.17", diff --git a/yarn.lock b/yarn.lock index 1534ef123788d5..105c5e3cba5ae7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5482,6 +5482,13 @@ agent-base@^4.1.0: dependencies: es6-promisify "^5.0.0" +agent-base@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" + integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg== + dependencies: + es6-promisify "^5.0.0" + agentkeepalive@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c" @@ -8488,16 +8495,16 @@ chrome-trace-event@^1.0.2: dependencies: tslib "^1.9.0" -chromedriver@^85.0.1: - version "85.0.1" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-85.0.1.tgz#2e1b571845253368fcd112108f23eb9c778f7982" - integrity sha512-z8je3U4tXFZnx7AloRabM4Ep1lpFJvHxLoGuRvLg33Qy0UKk/z6OXmHUO2z6DKE0Oe6CFpjj/bdhuQ8dfvq9ug== +chromedriver@^84.0.0: + version "84.0.0" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-84.0.0.tgz#980d72bf0990bbfbce282074d15448296c55d89d" + integrity sha512-fNX9eT1C38D1W8r5ss9ty42eDK+GIkCZVKukfeDs0XSBeKfyT0o/vbMdPr9MUkWQ+vIcFAS5hFGp9E3+xoaMeQ== dependencies: "@testim/chrome-version" "^1.0.7" axios "^0.19.2" del "^5.1.0" - extract-zip "^2.0.1" - https-proxy-agent "^5.0.0" + extract-zip "^2.0.0" + https-proxy-agent "^2.2.4" mkdirp "^1.0.4" tcp-port-used "^1.0.1" @@ -15550,6 +15557,14 @@ https-proxy-agent@^2.2.1: agent-base "^4.1.0" debug "^3.1.0" +https-proxy-agent@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b" + integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg== + dependencies: + agent-base "^4.3.0" + debug "^3.1.0" + https-proxy-agent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" From ef330eff557037f3f2853b8396983a4363d6fa35 Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Thu, 17 Sep 2020 12:23:19 -0700 Subject: [PATCH 6/7] don't refresh the page when setting roles --- x-pack/test/functional/apps/lens/lens_reporting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index acc54b80c67271..e93af0802f6648 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { 'test_logstash_reader', 'global_dashboard_read', 'reporting_user', - ]); + ], false); }); after(async () => { From 9835dd71107bba933ff60c16ade9094172aa16cf Mon Sep 17 00:00:00 2001 From: Rashmi Kulkarni Date: Thu, 17 Sep 2020 14:33:15 -0700 Subject: [PATCH 7/7] lens reporting test --- x-pack/test/functional/apps/lens/lens_reporting.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts index acc54b80c67271..751fbbce13addd 100644 --- a/x-pack/test/functional/apps/lens/lens_reporting.ts +++ b/x-pack/test/functional/apps/lens/lens_reporting.ts @@ -17,11 +17,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('lens reporting', () => { before(async () => { await esArchiver.loadIfNeeded('lens/reporting'); - await security.testUser.setRoles([ - 'test_logstash_reader', - 'global_dashboard_read', - 'reporting_user', - ]); + await security.testUser.setRoles( + ['test_logstash_reader', 'global_dashboard_read', 'reporting_user'], + false + ); }); after(async () => { @@ -40,7 +39,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await PageObjects.reporting.openPdfReportingPanel(); await PageObjects.reporting.clickGenerateReportButton(); const url = await PageObjects.reporting.getReportURL(60000); - expect(url).to.be.ok(); }); });