Merge pull request #1 from carmigo/system-initialization-veriables

Add server initialization variables
carmigo · Sep 7, 2022 · 4558f2f · 4558f2f
2 parents ca31b2c + 400a7ca
commit 4558f2f
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 22 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.wix</groupId>
     <artifactId>wix-embedded-mysql-modules</artifactId>
-    <version>4.6.3-SNAPSHOT</version>
+    <version>4.6.4-SNAPSHOT</version>
     <name>Wix Embedded MySql Modules aggregator</name>
     <description>Wix Embedded MySql Modules aggregator</description>
     <url>https://github.com/wix/wix-embedded-mysql</url>
@@ -177,6 +177,7 @@
     </profiles>
 
     <distributionManagement>
+
         <repository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>

diff --git a/wix-embedded-mysql-download-and-extract/pom.xml b/wix-embedded-mysql-download-and-extract/pom.xml
@@ -4,23 +4,23 @@
 
     <groupId>com.wix</groupId>
     <artifactId>wix-embedded-mysql-download-and-extract</artifactId>
-    <version>4.6.3-SNAPSHOT</version>
+    <version>4.6.4-SNAPSHOT</version>
     <name>Wix Embedded Mysql Download and Extract</name>
     <description>Cli tool to predownload/precache mysql artifacts for wix-embedded-mysql</description>
     <url>https://github.com/wix/wix-embedded-mysql/tree/master/wix-embedded-mysql-download-and-extract</url>
 
     <parent>
         <groupId>com.wix</groupId>
         <artifactId>wix-embedded-mysql-modules</artifactId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.4-SNAPSHOT</version>
     </parent>
 
     <dependencies>
 
         <dependency>
             <groupId>com.wix</groupId>
             <artifactId>wix-embedded-mysql</artifactId>
-            <version>4.6.3-SNAPSHOT</version>
+            <version>4.6.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -65,7 +65,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -94,4 +94,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/wix-embedded-mysql/pom.xml b/wix-embedded-mysql/pom.xml
@@ -3,15 +3,15 @@
 
     <groupId>com.wix</groupId>
     <artifactId>wix-embedded-mysql</artifactId>
-    <version>4.6.3-SNAPSHOT</version>
+    <version>4.6.4-SNAPSHOT</version>
     <name>Wix Embedded MySql</name>
     <description>Embedded MySql for E2E/IT tests</description>
     <url>https://github.com/wix/wix-embedded-mysql/tree/master/wix-embedded-mysql</url>
 
     <parent>
         <groupId>com.wix</groupId>
         <artifactId>wix-embedded-mysql-modules</artifactId>
-        <version>4.6.3-SNAPSHOT</version>
+        <version>4.6.4-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/wix-embedded-mysql/src/main/java/com/wix/mysql/config/MysqldConfig.java b/wix-embedded-mysql/src/main/java/com/wix/mysql/config/MysqldConfig.java
@@ -157,6 +157,21 @@ public Builder withTimeZone(String timeZoneId) {
             return withTimeZone(TimeZone.getTimeZone(timeZoneId));
         }
 
