Merge pull request #894 from OpenBAS-Platform/revert-880-issue/841

Revert "[frontend/backend] Adding the correct version of RabbitMQ"
OpenBAS-Platform · May 16, 2024 · 829ef59 · 829ef59
2 parents 2981eeb + ac39daf
commit 829ef59
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 62 deletions.
diff --git a/openbas-api/src/main/java/io/openbas/helper/RabbitMQHelper.java b/openbas-api/src/main/java/io/openbas/helper/RabbitMQHelper.java
diff --git a/openbas-api/src/main/java/io/openbas/rest/settings/PlatformSettingsApi.java b/openbas-api/src/main/java/io/openbas/rest/settings/PlatformSettingsApi.java
@@ -6,7 +6,6 @@
 import io.openbas.database.model.Theme;
 import io.openbas.database.repository.SettingRepository;
 import io.openbas.executors.caldera.config.CalderaExecutorConfig;
-import io.openbas.helper.RabbitMQHelper;
 import io.openbas.injectors.opencti.config.OpenCTIConfig;
 import io.openbas.rest.helper.RestBehavior;
 import io.openbas.rest.settings.form.SettingsEnterpriseEditionUpdateInput;
@@ -58,8 +57,6 @@ public class PlatformSettingsApi extends RestBehavior {
 
     private CalderaExecutorConfig calderaExecutorConfig;
 
-    private String rabbitMQVersion = null;
-
     @Resource
     private OpenBASConfig openBASConfig;
 
@@ -208,7 +205,6 @@ public PlatformSettings settings() {
                 platformSettings.setPlatformVersion(openBASConfig.getVersion());
                 platformSettings.setPostgreVersion(settingRepository.getServerVersion());
                 platformSettings.setJavaVersion(Runtime.version().toString());
-                platformSettings.setRabbitMQVersion(RabbitMQHelper.getRabbitMQVersion(openBASConfig));
             }
         }
 

diff --git a/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java b/openbas-api/src/main/java/io/openbas/rest/settings/response/PlatformSettings.java
@@ -2,10 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.openbas.rest.settings.form.ThemeInput;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.List;
 
@@ -66,9 +63,6 @@ public class PlatformSettings {
   @JsonProperty("java_version")
   private String javaVersion;
 
-  @JsonProperty("rabbitmq_version")
-  private String rabbitMQVersion;
-
   @JsonProperty("platform_ai_enabled")
   private Boolean aiEnabled;
 

diff --git a/openbas-framework/src/main/java/io/openbas/config/OpenBASConfig.java b/openbas-framework/src/main/java/io/openbas/config/OpenBASConfig.java
@@ -56,12 +56,9 @@ public class OpenBASConfig {
   @JsonProperty("rabbitmq_ssl")
   private boolean rabbitmqSsl = false;
 
-  @JsonProperty("rabbitmq_port")
+  @JsonProperty("rabbitmq_ssl")
   private int rabbitmqPort = 5672;
 
-  @JsonProperty("rabbitmq_management_port")
-  private int rabbitmqManagementPort = 15672;
-
   @JsonProperty("rabbitmq_user")
   private String rabbitmqUser = "guest";
 

diff --git a/openbas-front/src/admin/components/settings/Parameters.tsx b/openbas-front/src/admin/components/settings/Parameters.tsx
@@ -192,7 +192,7 @@ const Parameters = () => {
               </ListItem>
               <ListItem divider={true}>
                 <ListItemText primary={t('RabbitMQ')} />
-                <ItemBoolean status={null} variant="large" neutralLabel={settings?.rabbitmq_version} />
+                <ItemBoolean status={null} variant="large" neutralLabel={settings?.postgre_version} />
               </ListItem>
             </List>
           </Paper>

diff --git a/openbas-front/src/utils/api-types.d.ts b/openbas-front/src/utils/api-types.d.ts
@@ -1878,7 +1878,6 @@ export interface PlatformSettings {
   platform_version?: string;
   platform_whitemark?: string;
   postgre_version?: string;
-  rabbitmq_version?: string;
   xtm_opencti_enable?: boolean;
   xtm_opencti_url?: string;
 }