Introduce server version detection in AddDatasource offline command

wildfly-extras · Sep 10, 2024 · 154bdf9 · 154bdf9
1 parent ce08561
commit 154bdf9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/commands/src/main/java/org/wildfly/extras/creaper/commands/datasources/AddDataSource.java b/commands/src/main/java/org/wildfly/extras/creaper/commands/datasources/AddDataSource.java
@@ -295,6 +295,8 @@ public final void apply(OfflineCommandContext ctx) throws CommandFailedException
                 .parameter("enableAfterCreation", enableAfterCreation)
                 .parameter("replaceExisting", replaceExisting)
 
+                .parameter("serverVersion", ctx.version)
+
                 .build();
 
         ctx.client.apply(transform);

diff --git a/...s/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy b/...s/src/main/resources/org/wildfly/extras/creaper/commands/datasources/AddDataSource.groovy
@@ -1,3 +1,5 @@
+import org.wildfly.extras.creaper.core.ServerVersion
+
 // attributes of <datasource>
 datasourceAttrs = ['pool-name': poolName]
 if (nn(jta)) datasourceAttrs['jta'] = jta
@@ -45,9 +47,15 @@ def dsDefinition = {
         }
         if (nn(userName, password, securityDomain)) {
             securityAttrs = [:]
-            if (nn(userName)) securityAttrs['user-name'] = userName
-            if (nn(password)) securityAttrs['password'] = password
+            if (serverVersion.greaterThanOrEqualTo(ServerVersion.VERSION_23_0_0)) { // see https://issues.redhat.com/browse/WFLY-18324
+                if (nn(userName)) securityAttrs['user-name'] = userName
+                if (nn(password)) securityAttrs['password'] = password
+            }
             security(securityAttrs) {
+                if (serverVersion.lessThan(ServerVersion.VERSION_23_0_0)) { // see https://issues.redhat.com/browse/WFLY-18324
+                    if (nn(userName)) 'user-name'(userName)
+                    if (nn(password)) 'password'(password)
+                }
                 if (nn(securityDomain)) 'security-domain'(securityDomain)
             }
         }