+        public Builder withInitServerVariable(String name, boolean value) {
+            this.serverVariables.add(new ServerVariable<>(true, name, value));
+            return this;
+        }
+
+        public Builder withInitServerVariable(String name, int value) {
+            this.serverVariables.add(new ServerVariable<>(true, name, value));
+            return this;
+        }
+
+        public Builder withInitServerVariable(String name, String value) {
+            this.serverVariables.add(new ServerVariable<>(true, name, value));
+            return this;
+        }
+
         /**
          * Provide mysql server option
          *
@@ -233,14 +248,26 @@ public String toString() {
     }
 
     public static class ServerVariable<T> {
+        private final boolean initializer;
         private final String name;
         private final T value;
 
+        ServerVariable(final boolean initializer, final String name, final T value) {
+            this.initializer = initializer;
+            this.name = name;
+            this.value = value;
+        }
+
         ServerVariable(final String name, final T value) {
+            this.initializer = false;
             this.name = name;
             this.value = value;
         }
 
+        public boolean isInitializer() {
+            return initializer;
+        }
+
         public String toCommandLineArgument() {
             return String.format("--%s=%s", name, value);
         }

diff --git a/wix-embedded-mysql/src/main/java/com/wix/mysql/distribution/setup/Mysql57Initializer.java b/wix-embedded-mysql/src/main/java/com/wix/mysql/distribution/setup/Mysql57Initializer.java
@@ -8,6 +8,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -23,14 +26,21 @@ public void apply(IExtractedFileSet files, IRuntimeConfig runtimeConfig, MysqldC
         File baseDir = files.baseDir();
         FileUtils.deleteDirectory(new File(baseDir, "data"));
 
-        Process p = Runtime.getRuntime().exec(new String[] {
-                        files.executable().getAbsolutePath(),
-                        "--no-defaults",
-                        "--initialize-insecure",
-                        "--ignore-db-dir",
-                        format("--basedir=%s", baseDir),
-                        format("--datadir=%s/data", baseDir)
-        });
+        List<String> systemVariables = new ArrayList<>();
+        systemVariables.add(files.executable().getAbsolutePath());
+        systemVariables.add("--no-defaults");
+        systemVariables.add("--initialize-insecure");
+        systemVariables.add("--ignore-db-dir");
+        systemVariables.add(format("--basedir=%s", baseDir));
+        systemVariables.add(format("--datadir=%s/data", baseDir));
+
+        List<String> configSystemVariables = config.getServerVariables().stream()
+                .filter(MysqldConfig.ServerVariable::isInitializer)
+                .map(MysqldConfig.ServerVariable::toCommandLineArgument)
+                .collect(Collectors.toList());
+        systemVariables.addAll(configSystemVariables);
+
+        Process p = Runtime.getRuntime().exec(systemVariables.toArray(new String[0]));
 
         new ProcessRunner(files.executable().getAbsolutePath()).run(p, runtimeConfig, config.getTimeout(NANOSECONDS));
     }

diff --git a/wix-embedded-mysql/src/main/java/com/wix/mysql/distribution/setup/Mysql8Initializer.java b/wix-embedded-mysql/src/main/java/com/wix/mysql/distribution/setup/Mysql8Initializer.java
@@ -1,13 +1,17 @@
 package com.wix.mysql.distribution.setup;
 
 import com.wix.mysql.config.MysqldConfig;
+import com.wix.mysql.config.MysqldConfig.ServerVariable;
 import com.wix.mysql.distribution.Version;
 import de.flapdoodle.embed.process.config.IRuntimeConfig;
 import de.flapdoodle.embed.process.extract.IExtractedFileSet;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -23,12 +27,20 @@ public void apply(IExtractedFileSet files, IRuntimeConfig runtimeConfig, MysqldC
         File baseDir = files.baseDir();
         FileUtils.deleteDirectory(new File(baseDir, "data"));
 
-        Process p = Runtime.getRuntime().exec(new String[]{
-                files.executable().getAbsolutePath(),
-                "--no-defaults",
-                "--initialize-insecure",
-                format("--basedir=%s", baseDir),
-                format("--datadir=%s/data", baseDir)});
+        List<String> systemVariables = new ArrayList<>();
+        systemVariables.add(files.executable().getAbsolutePath());
+        systemVariables.add("--no-defaults");
+        systemVariables.add("--initialize-insecure");
+        systemVariables.add(format("--basedir=%s", baseDir));
+        systemVariables.add(format("--datadir=%s/data", baseDir));
+
+        List<String> configSystemVariables = config.getServerVariables().stream()
+                .filter(ServerVariable::isInitializer)
+                .map(ServerVariable::toCommandLineArgument)
+                .collect(Collectors.toList());
+        systemVariables.addAll(configSystemVariables);
+
+        Process p = Runtime.getRuntime().exec(systemVariables.toArray(new String[0]));
 
         new ProcessRunner(files.executable().getAbsolutePath()).run(p, runtimeConfig, config.getTimeout(NANOSECONDS));
     }