@centreon/js-config 24.4.1-MON-23368-containers.14 → 24.4.1-release-24-04-next.0

package/cypress/e2e/commands.ts

@@ -100,24 +100,6 @@ Cypress.Commands.add(
   }
 );
 
-Cypress.Commands.add('getContainerId', (containerName: string) => {
-  cy.log(`Getting container id of ${containerName}`);
-
-  return cy.task('getContainerId', containerName);
-});
-
-Cypress.Commands.add('getContainerIpAddress', (containerName: string) => {
-  cy.log(`Getting container ip address of ${containerName}`);
-
-  return cy.task('getContainerIpAddress', containerName);
-});
-
-Cypress.Commands.add('getContainersLogs', () => {
-  cy.log('Getting containers logs');
-
-  return cy.task('getContainersLogs');
-});
-
 interface CopyFromContainerProps {
   destination: string;
   name?: string;
@@ -126,18 +108,15 @@ interface CopyFromContainerProps {
 
 Cypress.Commands.add(
   'copyFromContainer',
-  ({
-    name = Cypress.env('dockerName'),
-    source,
-    destination
-  }: CopyFromContainerProps) => {
-    cy.log(`Copy content from ${name}:${source} to ${destination}`);
-
-    return cy.task('copyFromContainer', {
-      destination,
-      serviceName: name,
-      source
-    });
+  (
+    {
+      name = Cypress.env('dockerName'),
+      source,
+      destination
+    }: CopyFromContainerProps,
+    options?: Partial<Cypress.ExecOptions>
+  ) => {
+    return cy.exec(`docker cp ${name}:${source} "${destination}"`, options);
   }
 );
 
@@ -157,8 +136,6 @@ Cypress.Commands.add(
     }: CopyToContainerProps,
     options?: Partial<Cypress.ExecOptions>
   ) => {
-    cy.log(`Copy content from ${source} to ${name}:${destination}`);
-
     return cy.exec(`docker cp ${source} ${name}:${destination}`, options);
   }
 );
@@ -229,23 +206,19 @@ interface ExecInContainerProps {
   name: string;
 }
 
-interface ExecInContainerResult {
-  exitCode: number;
-  output: string;
-}
-
 Cypress.Commands.add(
   'execInContainer',
   ({ command, name }: ExecInContainerProps): Cypress.Chainable => {
     return cy
-      .task<ExecInContainerResult>('execInContainer', { command, name })
+      .exec(`docker exec -i ${name} ${command}`, { failOnNonZeroExit: false })
       .then((result) => {
-        if (result.exitCode) {
+        if (result.code) {
           // output will not be truncated
           throw new Error(`
             Execution of "${command}" failed
-            Exit code: ${result.exitCode}
-            Output:\n${result.output}`);
+            Exit code: ${result.code}
+            Stdout:\n${result.stdout}
+            Stderr:\n${result.stderr}`);
         }
 
         return cy.wrap(result);
@@ -253,166 +226,181 @@ Cypress.Commands.add(
   }
 );
 
-interface RequestOnDatabaseProps {
-  database: string;
-  query: string;
+interface PortBinding {
+  destination: number;
+  source: number;
+}
+
+interface StartContainerProps {
+  image: string;
+  name: string;
+  portBindings: Array<PortBinding>;
 }
 
 Cypress.Commands.add(
-  'requestOnDatabase',
-  ({ database, query }: RequestOnDatabaseProps): Cypress.Chainable => {
-    return cy.task('requestOnDatabase', { database, query });
+  'startContainer',
+  ({ name, image, portBindings }: StartContainerProps): Cypress.Chainable => {
+    cy.log(`Starting container ${name} from image ${image}`);
+
+    return cy.task(
+      'startContainer',
+      { image, name, portBindings },
+      { timeout: 600000 } // 10 minutes because docker pull can be very slow
+    );
   }
 );
 
-interface StartContainersProps {
-  databaseImage?: string;
-  openidImage?: string;
-  profiles?: Array<string>;
-  samlImage?: string;
+Cypress.Commands.add(
+  'createDirectory',
+  (directoryPath: string): Cypress.Chainable => {
+    return cy.task('createDirectory', directoryPath);
+  }
+);
+
+interface StartWebContainerProps {
+  name?: string;
+  os?: string;
   useSlim?: boolean;
-  webOs?: string;
-  webVersion?: string;
+  version?: string;
 }
 
 Cypress.Commands.add(
-  'startContainers',
+  'startWebContainer',
   ({
-    databaseImage = Cypress.env('DATABASE_IMAGE'),
-    openidImage = `docker.centreon.com/centreon/keycloak:${Cypress.env(
-      'OPENID_IMAGE_VERSION'
-    )}`,
-    profiles = [],
-    samlImage = `docker.centreon.com/centreon/keycloak:${Cypress.env(
-      'SAML_IMAGE_VERSION'
-    )}`,
+    name = Cypress.env('dockerName'),
+    os = Cypress.env('WEB_IMAGE_OS'),
     useSlim = true,
-    webOs = Cypress.env('WEB_IMAGE_OS'),
-    webVersion = Cypress.env('WEB_IMAGE_VERSION')
-  }: StartContainersProps = {}): Cypress.Chainable => {
-    cy.log('Starting containers ...');
-
+    version = Cypress.env('WEB_IMAGE_VERSION')
+  }: StartWebContainerProps = {}): Cypress.Chainable => {
     const slimSuffix = useSlim ? '-slim' : '';
 
-    const webImage = `docker.centreon.com/centreon/centreon-web${slimSuffix}-${webOs}:${webVersion}`;
+    const image = `docker.centreon.com/centreon/centreon-web${slimSuffix}-${os}:${version}`;
 
     return cy
-      .task(
-        'startContainers',
-        { databaseImage, openidImage, profiles, samlImage, webImage },
-        { timeout: 600000 } // 10 minutes because docker pull can be very slow
-      )
+      .startContainer({
+        image,
+        name,
+        portBindings: [{ destination: 4000, source: 80 }]
+      })
       .then(() => {
         const baseUrl = 'http://127.0.0.1:4000';
 
         Cypress.config('baseUrl', baseUrl);
 
-        return cy.wrap(null);
+        return cy.task(
+          'waitOn',
+          `${baseUrl}/centreon/api/latest/platform/installation/status`
+        );
       })
       .visit('/') // this is necessary to refresh browser cause baseUrl has changed (flash appears in video)
       .setUserTokenApiV1();
   }
 );
 
-Cypress.Commands.add('stopContainers', (): Cypress.Chainable => {
-  cy.log('Stopping containers ...');
+interface StopWebContainerProps {
+  name?: string;
+}
+
+Cypress.Commands.add(
+  'stopWebContainer',
+  ({
+    name = Cypress.env('dockerName')
+  }: StopWebContainerProps = {}): Cypress.Chainable => {
+    const logDirectory = `results/logs/${Cypress.spec.name.replace(
+      artifactIllegalCharactersMatcher,
+      '_'
+    )}/${Cypress.currentTest.title.replace(
+      artifactIllegalCharactersMatcher,
+      '_'
+    )}`;
 
-  const logDirectory = `results/logs/${Cypress.spec.name.replace(
-    artifactIllegalCharactersMatcher,
-    '_'
-  )}/${Cypress.currentTest.title.replace(
-    artifactIllegalCharactersMatcher,
-    '_'
-  )}`;
+    return cy
+      .visitEmptyPage()
+      .createDirectory(logDirectory)
+      .copyFromContainer({
+        destination: `${logDirectory}/broker`,
+        name,
+        source: '/var/log/centreon-broker'
+      })
+      .copyFromContainer({
+        destination: `${logDirectory}/engine`,
+        name,
+        source: '/var/log/centreon-engine'
+      })
+      .copyFromContainer({
+        destination: `${logDirectory}/centreon`,
+        name,
+        source: '/var/log/centreon'
+      })
+      .copyFromContainer({
+        destination: `${logDirectory}/centreon-gorgone`,
+        name,
+        source: '/var/log/centreon-gorgone'
+      })
+      .then(() => {
+        if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
+          return cy.copyFromContainer({
+            destination: `${logDirectory}/php`,
+            name,
+            source: '/var/log/php-fpm'
+          });
+        }
 
-  const name = 'web';
+        return cy.copyFromContainer(
+          {
+            destination: `${logDirectory}/php8.1-fpm-centreon-error.log`,
+            name,
+            source: '/var/log/php8.1-fpm-centreon-error.log'
+          },
+          { failOnNonZeroExit: false }
+        );
+      })
+      .then(() => {
+        if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
+          return cy.copyFromContainer({
+            destination: `${logDirectory}/httpd`,
+            name,
+            source: '/var/log/httpd'
+          });
+        }
 
-  return cy
-    .visitEmptyPage()
-    .createDirectory(logDirectory)
-    .getContainersLogs()
-    .then((containersLogs: Array<Array<string>>) => {
-      Object.entries(containersLogs).forEach(([containerName, logs]) => {
-        cy.writeFile(
-          `results/logs/${Cypress.spec.name.replace(
-            artifactIllegalCharactersMatcher,
-            '_'
-          )}/${Cypress.currentTest.title.replace(
-            artifactIllegalCharactersMatcher,
-            '_'
-          )}/container-${containerName}.log`,
-          logs
+        return cy.copyFromContainer(
+          {
+            destination: `${logDirectory}/apache2`,
+            name,
+            source: '/var/log/apache2'
+          },
+          { failOnNonZeroExit: false }
         );
-      });
-    })
-    .copyFromContainer({
-      destination: `${logDirectory}/broker`,
-      name,
-      source: '/var/log/centreon-broker'
-    })
-    .copyFromContainer({
-      destination: `${logDirectory}/engine`,
-      name,
-      source: '/var/log/centreon-engine'
-    })
-    .copyFromContainer({
-      destination: `${logDirectory}/centreon`,
-      name,
-      source: '/var/log/centreon'
-    })
-    .copyFromContainer({
-      destination: `${logDirectory}/centreon-gorgone`,
-      name,
-      source: '/var/log/centreon-gorgone'
-    })
-    .then(() => {
-      if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-        return cy.copyFromContainer({
-          destination: `${logDirectory}/php`,
-          name,
-          source: '/var/log/php-fpm'
-        });
-      }
+      })
+      .exec(`chmod -R 755 "${logDirectory}"`)
+      .stopContainer({ name });
+  }
+);
 
-      return cy.copyFromContainer(
-        {
-          destination: `${logDirectory}/php8.1-fpm-centreon-error.log`,
-          name,
-          source: '/var/log/php8.1-fpm-centreon-error.log'
-        },
-        { failOnNonZeroExit: false }
-      );
-    })
-    .then(() => {
-      if (Cypress.env('WEB_IMAGE_OS').includes('alma')) {
-        return cy.copyFromContainer({
-          destination: `${logDirectory}/httpd`,
-          name,
-          source: '/var/log/httpd'
-        });
-      }
+interface StopContainerProps {
+  name: string;
+}
 
-      return cy.copyFromContainer(
-        {
-          destination: `${logDirectory}/apache2`,
-          name,
-          source: '/var/log/apache2'
-        },
-        { failOnNonZeroExit: false }
+Cypress.Commands.add(
+  'stopContainer',
+  ({ name }: StopContainerProps): Cypress.Chainable => {
+    cy.log(`Stopping container ${name}`);
+
+    cy.exec(`docker logs ${name}`).then(({ stdout }) => {
+      cy.writeFile(
+        `results/logs/${Cypress.spec.name.replace(
+          artifactIllegalCharactersMatcher,
+          '_'
+        )}/${Cypress.currentTest.title.replace(
+          artifactIllegalCharactersMatcher,
+          '_'
+        )}/container-${name}.log`,
+        stdout
       );
-    })
-    .exec(`chmod -R 755 "${logDirectory}"`)
-    .task(
-      'stopContainers',
-      {},
-      { timeout: 600000 } // 10 minutes because docker pull can be very slow
-    );
-});
+    });
 
-Cypress.Commands.add(
-  'createDirectory',
-  (directoryPath: string): Cypress.Chainable => {
-    return cy.task('createDirectory', directoryPath);
+    return cy.task('stopContainer', { name });
   }
 );
 
@@ -588,9 +576,6 @@ declare global {
         command,
         name
       }: ExecInContainerProps) => Cypress.Chainable;
-      getContainerId: (containerName: string) => Cypress.Chainable;
-      getContainerIpAddress: (containerName: string) => Cypress.Chainable;
-      getContainersLogs: () => Cypress.Chainable;
       getIframeBody: () => Cypress.Chainable;
       getTimeFromHeader: () => Cypress.Chainable;
       getWebVersion: () => Cypress.Chainable;
@@ -601,6 +586,7 @@ declare global {
         dashboard: Dashboard,
         patch: PatchDashboardBody
       ) => Cypress.Chainable;
+
       loginByTypeOfUser: ({
         jsonName,
         loginViaApi
@@ -611,24 +597,23 @@ declare global {
         rootItemNumber,
         subMenu
       }: NavigateToProps) => Cypress.Chainable;
-      requestOnDatabase: ({
-        database,
-        query
-      }: RequestOnDatabaseProps) => Cypress.Chainable;
       shareDashboardToUser: ({
         dashboardName,
         userName,
         role
       }: ShareDashboardToUserProps) => Cypress.Chainable;
-      startContainers: ({
-        databaseImage,
-        openidImage,
-        profiles,
+      startContainer: ({
+        name,
+        image
+      }: StartContainerProps) => Cypress.Chainable;
+      startWebContainer: ({
+        name,
+        os,
         useSlim,
-        webOs,
-        webVersion
-      }?: StartContainersProps) => Cypress.Chainable;
-      stopContainers: () => Cypress.Chainable;
+        version
+      }?: StartWebContainerProps) => Cypress.Chainable;
+      stopContainer: ({ name }: StopContainerProps) => Cypress.Chainable;
+      stopWebContainer: ({ name }?: StopWebContainerProps) => Cypress.Chainable;
       visitEmptyPage: () => Cypress.Chainable;
       waitForContainerAndSetToken: () => Cypress.Chainable;
     }

package/cypress/e2e/configuration.ts

@@ -60,9 +60,7 @@ export default ({
     },
     env: {
       ...env,
-      DATABASE_IMAGE: 'bitnami/mariadb:10.5',
       OPENID_IMAGE_VERSION: process.env.MAJOR || '24.04',
-      SAML_IMAGE_VERSION: process.env.MAJOR || '24.04',
       WEB_IMAGE_OS: 'alma9',
       WEB_IMAGE_VERSION: webImageVersion,
       dockerName: dockerName || 'centreon-dev'

package/cypress/e2e/tasks.ts

@@ -1,20 +1,10 @@
-/* eslint-disable no-console */
 import { execSync } from 'child_process';
-import { cp, existsSync, mkdirSync } from 'fs';
+import { existsSync, mkdirSync } from 'fs';
 
 import Docker from 'dockerode';
-import tar from 'tar-fs';
-import {
-  DockerComposeEnvironment,
-  StartedTestContainer,
-  Wait,
-  getContainerRuntimeClient
-} from 'testcontainers';
-import { createConnection } from 'mysql2/promise';
 
 export default (on: Cypress.PluginEvents): void => {
   const docker = new Docker();
-  let dockerEnvironment;
 
   interface PortBinding {
     destination: number;
@@ -32,19 +22,6 @@ export default (on: Cypress.PluginEvents): void => {
   }
 
   on('task', {
-    copyFromContainer: async ({ destination, serviceName, source }) => {
-      const container = dockerEnvironment.getContainer(`${serviceName}-1`);
-
-      await container.copyArchiveFromContainer(source).then((archiveStream) => {
-        return new Promise<void>((resolve) => {
-          const dest = tar.extract(destination);
-          archiveStream.pipe(dest);
-          dest.on('finish', resolve);
-        });
-      });
-
-      return null;
-    },
     createDirectory: async (directoryPath: string) => {
       if (!existsSync(directoryPath)) {
         mkdirSync(directoryPath, { recursive: true });
@@ -52,70 +29,6 @@ export default (on: Cypress.PluginEvents): void => {
 
       return null;
     },
-    execInContainer: async ({ command, name }) => {
-      const container = dockerEnvironment.getContainer(`${name}-1`);
-
-      const { exitCode, output } = await container.exec([
-        'bash',
-        '-c',
-        command
-      ]);
-
-      return { exitCode, output };
-    },
-    getContainerId: (containerName: string) => {
-      const container: StartedTestContainer = dockerEnvironment.getContainer(
-        `${containerName}-1`
-      );
-
-      return container.getId();
-    },
-    getContainerIpAddress: (containerName: string) => {
-      const container: StartedTestContainer = dockerEnvironment.getContainer(
-        `${containerName}-1`
-      );
-
-      const networkNames = container.getNetworkNames();
-
-      return container.getIpAddress(networkNames[0]);
-    },
-    getContainersLogs: async () => {
-      try {
-        const { dockerode } = (await getContainerRuntimeClient()).container;
-        const containers = await dockerode.listContainers();
-
-        return containers.reduce((acc, container) => {
-          const containerName = container.Names[0].replace('/', '');
-          acc[containerName] = execSync(`docker logs -t ${container.Id}`, {
-            stdio: 'pipe'
-          }).toString('utf8');
-
-          return acc;
-        }, {});
-      } catch (error) {
-        console.warn('Cannot get containers logs');
-        console.warn(error);
-
-        return null;
-      }
-    },
-    requestOnDatabase: async ({ database, query }) => {
-      const container = dockerEnvironment.getContainer('db-1');
-
-      const client = await createConnection({
-        database,
-        host: container.getHost(),
-        password: 'centreon',
-        port: container.getMappedPort(3306),
-        user: 'centreon'
-      });
-
-      const [rows, fields] = await client.execute(query);
-
-      await client.end();
-
-      return [rows, fields];
-    },
     startContainer: async ({
       image,
       name,
@@ -176,32 +89,6 @@ export default (on: Cypress.PluginEvents): void => {
 
       return container;
     },
-    startContainers: async ({
-      composeFilePath = `${__dirname}/../../../../../.github/docker/`,
-      databaseImage,
-      openidImage,
-      profiles,
-      samlImage,
-      webImage
-    }) => {
-      const composeFile = 'docker-compose.yml';
-
-      dockerEnvironment = await new DockerComposeEnvironment(
-        composeFilePath,
-        composeFile
-      )
-        .withEnvironment({
-          MYSQL_IMAGE: databaseImage,
-          OPENID_IMAGE: openidImage,
-          SAML_IMAGE: samlImage,
-          WEB_IMAGE: webImage
-        })
-        .withProfiles(...profiles)
-        .withWaitStrategy('web', Wait.forHealthCheck())
-        .up();
-
-      return null;
-    },
     stopContainer: async ({ name }: StopContainerProps) => {
       const container = await docker.getContainer(name);
       await container.kill();
@@ -209,11 +96,6 @@ export default (on: Cypress.PluginEvents): void => {
 
       return null;
     },
-    stopContainers: async () => {
-      await dockerEnvironment.down();
-
-      return null;
-    },
     waitOn: async (url: string) => {
       execSync(`npx wait-on ${url}`);
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@centreon/js-config",
     "description": "Centreon Frontend shared build configuration",
-    "version": "24.4.1-MON-23368-containers.14",
+    "version": "24.4.1-release-24-04-next.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/centreon/centreon-frontend.git"
@@ -24,8 +24,8 @@
         "cypress"
     ],
     "peerDependencies": {
-        "eslint": "^8.53.0",
-        "prettier": "^3.0.0"
+        "prettier": "^3.0.0",
+        "eslint": "^8.53.0"
     },
     "dependencies": {
         "@badeball/cypress-cucumber-preprocessor": "^19.1.0",
@@ -58,9 +58,6 @@
         "eslint-plugin-react-hooks": "^4.5.0",
         "eslint-plugin-sort-keys-fix": "^1.1.2",
         "eslint-plugin-typescript-sort-keys": "^2.1.0",
-        "mochawesome": "^7.1.3",
-        "mysql2": "^3.6.5",
-        "tar-fs": "^3.0.4",
-        "testcontainers": "^10.4.0"
+        "mochawesome": "^7.1.3"
     }
 }