feat: adds system expression evaluator to config evaluator list.

Author: outofcoffee

cmd/src/main/java/io/gatehill/imposter/cmd/ImposterLauncher.kt

@@ -42,11 +42,11 @@
  */
 package io.gatehill.imposter.cmd
 
+import io.gatehill.imposter.config.ConfigHolder
 import io.gatehill.imposter.config.util.ConfigUtil
 import io.gatehill.imposter.config.util.MetaUtil.readVersion
 import io.gatehill.imposter.plugin.DynamicPluginDiscoveryStrategyImpl
 import io.gatehill.imposter.plugin.internal.MetaInfPluginDetectorImpl
-import io.gatehill.imposter.server.ConfigHolder
 import io.gatehill.imposter.server.vertxweb.VertxWebServerFactoryImpl
 import io.gatehill.imposter.util.CryptoUtil.DEFAULT_KEYSTORE_PASSWORD
 import io.gatehill.imposter.util.CryptoUtil.DEFAULT_KEYSTORE_PATH

server/src/main/java/io/gatehill/imposter/server/ConfigHolder.kt core/config/src/main/java/io/gatehill/imposter/config/ConfigHolder.kt

@@ -40,7 +40,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Imposter.  If not, see <https://www.gnu.org/licenses/>.
  */
-package io.gatehill.imposter.server
+package io.gatehill.imposter.config
 
 import io.gatehill.imposter.ImposterConfig
 

core/engine/src/main/java/io/gatehill/imposter/placeholder/SystemEvaluator.kt core/config/src/main/java/io/gatehill/imposter/config/expression/SystemEvaluator.kt

@@ -41,11 +41,11 @@
  * along with Imposter.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.gatehill.imposter.placeholder
+package io.gatehill.imposter.config.expression
 
 import io.gatehill.imposter.ImposterConfig
+import io.gatehill.imposter.config.ConfigHolder
 import io.gatehill.imposter.expression.eval.ExpressionEvaluator
