github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Add registry config for failing Jest integration tests + unskip (#198840)

Browse source 
## Summary

Closes https://github.com/elastic/kibana/issues/192713

Add `kibanaVersionCheckEnabled: false` to Jest integration test config +
unskip failing 9.0 Jest integration tests.

---------

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Kyle Pollich 2024-11-09 09:27:11 -05:00 • committed by GitHub
parent cb7e5f6a0a
commit 18a09337a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
View file

@ -31,7 +31,7 @@ import {
const logFilePath = Path.join(__dirname, 'logs.log');
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('Fleet cloud preconfiguration', () => {
describe('Fleet cloud preconfiguration', () => {
let esServer: TestElasticsearchUtils;
let kbnServer: TestKibanaUtils;

5
x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config.ts
View file

@ -8,6 +8,11 @@
export const CLOUD_KIBANA_CONFIG = {
xpack: {
fleet: {
internal: {
registry: {
kibanaVersionCheckEnabled: false,
},
},
packages: [
{
name: 'apm',

7
x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
View file

@ -91,7 +91,7 @@ const createAndSetupRoot = async (config?: object) => {
* Verifies that multiple Kibana instances running in parallel will not create duplicate preconfiguration objects.
*/
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('Fleet setup preconfiguration with multiple instances Kibana', () => {
describe('Fleet setup preconfiguration with multiple instances Kibana', () => {
let esServer: TestElasticsearchUtils;
// let esClient: Client;
let roots: Root[] = [];
@ -175,6 +175,11 @@ describe.skip('Fleet setup preconfiguration with multiple instances Kibana', ()
const preconfiguration = {
registryUrl,
internal: {
registry: {
kibanaVersionCheckEnabled: false,
},
},
packages: [
{
name: 'fleet_server',

15
x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
View file

@ -23,7 +23,7 @@ import { useDockerRegistry, waitForFleetSetup, getSupertestWithAdminUser } from
const logFilePath = Path.join(__dirname, 'logs.log');
// Failing 9.0 version update: https://github.com/elastic/kibana/issues/192624
describe.skip('Fleet preconfiguration reset', () => {
describe('Fleet preconfiguration reset', () => {
let esServer: TestElasticsearchUtils;
let kbnServer: TestKibanaUtils;
@ -47,6 +47,11 @@ describe.skip('Fleet preconfiguration reset', () => {
xpack: {
fleet: {
registryUrl,
internal: {
registry: {
kibanaVersionCheckEnabled: false,
},
},
packages: [
{
name: 'fleet_server',
@ -253,7 +258,7 @@ describe.skip('Fleet preconfiguration reset', () => {
);
await resetAPI
.set('kbn-sxrf', 'xx')
.set('Elastic-Api-Version', `${API_VERSIONS.internal.v1}`)
.set('Elastic-Api-Version', `${API_VERSIONS.public.v1}`)
.expect(200)
.send();
@ -298,7 +303,7 @@ describe.skip('Fleet preconfiguration reset', () => {
);
await resetAPI
.set('kbn-sxrf', 'xx')
.set('Elastic-Api-Version', `${API_VERSIONS.internal.v1}`)
.set('Elastic-Api-Version', `${API_VERSIONS.public.v1}`)
.expect(200)
.send();
@ -336,7 +341,7 @@ describe.skip('Fleet preconfiguration reset', () => {
);
await resetAPI
.set('kbn-sxrf', 'xx')
.set('Elastic-Api-Version', `${API_VERSIONS.internal.v1}`)
.set('Elastic-Api-Version', `${API_VERSIONS.public.v1}`)
.expect(200)
.send();
@ -373,7 +378,7 @@ describe.skip('Fleet preconfiguration reset', () => {
);
await resetAPI
.set('kbn-sxrf', 'xx')
.set('Elastic-Api-Version', `${API_VERSIONS.internal.v1}`)
.set('Elastic-Api-Version', `${API_VERSIONS.public.v1}`)
.expect(200)
.send();

8
x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
View file

@ -18,14 +18,14 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.post({
path: PRECONFIGURATION_API_ROUTES.RESET_PATTERN,
access: 'internal',
access: 'public',
fleetAuthz: {
fleet: { all: true },
},
})
.addVersion(
{
version: API_VERSIONS.internal.v1,
version: API_VERSIONS.public.v1,
validate: false,
},
@ -34,14 +34,14 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
router.versioned
.post({
path: PRECONFIGURATION_API_ROUTES.RESET_ONE_PATTERN,
access: 'internal',
access: 'public',
fleetAuthz: {
fleet: { all: true },
},
})
.addVersion(
{
version: API_VERSIONS.internal.v1,
version: API_VERSIONS.public.v1,
validate: { request: PostResetOnePreconfiguredAgentPoliciesSchema },
},
resetOnePreconfigurationHandler