From 8abd8d13889d17d88022f7a3840f0bb662c97c9a Mon Sep 17 00:00:00 2001
From: Javier Viola <javier@parity.io>
Date: Mon, 23 Jan 2023 09:12:06 -0300
Subject: [PATCH] fix logic for relay-chain-rpc-url flag

---
 javascript/packages/cli/src/cli.ts            |   3 +-
 .../packages/orchestrator/src/cmdGenerator.ts | 118 +++++++++---------
 2 files changed, 58 insertions(+), 63 deletions(-)

diff --git a/javascript/packages/cli/src/cli.ts b/javascript/packages/cli/src/cli.ts
index 1c6efdd5e..6e319e1d9 100644
--- a/javascript/packages/cli/src/cli.ts
+++ b/javascript/packages/cli/src/cli.ts
@@ -457,7 +457,8 @@ async function spawn(
     }
   }
 
-  const options = { monitor, spawnConcurrency, dir, force };
+  const inCI = process.env.RUN_IN_CONTAINER === "1";
+  const options = { monitor, spawnConcurrency, dir, force, inCI };
   network = await start(creds, config, options);
   network.showNetworkInfo(config.settings?.provider);
 }
diff --git a/javascript/packages/orchestrator/src/cmdGenerator.ts b/javascript/packages/orchestrator/src/cmdGenerator.ts
index 81cbd2998..5ffbbcac8 100644
--- a/javascript/packages/orchestrator/src/cmdGenerator.ts
+++ b/javascript/packages/orchestrator/src/cmdGenerator.ts
@@ -124,73 +124,67 @@ export async function genCumulusCollatorCmd(
       }
     }
 
-    if (
-      fullCmd.findIndex((thisArg) =>
-        thisArg.includes("relay-chain-rpc-url"),
-      ) === -1
-    ) {
-      // Arguments for the relay chain node part of the collator binary.
-      fullCmd.push(
-        ...[
-          "--",
-          "--base-path",
-          relayDataPath,
-          "--chain",
-          `${cfgPath}/${relayChain}.json`,
-          "--execution wasm",
-        ],
-      );
-
-      if (argsFullNode) {
-        // Add any additional flags to the CLI
-        for (const [index, arg] of argsFullNode.entries()) {
-          if (collatorPorts[arg] >= 0) {
-            // port passed as argument, we need to ensure is not a default one because it will be
-            // use by the parachain part.
-            const selectedPort = parseInt(argsFullNode[index + 1], 10);
-            if (
-              [
-                P2P_PORT,
-                RPC_HTTP_PORT,
-                RPC_WS_PORT,
-                nodeSetup.p2pPort,
-                nodeSetup.rpcPort,
-                nodeSetup.wsPort,
-              ].includes(selectedPort)
-            ) {
-              console.log(
-                decorators.yellow(
-                  `WARN: default port configured, changing to use a random free port`,
-                ),
-              );
-              const randomPort = await getRandomPort();
-              collatorPorts[arg] = randomPort;
-              argsFullNode[index + 1] = randomPort.toString();
-            }
-          }
-        }
+    // Arguments for the relay chain node part of the collator binary.
+    fullCmd.push(
+      ...[
+        "--",
+        "--base-path",
+        relayDataPath,
+        "--chain",
+        `${cfgPath}/${relayChain}.json`,
+        "--execution wasm",
+      ],
+    );
 
-        // check ports
-        for (const portArg of Object.keys(collatorPorts)) {
-          if (collatorPorts[portArg] === 0) {
+    if (argsFullNode) {
+      // Add any additional flags to the CLI
+      for (const [index, arg] of argsFullNode.entries()) {
+        if (collatorPorts[arg] >= 0) {
+          // port passed as argument, we need to ensure is not a default one because it will be
+          // use by the parachain part.
+          const selectedPort = parseInt(argsFullNode[index + 1], 10);
+          if (
+            [
+              P2P_PORT,
+              RPC_HTTP_PORT,
+              RPC_WS_PORT,
+              nodeSetup.p2pPort,
+              nodeSetup.rpcPort,
+              nodeSetup.wsPort,
+            ].includes(selectedPort)
+          ) {
+            console.log(
+              decorators.yellow(
+                `WARN: default port configured, changing to use a random free port`,
+              ),
+            );
             const randomPort = await getRandomPort();
-            argsFullNode.push(portArg);
-            argsFullNode.push(randomPort.toString());
-            debug(`Added ${portArg} with value ${randomPort}`);
+            collatorPorts[arg] = randomPort;
+            argsFullNode[index + 1] = randomPort.toString();
           }
         }
+      }
+
+      // check ports
+      for (const portArg of Object.keys(collatorPorts)) {
+        if (collatorPorts[portArg] === 0) {
+          const randomPort = await getRandomPort();
+          argsFullNode.push(portArg);
+          argsFullNode.push(randomPort.toString());
+          debug(`Added ${portArg} with value ${randomPort}`);
+        }
+      }
 
-        fullCmd = fullCmd.concat(argsFullNode);
-        debug(`Added ${argsFullNode} to collator`);
-      } else {
-        // ensure ports
-        for (const portArg of Object.keys(collatorPorts)) {
-          if (collatorPorts[portArg] === 0) {
-            const randomPort = await getRandomPort();
-            fullCmd.push(portArg);
-            fullCmd.push(randomPort.toString());
-            debug(`Added ${portArg} with value ${randomPort}`);
-          }
+      fullCmd = fullCmd.concat(argsFullNode);
+      debug(`Added ${argsFullNode} to collator`);
+    } else {
+      // ensure ports
+      for (const portArg of Object.keys(collatorPorts)) {
+        if (collatorPorts[portArg] === 0) {
+          const randomPort = await getRandomPort();
+          fullCmd.push(portArg);
+          fullCmd.push(randomPort.toString());
+          debug(`Added ${portArg} with value ${randomPort}`);
         }
       }
     }