@centreon/js-config 24.10.17 → 24.10.19

package/cypress/component/configuration.js

@@ -65,8 +65,14 @@ module.exports = ({
           }
 
           // Save the testRetries object to a file in the e2e/results directory
+          const projectRoot = path.resolve(process.cwd());
+          const resolvedFolder = path.resolve(mainCypressFolder);
+          if (resolvedFolder !== projectRoot && !resolvedFolder.startsWith(projectRoot + path.sep)) {
+            throw new Error('mainCypressFolder is outside of the project directory');
+          }
+
           const resultFilePath = path.join(
-            mainCypressFolder,
+            resolvedFolder,
             'results',
             'retries.json'
           );

package/cypress/e2e/commands/monitoring.ts

@@ -32,12 +32,11 @@ Cypress.Commands.add(
     host,
     isForced = true
   }: ServiceCheck): Cypress.Chainable => {
-    let query = `SELECT id FROM resources WHERE name = '${host}' AND type = 1`;
-
     return cy
       .requestOnDatabase({
         database: 'centreon_storage',
-        query
+        query: 'SELECT id FROM resources WHERE name = ? AND type = 1',
+        params: [host]
       })
       .then(([rows]) => {
         if (rows.length === 0) {
@@ -84,12 +83,11 @@ Cypress.Commands.add(
     isForced = true,
     service
   }: ServiceCheck): Cypress.Chainable => {
-    let query = `SELECT parent_id, id FROM resources WHERE parent_name = '${host}' AND name = '${service}'`;
-
     return cy
       .requestOnDatabase({
         database: 'centreon_storage',
-        query
+        query: 'SELECT parent_id, id FROM resources WHERE parent_name = ? AND name = ?',
+        params: [host, service]
       })
       .then(([rows]) => {
         if (rows.length === 0) {
@@ -181,22 +179,23 @@ Cypress.Commands.add(
     cy.log('Checking hosts in database');
 
     let query = `SELECT COUNT(d.downtime_id) AS count_downtimes FROM downtimes as d
-      INNER JOIN hosts as h ON h.host_id = d.host_id AND h.name = '${downtime.host}'`;
+      INNER JOIN hosts as h ON h.host_id = d.host_id AND h.name = ?`;
+    const params: Array<string> = [downtime.host];
     if (downtime.service) {
-      query += ` INNER JOIN services as s ON s.service_id = d.service_id AND s.description = '${downtime.service}'`;
+      query += ` INNER JOIN services as s ON s.service_id = d.service_id AND s.description = ?`;
+      params.push(downtime.service);
     }
     query += ` WHERE d.started=1`;
     if (!downtime.service) {
       query += ` AND d.service_id = 0`;
     }
 
-    cy.log(query);
-
     cy.waitUntil(() => {
       return cy
         .requestOnDatabase({
           database: 'centreon_storage',
-          query
+          query,
+          params
         })
         .then(([rows]) => {
           const foundDowntimesCount = rows.length ? rows[0].count_downtimes : 0;

package/cypress/e2e/commands.ts

@@ -377,13 +377,14 @@ Output:\n${displayedOutput}`);
 
 interface RequestOnDatabaseProps {
   database: string;
+  params?: Array<string | number>;
   query: string;
 }
 
 Cypress.Commands.add(
   'requestOnDatabase',
-  ({ database, query }: RequestOnDatabaseProps): Cypress.Chainable => {
-    return cy.task('requestOnDatabase', { database, query });
+  ({ database, query, params }: RequestOnDatabaseProps): Cypress.Chainable => {
+    return cy.task('requestOnDatabase', { database, query, params });
   }
 );
 
@@ -449,6 +450,8 @@ Cypress.Commands.add(
 interface StartContainersProps {
   composeFile?: string;
   databaseImage?: string;
+  dbConfiguration?: string;
+  dbStorage?: string;
   moduleName?: string;
   openidImage?: string;
   profiles?: Array<string>;
@@ -463,6 +466,8 @@ Cypress.Commands.add(
   ({
     composeFile,
     databaseImage = Cypress.env('DATABASE_IMAGE'),
+    dbConfiguration = Cypress.env('MYSQL_DB_CONFIGURATION'),
+    dbStorage = Cypress.env('MYSQL_DB_STORAGE'),
     moduleName = 'centreon-web',
     openidImage = `ghcr.io/centreon/centreon/keycloak:${Cypress.env(
       'OPENID_IMAGE_VERSION'
@@ -493,6 +498,8 @@ Cypress.Commands.add(
         {
           composeFile: composeFilePath,
           databaseImage,
+          dbConfiguration,
+          dbStorage,
           openidImage,
           profiles,
           samlImage,
@@ -553,8 +560,8 @@ Cypress.Commands.add(
     cy.log(`Getting logs from container ${name} ...`);
 
     return cy.getLogDirectory().then((logDirectory) => {
-      let sourcePhpLogs = '/var/log/php8.2-fpm-centreon-error.log';
-      let targetPhpLogs = `${logDirectory}/php8.2-fpm-centreon-error.log`;
+      let sourcePhpLogs = '/var/log/centreon/prod.web.log';
+      let targetPhpLogs = `${logDirectory}/prod.web.log`;
       let sourceApacheLogs = '/var/log/apache2';
       let targetApacheLogs = `${logDirectory}/apache2`;
       if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
@@ -957,7 +964,8 @@ declare global {
       }: NavigateToProps) => Cypress.Chainable;
       requestOnDatabase: ({
         database,
-        query
+        query,
+        params
       }: RequestOnDatabaseProps) => Cypress.Chainable;
       setUserTokenApiV1: ({
         login,

package/cypress/e2e/tasks.ts

@@ -2,6 +2,7 @@
 import { execSync } from 'child_process';
 import { existsSync, mkdirSync } from 'fs';
 import path from 'path';
+import fs from "fs";
 
 import tar from 'tar-fs';
 import {
@@ -154,7 +155,7 @@ export default (on: Cypress.PluginEvents): void => {
 
       return container.getMappedPort(containerPort);
     },
-    requestOnDatabase: async ({ database, query }) => {
+    requestOnDatabase: async ({ database, query, params }) => {
       let container: StartedTestContainer | null = null;
 
       if (dockerEnvironment !== null) {
@@ -171,11 +172,15 @@ export default (on: Cypress.PluginEvents): void => {
         user: 'centreon'
       });
 
-      const [rows, fields] = await client.query(query);
-
-      await client.end();
+      try {
+        const [rows, fields] = params
+          ? await client.execute(query, params)
+          : await client.query(query);
 
-      return [rows, fields];
+        return [rows, fields];
+      } finally {
+        await client.end();
+      }
     },
     startContainer: async ({
       command,
@@ -205,6 +210,8 @@ export default (on: Cypress.PluginEvents): void => {
     startContainers: async ({
       composeFile,
       databaseImage,
+      dbConfiguration,
+      dbStorage,
       openidImage,
       profiles,
       samlImage,
@@ -214,16 +221,24 @@ export default (on: Cypress.PluginEvents): void => {
         const composeFileDir = path.dirname(composeFile);
         const composeFileName = path.basename(composeFile);
 
+        const environment: Record<string, string> = {
+          MYSQL_IMAGE: databaseImage,
+          OPENID_IMAGE: openidImage,
+          SAML_IMAGE: samlImage,
+          WEB_IMAGE: webImage,
+        };
+        if (dbConfiguration) {
+          environment.MYSQL_DB_CONFIGURATION = dbConfiguration;
+        }
+        if (dbStorage) {
+          environment.MYSQL_DB_STORAGE = dbStorage;
+        }
+
         dockerEnvironment = await new DockerComposeEnvironment(
           composeFileDir,
           composeFileName
         )
-          .withEnvironment({
-            MYSQL_IMAGE: databaseImage,
-            OPENID_IMAGE: openidImage,
-            SAML_IMAGE: samlImage,
-            WEB_IMAGE: webImage
-          })
+          .withEnvironment(environment)
           .withProfiles(...profiles)
           .withStartupTimeout(120000)
           .withWaitStrategy(
@@ -277,6 +292,83 @@ export default (on: Cypress.PluginEvents): void => {
       execSync(`npx wait-on ${url}`);
 
       return null;
-    }
+    },
+    listFilesInDirectory: async ( directoryPath ) => {
+      return new Promise((resolve, reject) => {
+        fs.readdir(directoryPath, (err, files) => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(files);
+          }
+        });
+      });
+    },
+    fileExists: async ( filePath ) => {
+      return fs.existsSync(filePath);
+    },
+    getExportedFile({ downloadsFolder }: { downloadsFolder: string }): string {
+      const files = fs
+        .readdirSync(downloadsFolder)
+        .filter((name) => name.startsWith("ResourceStatusExport_all") && name.endsWith(".csv"))
+        .map((name) => ({
+          name,
+          time: fs.statSync(path.join(downloadsFolder, name)).mtime.getTime()
+        }))
+        .sort((a, b) => b.time - a.time);
+
+      if (files.length === 0) {
+        throw new Error("No exported file found");
+      }
+
+      return path.join(downloadsFolder, files[0].name);
+    },
+    readCsvFile({ filePath }: { filePath: string }): Promise<string> {
+      const projectRoot = path.resolve(process.cwd());
+      const resolvedPath = path.resolve(filePath);
+      if (resolvedPath !== projectRoot && !resolvedPath.startsWith(projectRoot + path.sep)) {
+        return Promise.reject(new Error("Path is outside of the project directory"));
+      }
+
+      return new Promise((resolve, reject) => {
+        fs.readFile(resolvedPath, "utf8", (err, data) => {
+          if (err) return reject(err);
+          resolve(data);
+        });
+      });
+    },
+    clearDownloadsFolder({ downloadsFolder }: { downloadsFolder: string }): null {
+      const projectRoot = path.resolve(process.cwd());
+      const resolvedFolder = path.resolve(downloadsFolder);
+      if (resolvedFolder !== projectRoot && !resolvedFolder.startsWith(projectRoot + path.sep)) {
+        throw new Error("Path is outside of the project directory");
+      }
+
+      if (!fs.existsSync(resolvedFolder)) {
+        return null;
+      }
+
+      const files = fs.readdirSync(resolvedFolder);
+      for (const file of files) {
+        const filePath = path.join(resolvedFolder, file);
+        if (!filePath.startsWith(resolvedFolder + path.sep)) {
+          continue;
+        }
+        fs.unlinkSync(filePath);
+      }
+
+      return null;
+    },
+    isDownloadComplete({ downloadsFolder }: { downloadsFolder: string }): boolean {
+      if (!fs.existsSync(downloadsFolder)) return false;
+
+      const files = fs
+        .readdirSync(downloadsFolder)
+        .filter(
+          (name) => !name.endsWith(".crdownload") && !name.endsWith(".tmp")
+        );
+
+      return files.length > 0;
+    },
   });
 };

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@centreon/js-config",
 	"description": "Centreon Frontend shared build configuration",
-	"version": "24.10.17",
+	"version": "24.10.19",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/centreon/centreon.git"