Merge remote-tracking branch 'origin/master' into release/current

# Conflicts:
#	.drone.yml
#	openbas-api/src/test/java/io/openbas/rest/inject/InjectImportTest.java

Author: guillaumejparis

.drone.yml

@@ -2,6 +2,9 @@
 kind: pipeline
 name: openbas-tests
 
+node:
+  env: kubernetes
+
 steps:
   - name: Runner information
     image: alpine:3.22
@@ -16,12 +19,13 @@ steps:
       MINIO_PORT: 9000
       ENGINE_URL: http://elastic:9200
     commands:
+      - sleep 60
       - mvn clean install -q -DskipTests
       - mvn spotless:check
       - cd openbas-api
-      - mvn test -q
+      - mvn test
       - cd ../openbas-framework
-      - mvn test -q
+      - mvn test
 
   - name: frontend-tests
     image: node:22.17.1-alpine
@@ -84,6 +88,9 @@ steps:
 
   - name: frontend-api-types
     image: node:22.17.1
+    volumes:
+      - name: cache-node-frontend-api-types
+        path: /drone/src/openbas-front/node_modules
     commands:
       - apt update
       - apt -y install netcat-traditional
@@ -188,4 +195,4 @@ services:
     environment:
       discovery.type: single-node
       xpack.security.enabled: false
-      ES_JAVA_OPTS: -Xms2g -Xmx2g
+      ES_JAVA_OPTS: -Xms4g -Xmx4g

openbas-api/src/main/java/io/openbas/executors/crowdstrike/service/CrowdStrikeExecutorService.java

@@ -91,7 +91,9 @@ public CrowdStrikeExecutorService(
                   Endpoint.PLATFORM_TYPE.MacOS.name()
                 });
       } else {
-        executorService.remove(config.getId());
+        if (executor != null) {
+          executorService.remove(config.getId());
+        }
       }
     } catch (Exception e) {
       log.error(String.format("Error creating CrowdStrike executor: %s", e.getMessage()), e);

openbas-api/src/main/java/io/openbas/helper/RabbitMQHelper.java

@@ -44,7 +44,7 @@ public class RabbitMQHelper {
    */
   public static String getRabbitMQVersion(RabbitmqConfig rabbitmqConfig) {
     // If we already have the version, we don't need to get it again
-    if (rabbitMQVersion == null) {
+    if (rabbitMQVersion == null && rabbitmqConfig.getHostname() != null) {
       // Init the rabbit MQ management api overview url
       String uri =
           "http://"

openbas-api/src/main/resources/logback-spring.xml

@@ -1,5 +1,5 @@
 <configuration>
-    <springProfile name="dev">
+    <springProfile name="dev | test">
         <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
         <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
@@ -11,7 +11,7 @@
             <appender-ref ref="STDOUT" />
         </root>
     </springProfile>
-    <springProfile name="!dev">
+    <springProfile name="!(dev | test)">
         <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
         <appender name="jsonEncoder" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.classic.encoder.JsonEncoder">

openbas-api/src/test/java/io/openbas/IntegrationTest.java

@@ -1,9 +1,14 @@
 package io.openbas;
 
+import io.openbas.utilstest.StartupSnapshotTestListener;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestExecutionListeners;
 
 @AutoConfigureMockMvc(print = MockMvcPrint.SYSTEM_ERR)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestExecutionListeners(
+    value = {StartupSnapshotTestListener.class},
+    mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS)
 public abstract class IntegrationTest {}

openbas-api/src/test/java/io/openbas/config/OpenCTIConfigTest.java

@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.openbas.IntegrationTest;
 import io.openbas.injectors.opencti.config.OpenCTIConfig;
 import io.openbas.utils.mockConfig.WithMockOpenCTIConfig;
 import org.junit.jupiter.api.DisplayName;
@@ -12,7 +13,8 @@
 
 @SpringBootTest
 @DisplayName("OpenCTIConfig tests")
-public class OpenCTIConfigTest {
+public class OpenCTIConfigTest extends IntegrationTest {
+
   @Nested
   @WithMockOpenCTIConfig(url = "public_url")
   @DisplayName("When setting only the public URL")

openbas-api/src/test/java/io/openbas/database/model/InjectTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+import io.openbas.IntegrationTest;
 import io.openbas.utils.fixtures.ExerciseFixture;
 import io.openbas.utils.fixtures.InjectFixture;
 import io.openbas.utils.fixtures.PauseFixture;
@@ -17,7 +18,7 @@
 @SpringBootTest
 @TestInstance(PER_CLASS)
 @Transactional
-public class InjectTest {
+public class InjectTest extends IntegrationTest {
 
   @Autowired private ExerciseComposer exerciseComposer;
   @Autowired private InjectComposer injectComposer;

openbas-api/src/test/java/io/openbas/database/model/SimulationTest.java

@@ -2,23 +2,21 @@
 
 import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
 
+import io.openbas.IntegrationTest;
 import io.openbas.database.repository.ExerciseRepository;
 import io.openbas.utils.fixtures.ExerciseFixture;
 import io.openbas.utils.fixtures.composers.ExerciseComposer;
 import jakarta.persistence.EntityManager;
 import java.time.Instant;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootTest
 @TestInstance(PER_CLASS)
 @Transactional
-class SimulationTest {
+class SimulationTest extends IntegrationTest {
   @Autowired private ExerciseComposer exerciseComposer;
   @Autowired private ExerciseRepository exerciseRepository;
   @Autowired private EntityManager entityManager;

openbas-api/src/test/java/io/openbas/helper/InjectHelperTest.java

@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import io.openbas.IntegrationTest;
 import io.openbas.database.model.*;
 import io.openbas.database.repository.*;
 import io.openbas.execution.ExecutableInject;
@@ -18,7 +19,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-public class InjectHelperTest {
+public class InjectHelperTest extends IntegrationTest {
 
   public static final String USER_EMAIL = "[email protected]";
   @Autowired private InjectHelper injectHelper;

openbas-api/src/test/java/io/openbas/importer/V1_DataImporterTest.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.openbas.IntegrationTest;
 import io.openbas.database.model.*;
+import io.openbas.database.model.Tag;
 import io.openbas.database.repository.*;
 import io.openbas.utils.Constants;
 import java.io.IOException;
@@ -16,9 +17,7 @@
 import java.util.Map;
 import java.util.Optional;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.*;
 import org.mockito.MockitoAnnotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;