Revert "CORDA-3307 - add support for environment variables in linux (#5523)" (#5643)

This reverts commit c882b221a5.
2025-06-19 07:38:22 +00:00 · 2019-10-29 17:55:58 +00:00
parent d5462a2afe
commit 03ab258fc2
11 changed files with 32 additions and 304 deletions
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
@ -199,8 +199,7 @@ fun <A> driver(defaultParameters: DriverParameters = DriverParameters(), dsl: Dr
                    networkParameters = defaultParameters.networkParameters,
                    notaryCustomOverrides = defaultParameters.notaryCustomOverrides,
                    inMemoryDB = defaultParameters.inMemoryDB,
-                    cordappsForAllNodes = uncheckedCast(defaultParameters.cordappsForAllNodes),
-                    environmentVariables = defaultParameters.environmentVariables
+                    cordappsForAllNodes = uncheckedCast(defaultParameters.cordappsForAllNodes)
            ),
            coerce = { it },
            dsl = dsl
@ -256,46 +255,10 @@ data class DriverParameters(
        val networkParameters: NetworkParameters = testNetworkParameters(notaries = emptyList()),
        val notaryCustomOverrides: Map<String, Any?> = emptyMap(),
        val inMemoryDB: Boolean = true,
-        val cordappsForAllNodes: Collection<TestCordapp>? = null,
-        val environmentVariables : Map<String, String> = emptyMap()
+        val cordappsForAllNodes: Collection<TestCordapp>? = null
 ) {
    constructor(cordappsForAllNodes: Collection<TestCordapp>) : this(isDebug = false, cordappsForAllNodes = cordappsForAllNodes)

-    constructor(
-            isDebug: Boolean = false,
-            driverDirectory: Path = Paths.get("build") / "node-driver" / getTimestampAsDirectoryName(),
-            portAllocation: PortAllocation = incrementalPortAllocation(),
-            debugPortAllocation: PortAllocation = incrementalPortAllocation(),
-            systemProperties: Map<String, String> = emptyMap(),
-            useTestClock: Boolean = false,
-            startNodesInProcess: Boolean = false,
-            waitForAllNodesToFinish: Boolean = false,
-            notarySpecs: List<NotarySpec> = listOf(NotarySpec(DUMMY_NOTARY_NAME)),
-            extraCordappPackagesToScan: List<String> = emptyList(),
-            @Suppress("DEPRECATION") jmxPolicy: JmxPolicy = JmxPolicy(),
-            networkParameters: NetworkParameters = testNetworkParameters(notaries = emptyList()),
-            notaryCustomOverrides: Map<String, Any?> = emptyMap(),
-            inMemoryDB: Boolean = true,
-            cordappsForAllNodes: Collection<TestCordapp>? = null
-    ) : this(
-            isDebug,
-            driverDirectory,
-            portAllocation,
-            debugPortAllocation,
-            systemProperties,
-            useTestClock,
-            startNodesInProcess,
-            waitForAllNodesToFinish,
-            notarySpecs,
-            extraCordappPackagesToScan,
-            jmxPolicy,
-            networkParameters,
-            notaryCustomOverrides,
-            inMemoryDB,
-            cordappsForAllNodes,
-            environmentVariables = emptyMap()
-    )
-
    constructor(
            isDebug: Boolean = false,
            driverDirectory: Path = Paths.get("build") / "node-driver" / getTimestampAsDirectoryName(),
@ -410,7 +373,6 @@ data class DriverParameters(
    fun withNotaryCustomOverrides(notaryCustomOverrides: Map<String, Any?>): DriverParameters = copy(notaryCustomOverrides = notaryCustomOverrides)
    fun withInMemoryDB(inMemoryDB: Boolean): DriverParameters = copy(inMemoryDB = inMemoryDB)
    fun withCordappsForAllNodes(cordappsForAllNodes: Collection<TestCordapp>?): DriverParameters = copy(cordappsForAllNodes = cordappsForAllNodes)
-    fun withEnvironmentVariables(variables : Map<String, String>): DriverParameters = copy(environmentVariables = variables)

    fun copy(
            isDebug: Boolean,
@ -471,40 +433,4 @@ data class DriverParameters(
            notaryCustomOverrides = emptyMap(),
            cordappsForAllNodes = cordappsForAllNodes
    )
-
-    @Suppress("LongParameterList")
-    fun copy(
-            isDebug: Boolean,
-            driverDirectory: Path,
-            portAllocation: PortAllocation,
-            debugPortAllocation: PortAllocation,
-            systemProperties: Map<String, String>,
-            useTestClock: Boolean,
-            startNodesInProcess: Boolean,
-            waitForAllNodesToFinish: Boolean,
-            notarySpecs: List<NotarySpec>,
-            extraCordappPackagesToScan: List<String>,
-            jmxPolicy: JmxPolicy,
-            networkParameters: NetworkParameters,
-            notaryCustomOverrides: Map<String, Any?>,
-            inMemoryDB: Boolean,
-            cordappsForAllNodes: Collection<TestCordapp>?
-    ) = this.copy(
-            isDebug = isDebug,
-            driverDirectory = driverDirectory,
-            portAllocation = portAllocation,
-            debugPortAllocation = debugPortAllocation,
-            systemProperties = systemProperties,
-            useTestClock = useTestClock,
-            startNodesInProcess = startNodesInProcess,
-            waitForAllNodesToFinish = waitForAllNodesToFinish,
-            notarySpecs = notarySpecs,
-            extraCordappPackagesToScan = extraCordappPackagesToScan,
-            jmxPolicy = jmxPolicy,
-            networkParameters = networkParameters,
-            notaryCustomOverrides = notaryCustomOverrides,
-            inMemoryDB = inMemoryDB,
-            cordappsForAllNodes = cordappsForAllNodes,
-            environmentVariables = emptyMap()
-    )
 }
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
@ -91,8 +91,7 @@ class DriverDSLImpl(
        val networkParameters: NetworkParameters,
        val notaryCustomOverrides: Map<String, Any?>,
        val inMemoryDB: Boolean,
-        val cordappsForAllNodes: Collection<TestCordappInternal>?,
-        val environmentVariables : Map<String, String>
+        val cordappsForAllNodes: Collection<TestCordappInternal>?
 ) : InternalDriverDSL {

    private var _executorService: ScheduledExecutorService? = null
@ -289,11 +288,9 @@ class DriverDSLImpl(
        } else {
            startOutOfProcessMiniNode(
                    config,
-                    arrayOf(
-                        "initial-registration",
-                        "--network-root-truststore=${rootTruststorePath.toAbsolutePath()}",
-                        "--network-root-truststore-password=$rootTruststorePassword"
-                    )
+                    "initial-registration",
+                    "--network-root-truststore=${rootTruststorePath.toAbsolutePath()}",
+                    "--network-root-truststore-password=$rootTruststorePassword"
            ).map { config }
        }
    }
@ -453,7 +450,7 @@ class DriverDSLImpl(
            } else {
                // TODO The config we use here is uses a hardocded p2p port which changes when the node is run proper
                // This causes two node info files to be generated.
-                startOutOfProcessMiniNode(config, arrayOf("generate-node-info")).map {
+                startOutOfProcessMiniNode(config, "generate-node-info").map {
                    // Once done we have to read the signed node info file that's been generated
                    val nodeInfoFile = config.corda.baseDirectory.list { paths ->
                        paths.filter { it.fileName.toString().startsWith(NodeInfoFilesCopier.NODE_INFO_FILE_NAME_PREFIX) }.findFirst().get()
@ -539,7 +536,7 @@ class DriverDSLImpl(
     * Start the node with the given flag which is expected to start the node for some function, which once complete will
     * terminate the node.
     */
-    private fun startOutOfProcessMiniNode(config: NodeConfig, extraCmdLineFlag: Array<String> = emptyArray()): CordaFuture<Unit> {
+    private fun startOutOfProcessMiniNode(config: NodeConfig, vararg extraCmdLineFlag: String): CordaFuture<Unit> {
        val debugPort = if (isDebug) debugPortAllocation.nextPort() else null
        val process = startOutOfProcessNode(
                config,
@ -548,8 +545,7 @@ class DriverDSLImpl(
                systemProperties,
                "512m",
                null,
-                environmentVariables,
-                extraCmdLineFlag
+                *extraCmdLineFlag
        )

        return poll(executorService, "$extraCmdLineFlag (${config.corda.myLegalName})") {
@ -606,15 +602,7 @@ class DriverDSLImpl(
            nodeFuture
        } else {
            val debugPort = if (isDebug) debugPortAllocation.nextPort() else null
-            val process = startOutOfProcessNode(
-                    config,
-                    quasarJarPath,
-                    debugPort,
-                    systemProperties,
-                    parameters.maximumHeapSize,
-                    parameters.logLevelOverride,
-                    environmentVariables
-            )
+            val process = startOutOfProcessNode(config, quasarJarPath, debugPort, systemProperties, parameters.maximumHeapSize, parameters.logLevelOverride)

            // Destroy the child process when the parent exits.This is needed even when `waitForAllNodesToFinish` is
            // true because we don't want orphaned processes in the case that the parent process is terminated by the
@ -738,7 +726,6 @@ class DriverDSLImpl(
            }
        }

-        @Suppress("LongParameterList")
        private fun startOutOfProcessNode(
                config: NodeConfig,
                quasarJarPath: String,
@ -746,11 +733,9 @@ class DriverDSLImpl(
                overriddenSystemProperties: Map<String, String>,
                maximumHeapSize: String,
                logLevelOverride: String?,
-                environmentVariables : Map<String,String>,
-                extraCmdLineFlag: Array<String> = emptyArray()
-      ): Process {
-            log.info("Starting out-of-process Node ${config.corda.myLegalName.organisation}, " +
-                     "debug port is " + (debugPort ?: "not enabled"))
+                vararg extraCmdLineFlag: String
+        ): Process {
+            log.info("Starting out-of-process Node ${config.corda.myLegalName.organisation}, debug port is " + (debugPort ?: "not enabled"))
            // Write node.conf
            writeConfig(config.corda.baseDirectory, "node.conf", config.typesafe.toNodeOnly())

@ -789,7 +774,7 @@ class DriverDSLImpl(
                    "--base-directory=${config.corda.baseDirectory}",
                    "--logging-level=$loggingLevel",
                    "--no-local-shell").also {
-                it.addAll(extraCmdLineFlag)
+                it += extraCmdLineFlag
            }.toList()

            // The following dependencies are excluded from the classpath of the created JVM, so that the environment resembles a real one as close as possible.
@ -807,8 +792,7 @@ class DriverDSLImpl(
                    extraJvmArguments = extraJvmArguments,
                    workingDirectory = config.corda.baseDirectory,
                    maximumHeapSize = maximumHeapSize,
-                    classPath = cp,
-                    environmentVariables = environmentVariables
+                    classPath = cp
            )
        }

@ -1029,8 +1013,7 @@ fun <DI : DriverDSL, D : InternalDriverDSL, A> genericDriver(
                    networkParameters = defaultParameters.networkParameters,
                    notaryCustomOverrides = defaultParameters.notaryCustomOverrides,
                    inMemoryDB = defaultParameters.inMemoryDB,
-                    cordappsForAllNodes = uncheckedCast(defaultParameters.cordappsForAllNodes),
-                    environmentVariables = defaultParameters.environmentVariables
+                    cordappsForAllNodes = uncheckedCast(defaultParameters.cordappsForAllNodes)
            )
    )
    val shutdownHook = addShutdownHook(driverDsl::shutdown)
@ -1107,7 +1090,6 @@ class SplitCompatibilityZoneParams(
    override fun config() : NetworkServicesConfig = config
 }

-@Suppress("LongParameterList")
 fun <A> internalDriver(
        isDebug: Boolean = DriverParameters().isDebug,
        driverDirectory: Path = DriverParameters().driverDirectory,
@ -1125,7 +1107,6 @@ fun <A> internalDriver(
        notaryCustomOverrides: Map<String, Any?> = DriverParameters().notaryCustomOverrides,
        inMemoryDB: Boolean = DriverParameters().inMemoryDB,
        cordappsForAllNodes: Collection<TestCordappInternal>? = null,
-        environmentVariables: Map<String, String> = emptyMap(),
        dsl: DriverDSLImpl.() -> A
 ): A {
    return genericDriver(
@ -1145,8 +1126,7 @@ fun <A> internalDriver(
                    networkParameters = networkParameters,
                    notaryCustomOverrides = notaryCustomOverrides,
                    inMemoryDB = inMemoryDB,
-                    cordappsForAllNodes = cordappsForAllNodes,
-                    environmentVariables = environmentVariables
+                    cordappsForAllNodes = cordappsForAllNodes
            ),
            coerce = { it },
            dsl = dsl
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/ProcessUtilities.kt
@ -7,29 +7,17 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter

 object ProcessUtilities {
-    @Suppress("LongParameterList")
    inline fun <reified C : Any> startJavaProcess(
            arguments: List<String>,
            classPath: List<String> = defaultClassPath,
            workingDirectory: Path? = null,
            jdwpPort: Int? = null,
            extraJvmArguments: List<String> = emptyList(),
-            maximumHeapSize: String? = null,
-            environmentVariables: Map<String, String> = emptyMap()
+            maximumHeapSize: String? = null
    ): Process {
-        return startJavaProcess(
-                C::class.java.name,
-                arguments,
-                classPath,
-                workingDirectory,
-                jdwpPort,
-                extraJvmArguments,
-                maximumHeapSize,
-                environmentVariables
-        )
+        return startJavaProcess(C::class.java.name, arguments, classPath, workingDirectory, jdwpPort, extraJvmArguments, maximumHeapSize)
    }

-    @Suppress("LongParameterList")
    fun startJavaProcess(
            className: String,
            arguments: List<String>,
@ -37,8 +25,7 @@ object ProcessUtilities {
            workingDirectory: Path? = null,
            jdwpPort: Int? = null,
            extraJvmArguments: List<String> = emptyList(),
-            maximumHeapSize: String? = null,
-            environmentVariables: Map<String,String> = emptyMap()
+            maximumHeapSize: String? = null
    ): Process {
        val command = mutableListOf<String>().apply {
            add(javaPath)
@ -51,7 +38,6 @@ object ProcessUtilities {
        }
        return ProcessBuilder(command).apply {
            inheritIO()
-            environment().putAll(environmentVariables)
            environment()["CLASSPATH"] = classPath.joinToString(File.pathSeparator)
            if (workingDirectory != null) {
                // Timestamp may be handy if the same process started, killed and then re-started. Without timestamp
--- a/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
+++ b/testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
@ -104,7 +104,6 @@ val fakeNodeLegalName = CordaX500Name(organisation = "Not:a:real:name", locality
 private val globalPortAllocation = incrementalPortAllocation()
 private val globalDebugPortAllocation = incrementalPortAllocation()

-@Suppress("LongParameterList")
 fun <A> rpcDriver(
        isDebug: Boolean = false,
        driverDirectory: Path = Paths.get("build") / "rpc-driver" /  getTimestampAsDirectoryName(),
@ -122,7 +121,6 @@ fun <A> rpcDriver(
        notaryCustomOverrides: Map<String, Any?> = emptyMap(),
        inMemoryDB: Boolean = true,
        cordappsForAllNodes: Collection<TestCordappInternal>? = null,
-        environmentVariables: Map<String, String> = emptyMap(),
        dsl: RPCDriverDSL.() -> A
 ): A {
    return genericDriver(
@ -143,8 +141,7 @@ fun <A> rpcDriver(
                            networkParameters = networkParameters,
                            notaryCustomOverrides = notaryCustomOverrides,
                            inMemoryDB = inMemoryDB,
-                            cordappsForAllNodes = cordappsForAllNodes,
-                            environmentVariables = environmentVariables
+                            cordappsForAllNodes = cordappsForAllNodes
                    ), externalTrace
            ),
            coerce = { it },