[Fleet] Add registry config for failing Jest integration tests + unsk…

…ip (elastic#198840) ## Summary Closes elastic#192713 Add `kibanaVersionCheckEnabled: false` to Jest integration test config + unskip failing 9.0 Jest integration tests. --------- Co-authored-by: Elastic Machine <[email protected]>
cnasikas · Nov 9, 2024 · 18a0933 · 18a0933
1 parent cb7e5f6
commit 18a0933
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/cloud_preconfiguration.test.ts
@@ -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;
 

diff --git a/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config.ts b/x-pack/plugins/fleet/server/integration_tests/fixtures/cloud_kibana_config.ts
@@ -8,6 +8,11 @@
 export const CLOUD_KIBANA_CONFIG = {
   xpack: {
     fleet: {
+      internal: {
+        registry: {
+          kibanaVersionCheckEnabled: false,
+        },
+      },
       packages: [
         {
           name: 'apm',

diff --git a/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts b/x-pack/plugins/fleet/server/integration_tests/ha_setup.test.ts
@@ -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',

diff --git a/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts b/x-pack/plugins/fleet/server/integration_tests/reset_preconfiguration.test.ts
@@ -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();
 

diff --git a/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts b/x-pack/plugins/fleet/server/routes/preconfiguration/index.ts
@@ -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