Allow easily overriding database, username and password for Dev Services

Not all database containers support everything but it's implemented for
all everything that is supported.

docs/src/main/asciidoc/databases-dev-services.adoc

@@ -85,13 +85,13 @@ Login credentials are the same for most databases, except when the database requ
 |Database |Username |Password |Database name
 
 |PostgreSQL, MariaDB, MySQL, IBM Db2, H2
-|quarkus
-|quarkus
-|quarkus
+|`quarkus` for the default datasource or name of the datasource
+|`quarkus`
+|`quarkus`
 
 |Microsoft SQL Server
-|SA
-|Quarkuspassword1
+|`SA`
+|`Quarkus123`
 |
 
 |===
@@ -102,6 +102,15 @@ The Microsoft SQL Server Testcontainer doesn't support defining the username or
 It also requires a strong password.
 ====
 
+[TIP]
+====
+For databases supporting it
+(i.e. all of them except Microsoft SQL Server for which it is only possible to override the password),
+you can override the database name, username and password used by the Dev Service.
+
+See <<configuration-reference>> for more information.
+====
+
 Keep in mind that, except if configured otherwise (see below), a Dev Service runs on a random port.
 For instance, when you run PostgreSQL as a Dev Service and have `psql` installed on the host, you can connect via:
 
@@ -134,6 +143,8 @@ quarkus.datasource."datasource-name".devservices.port=<your fixed port> <2>
 <1> Fixed port for the default datasource.
 <2> Fixed port for a named datasource.
 
+
+[[configuration-reference]]
 == Configuration Reference
 
 Dev Services for Databases support the following configuration options:

extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DatabaseDefaultSetupConfig.java

@@ -8,8 +8,8 @@ private DatabaseDefaultSetupConfig() {
     public static final String DEFAULT_DATABASE_USERNAME = "quarkus";
 
     public static final String DEFAULT_DATABASE_PASSWORD = "quarkus";
-
     // mssql container enforces a 'strong' password with min 8 chars, upper/lowercase, number or special char
-    public static final String DEFAULT_DATABASE_STRONG_PASSWORD = "Quarkuspassword1";
+    public static final String DEFAULT_DATABASE_STRONG_PASSWORD = "Quarkus123";
+
     public static final String DEFAULT_DATABASE_NAME = "quarkus";
 }

extensions/datasource/deployment-spi/src/main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceContainerConfig.java

