🐛 Fix and improvements FIPS related

tnb-software · Mar 27, 2023 · 282453c · 282453c
1 parent e0131b3
commit 282453c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/fuse-products/src/main/java/software/tnb/product/csb/application/OpenshiftSpringBootApp.java b/fuse-products/src/main/java/software/tnb/product/csb/application/OpenshiftSpringBootApp.java
@@ -68,7 +68,10 @@ public void stop() {
     public boolean isReady() {
         try {
             final List<Pod> pods = OpenshiftClient.get().getLabeledPods(Map.of(OpenshiftConfiguration.openshiftDeploymentLabel(), finalName));
-            return !pods.isEmpty() && pods.stream().allMatch(Readiness::isPodReady);
+            return !pods.isEmpty() && pods.stream()
+                .filter(pod -> !pod.isMarkedForDeletion())
+                .filter(pod -> !"Evicted".equals(pod.getStatus().getReason()))
+                .allMatch(Readiness::isPodReady);
         } catch (Exception ignored) {
             return false;
         }

diff --git a/.../main/java/software/tnb/product/customizer/component/datasource/DataSourceCustomizer.java b/.../main/java/software/tnb/product/customizer/component/datasource/DataSourceCustomizer.java
@@ -61,7 +61,7 @@ public void customizeSpringboot() {
                 // https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#microsoft-sql-server-jdbc-drive-10
                 url = url + ";encrypt=false;";
             } else if (type.contains("mysql")) {
-                dependencies.add("mysql:mysql-connector-java");
+                dependencies.add("com.mysql:mysql-connector-j");
             }  else if (type.contains("mariadb")) {
                 dependencies.add("org.mariadb.jdbc:mariadb-java-client");
             } else if (type.contains("db2")) {

diff --git a/...m-x/services/db/mongodb/src/main/java/software/tnb/db/mongodb/account/MongoDBAccount.java b/...m-x/services/db/mongodb/src/main/java/software/tnb/db/mongodb/account/MongoDBAccount.java
@@ -4,13 +4,13 @@
 
 public class MongoDBAccount implements Account {
     private String username = "user";
-    private String password = "user";
+    private String password = "useruseruseruseruseruser";
     private String database = "sampledb";
     private String replicaSetUrl;
     private String replicaSetName = "rs0";
     private String replicaSetMode = "primary";
     private String replicaSetKey = "replica";
-    private String rootPassword = "admin";
+    private String rootPassword = "adminadminadminadminadmin";
     private String clientBeanName = "camelMongoClient";
 
     public void setUsername(String username) {

diff --git a/system-x/services/db/mysql/pom.xml b/system-x/services/db/mysql/pom.xml
@@ -15,7 +15,7 @@
     <name>TNB :: System-X :: Services :: DB :: MySQL</name>
 
     <properties>
-        <mysql.driver.version>8.0.29</mysql.driver.version>
+        <mysql.driver.version>8.0.32</mysql.driver.version>
     </properties>
 
     <dependencies>
@@ -29,8 +29,8 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <version>${mysql.driver.version}</version>
         </dependency>
     </dependencies>