-import io.gatehill.imposter.util.InjectorUtil
 import org.apache.logging.log4j.LogManager
 
 /**
@@ -55,7 +55,7 @@ import org.apache.logging.log4j.LogManager
  * ```
  */
 object SystemEvaluator : ExpressionEvaluator<String> {
-    private val impl by lazy { SystemEvaluatorImpl(InjectorUtil.getInstance()) }
+    private val impl by lazy { SystemEvaluatorImpl(ConfigHolder.config) }
 
     override val name: String
         get() = impl.name

core/config/src/main/java/io/gatehill/imposter/config/util/ConfigUtil.kt

@@ -48,6 +48,7 @@ import io.gatehill.imposter.ImposterConfig
 import io.gatehill.imposter.config.ConfigReference
 import io.gatehill.imposter.config.LoadedConfig
 import io.gatehill.imposter.config.expression.EnvEvaluator
+import io.gatehill.imposter.config.expression.SystemEvaluator
 import io.gatehill.imposter.config.model.LightweightConfig
 import io.gatehill.imposter.config.resolver.ConfigResolver
 import io.gatehill.imposter.expression.eval.ExpressionEvaluator
@@ -136,7 +137,10 @@ object ConfigUtil {
 
     fun initInterpolators(environment: Map<String, String>) {
         // reset the environment used by the expression evaluator
-        expressionEvaluators = mapOf("env" to EnvEvaluator(environment))
+        expressionEvaluators = mapOf(
+            "env" to EnvEvaluator(environment),
+            "system" to SystemEvaluator,
+        )
     }
 
     /**

core/config/src/test/java/io/gatehill/imposter/config/ConfigUtilTest.kt

@@ -48,10 +48,12 @@ import io.gatehill.imposter.config.util.ConfigUtil
 import io.gatehill.imposter.config.util.EnvVars
 import io.gatehill.imposter.http.HttpMethod
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsString
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.nullValue
 import org.hamcrest.Matchers.startsWith
+import org.junit.AfterClass
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
@@ -64,8 +66,18 @@ import java.io.File
  * @author Pete Cornish
  */
 class ConfigUtilTest {
+    companion object {
+        @AfterClass
+        @JvmStatic
+        fun afterClass() {
+            ConfigHolder.config.listenPort = 0
+        }
+    }
+
     @Test
     fun testReadInterpolatedPluginConfig() {
+        ConfigHolder.config.listenPort = 9090
+
         // override environment variables in string interpolators
         val environment: Map<String, String> = mapOf(
             "EXAMPLE_PLUGIN" to "example-plugin"
@@ -79,6 +91,7 @@ class ConfigUtilTest {
         )
         val loadedConfig = ConfigUtil.readPluginConfig(configRef)
         assertEquals("example-plugin", loadedConfig.plugin)
+        assertThat(loadedConfig.serialised, containsString("port 9090"))
     }
 
     /**

core/engine/src/test/java/io/gatehill/imposter/placeholder/SystemEvaluatorTest.kt core/config/src/test/java/io/gatehill/imposter/config/expression/SystemEvaluatorTest.kt

@@ -1,4 +1,4 @@
-package io.gatehill.imposter.placeholder
+package io.gatehill.imposter.config.expression
 
 import io.gatehill.imposter.ImposterConfig
 import org.hamcrest.MatcherAssert.assertThat

core/config/src/test/resources/interpolated/test-config.yaml

@@ -4,4 +4,4 @@ plugin: "${env.EXAMPLE_PLUGIN}"
 path: "/test"
 contentType: text/plain
 response:
-  content: Hello, world!
+  content: Hello, world, listening on port 9090!

core/engine/src/main/java/io/gatehill/imposter/util/PlaceholderUtil.kt

@@ -42,6 +42,7 @@
  */
 package io.gatehill.imposter.util
 
+import io.gatehill.imposter.config.expression.SystemEvaluator
 import io.gatehill.imposter.expression.eval.ExpressionEvaluator
 import io.gatehill.imposter.expression.eval.RandomEvaluator
 import io.gatehill.imposter.expression.util.ExpressionUtil
@@ -50,7 +51,6 @@ import io.gatehill.imposter.placeholder.ContextEvaluator
 import io.gatehill.imposter.placeholder.DateTimeEvaluator
 import io.gatehill.imposter.placeholder.HttpExpressionEvaluator
 import io.gatehill.imposter.placeholder.QueryProviderImpl
-import io.gatehill.imposter.placeholder.SystemEvaluator
 
 /**
  * Replaces expression placeholders during the lifecycle of a request/response exchange.

docs/templates.md

@@ -257,6 +257,22 @@ Valid random functions:
 
 > Note: the syntax for `random` is slightly different to the other placeholder types. These are functions, not properties, so are called with parentheses.
 
+#### Customise length
+
+Customise the length of the generated value by passing `length=NUM` argument into the function.
+
+For example: `${random.alphabetic(length=5)}`
+
+This applies to the following functions:
+
+- alphabetic
+- alphanumeric
+- numeric
+
+#### Uppercase
+
+Convert the generated value to uppercase by passing `uppercase=true` argument 
+
 ### Items in a Store
 
 You can use items from a [Store](./stores.md), including data [captured](./data_capture.md) previously, or set by a script.

embedded/core/src/main/java/io/gatehill/imposter/embedded/ImposterBuilder.java

@@ -44,9 +44,9 @@
 package io.gatehill.imposter.embedded;
 
 import io.gatehill.imposter.ImposterConfig;
+import io.gatehill.imposter.config.ConfigHolder;
 import io.gatehill.imposter.plugin.Plugin;
 import io.gatehill.imposter.script.listener.ScriptListener;
-import io.gatehill.imposter.server.ConfigHolder;
 import io.gatehill.imposter.server.ImposterVerticle;
 import io.gatehill.imposter.service.script.EmbeddedScriptService;
 import io.gatehill.imposter.util.FeatureUtil;

server/src/main/java/io/gatehill/imposter/server/ImposterVerticle.kt

@@ -45,6 +45,7 @@ package io.gatehill.imposter.server
 import com.google.inject.Module
 import io.gatehill.imposter.EngineBuilder
 import io.gatehill.imposter.Imposter
+import io.gatehill.imposter.config.ConfigHolder
 import io.gatehill.imposter.scripting.common.CommonScriptingModule
 import io.gatehill.imposter.scripting.groovy.GroovyScriptingModule
 import io.gatehill.imposter.store.StoreModule

test/test-utils/src/main/java/io/gatehill/imposter/server/BaseVerticleTest.kt

@@ -43,6 +43,7 @@
 package io.gatehill.imposter.server
 
 import io.gatehill.imposter.ImposterConfig
+import io.gatehill.imposter.config.ConfigHolder
 import io.gatehill.imposter.config.util.EnvVars
 import io.gatehill.imposter.plugin.DynamicPluginDiscoveryStrategyImpl
 import io.gatehill.imposter.plugin.Plugin