@@ -11,17 +11,26 @@ public class DevServicesDatasourceContainerConfig {
     private final Map<String, String> additionalJdbcUrlProperties;
     private final OptionalInt fixedExposedPort;
     private final Optional<String> command;
+    private final Optional<String> dbName;
+    private final Optional<String> username;
+    private final Optional<String> password;
 
     public DevServicesDatasourceContainerConfig(Optional<String> imageName,
             Map<String, String> containerProperties,
             Map<String, String> additionalJdbcUrlProperties,
             OptionalInt port,
-            Optional<String> command) {
+            Optional<String> command,
+            Optional<String> dbName,
+            Optional<String> username,
+            Optional<String> password) {
         this.imageName = imageName;
         this.containerProperties = containerProperties;
         this.additionalJdbcUrlProperties = additionalJdbcUrlProperties;
         this.fixedExposedPort = port;
         this.command = command;
+        this.dbName = dbName;
+        this.username = username;
+        this.password = password;
     }
 
     public Optional<String> getImageName() {
@@ -43,4 +52,16 @@ public OptionalInt getFixedExposedPort() {
     public Optional<String> getCommand() {
         return command;
     }
+
+    public Optional<String> getDbName() {
+        return dbName;
+    }
+
+    public Optional<String> getUsername() {
+        return username;
+    }
+
+    public Optional<String> getPassword() {
+        return password;
+    }
 }

extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java

@@ -267,7 +267,10 @@ private RunningDevService startDevDb(String dbName,
                     dataSourceBuildTimeConfig.devservices.containerProperties,
                     dataSourceBuildTimeConfig.devservices.properties,
                     dataSourceBuildTimeConfig.devservices.port,
-                    dataSourceBuildTimeConfig.devservices.command);
+                    dataSourceBuildTimeConfig.devservices.command,
+                    dataSourceBuildTimeConfig.devservices.dbName,
+                    dataSourceBuildTimeConfig.devservices.username,
+                    dataSourceBuildTimeConfig.devservices.password);
 
             DevServicesDatasourceProvider.RunningDevServicesDatasource datasource = devDbProvider
                     .startDatabase(ConfigProvider.getConfig().getOptionalValue(prefix + "username", String.class),

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java

@@ -59,4 +59,21 @@ public class DevServicesBuildTimeConfig {
     @ConfigItem
     public Optional<String> command;
 
+    /**
+     * The name of the database to use if this Dev Service supports overriding it.
+     */
+    @ConfigItem
+    public Optional<String> dbName;
+
+    /**
+     * The username to use if this Dev Service supports overriding it.
+     */
+    @ConfigItem
+    public Optional<String> username;
+
+    /**
+     * The password to use if this Dev Service supports overriding it.
+     */
+    @ConfigItem
+    public Optional<String> password;
 }

extensions/devservices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java

@@ -39,9 +39,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withUsername(username.orElse(DEFAULT_DATABASE_USERNAME))
-                        .withPassword(password.orElse(DEFAULT_DATABASE_PASSWORD))
-                        .withDatabaseName(datasourceName.orElse(DEFAULT_DATABASE_NAME))
+
+                String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
+                container.withUsername(effectiveUsername)
+                        .withPassword(effectivePassword)
+                        .withDatabaseName(effectiveDbName)
                         .withReuse(true);
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);

extensions/devservices/derby/src/main/java/io/quarkus/devservices/derby/deployment/DerbyDevServicesProcessor.java

@@ -1,5 +1,7 @@
 package io.quarkus.devservices.derby.deployment;
 
+import static io.quarkus.datasource.deployment.spi.DatabaseDefaultSetupConfig.DEFAULT_DATABASE_NAME;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -36,6 +38,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                     int port = containerConfig.getFixedExposedPort().isPresent()
                             ? containerConfig.getFixedExposedPort().getAsInt()
                             : 1527 + (launchMode == LaunchMode.TEST ? 0 : 1);
+
+                    String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
                     NetworkServerControl server = new NetworkServerControl(InetAddress.getByName("localhost"), port);
                     server.start(new PrintWriter(System.out));
                     for (int i = 1; i <= NUMBER_OF_PINGS; i++) {
@@ -65,7 +70,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         additionalArgs.append(i.getValue());
                     }
                     return new RunningDevServicesDatasource(null,
-                            "jdbc:derby://localhost:" + port + "/memory:" + datasourceName.orElse("quarkus") + ";create=true"
+                            "jdbc:derby://localhost:" + port + "/memory:" + effectiveDbName + ";create=true"
                                     + additionalArgs.toString(),
                             null,
                             null,

extensions/devservices/h2/src/main/java/io/quarkus/devservices/h2/deployment/H2DevServicesProcessor.java

@@ -43,6 +43,10 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                             "-ifNotExists");
                     tcpServer.start();
 
+                    String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                    String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                    String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
                     StringBuilder additionalArgs = new StringBuilder();
                     for (Map.Entry<String, String> i : containerConfig.getAdditionalJdbcUrlProperties().entrySet()) {
                         additionalArgs.append(";");
@@ -54,13 +58,13 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                     LOG.info("Dev Services for H2 started.");
 
                     String connectionUrl = "jdbc:h2:tcp://localhost:" + tcpServer.getPort() + "/mem:"
-                            + datasourceName.orElse(DEFAULT_DATABASE_NAME)
+                            + effectiveDbName
                             + ";DB_CLOSE_DELAY=-1" + additionalArgs.toString();
                     return new RunningDevServicesDatasource(null,
                             connectionUrl,
                             null,
-                            DEFAULT_DATABASE_USERNAME,
-                            DEFAULT_DATABASE_PASSWORD,
+                            effectiveUsername,
+                            effectivePassword,
                             new Closeable() {
                                 @Override
                                 public void close() throws IOException {
@@ -70,8 +74,8 @@ public void close() throws IOException {
                                         //make sure the DB is removed on close
                                         try (Connection connection = DriverManager.getConnection(
                                                 connectionUrl,
-                                                DEFAULT_DATABASE_USERNAME,
-                                                DEFAULT_DATABASE_PASSWORD)) {
+                                                effectiveUsername,
+                                                effectivePassword)) {
                                             try (Statement statement = connection.createStatement()) {
                                                 statement.execute("SET DB_CLOSE_DELAY 0");
                                             }

extensions/devservices/mariadb/src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java

@@ -42,9 +42,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withUsername(username.orElse(DEFAULT_DATABASE_USERNAME))
-                        .withPassword(password.orElse(DEFAULT_DATABASE_PASSWORD))
-                        .withDatabaseName(datasourceName.orElse(DEFAULT_DATABASE_NAME))
+
+                String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
+                container.withUsername(effectiveUsername)
+                        .withPassword(effectivePassword)
+                        .withDatabaseName(effectiveDbName)
                         .withReuse(true);
 
                 if (containerConfig.getContainerProperties().containsKey(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME)) {

extensions/devservices/mssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java

@@ -37,7 +37,12 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withPassword(password.orElse(DEFAULT_DATABASE_STRONG_PASSWORD))
+
+                String effectivePassword = containerConfig.getPassword()
+                        .orElse(password.orElse(DEFAULT_DATABASE_STRONG_PASSWORD));
+
+                // Defining the database name and the username is not supported by this container yet
+                container.withPassword(effectivePassword)
                         .withReuse(true);
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);

extensions/devservices/mysql/src/main/java/io/quarkus/devservices/mysql/deployment/MySQLDevServicesProcessor.java

@@ -41,9 +41,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withUsername(username.orElse(DEFAULT_DATABASE_USERNAME))
-                        .withPassword(password.orElse(DEFAULT_DATABASE_PASSWORD))
-                        .withDatabaseName(datasourceName.orElse(DEFAULT_DATABASE_NAME))
+
+                String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
+                container.withUsername(effectiveUsername)
+                        .withPassword(effectivePassword)
+                        .withDatabaseName(effectiveDbName)
                         .withReuse(true);
 
                 if (containerConfig.getContainerProperties().containsKey(MY_CNF_CONFIG_OVERRIDE_PARAM_NAME)) {

extensions/devservices/oracle/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java

@@ -42,9 +42,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withUsername(username.orElse(DEFAULT_DATABASE_USERNAME))
-                        .withPassword(password.orElse(DEFAULT_DATABASE_PASSWORD))
-                        .withDatabaseName(datasourceName.orElse(DEFAULT_DATABASE_NAME))
+
+                String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
+                container.withUsername(effectiveUsername)
+                        .withPassword(effectivePassword)
+                        .withDatabaseName(effectiveDbName)
                         .withReuse(true);
 
                 // We need to limit the maximum amount of CPUs being used by the container;

extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java

@@ -46,9 +46,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                         containerConfig.getFixedExposedPort(),
                         !devServicesSharedNetworkBuildItem.isEmpty());
                 startupTimeout.ifPresent(container::withStartupTimeout);
-                container.withUsername(username.orElse(DEFAULT_DATABASE_USERNAME))
-                        .withPassword(password.orElse(DEFAULT_DATABASE_PASSWORD))
-                        .withDatabaseName(datasourceName.orElse(DEFAULT_DATABASE_NAME))
+
+                String effectiveUsername = containerConfig.getUsername().orElse(username.orElse(DEFAULT_DATABASE_USERNAME));
+                String effectivePassword = containerConfig.getPassword().orElse(password.orElse(DEFAULT_DATABASE_PASSWORD));
+                String effectiveDbName = containerConfig.getDbName().orElse(datasourceName.orElse(DEFAULT_DATABASE_NAME));
+
+                container.withUsername(effectiveUsername)
+                        .withPassword(effectivePassword)
+                        .withDatabaseName(effectiveDbName)
                         .withReuse(true);
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);