From 5786611877fab2e8a5894086936b73dbfde97167 Mon Sep 17 00:00:00 2001 From: Marcin S Date: Fri, 1 Dec 2023 12:12:16 +0100 Subject: [PATCH] Check if flag is present in output --- .../src/providers/k8s/substrateCliArgsHelper.ts | 10 +++++++--- .../src/providers/native/substrateCliArgsHelper.ts | 11 ++++++++--- .../src/providers/podman/substrateCliArgsHelper.ts | 11 ++++++++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/javascript/packages/orchestrator/src/providers/k8s/substrateCliArgsHelper.ts b/javascript/packages/orchestrator/src/providers/k8s/substrateCliArgsHelper.ts index 93a9db82f..6d75efaf0 100644 --- a/javascript/packages/orchestrator/src/providers/k8s/substrateCliArgsHelper.ts +++ b/javascript/packages/orchestrator/src/providers/k8s/substrateCliArgsHelper.ts @@ -23,7 +23,11 @@ export const getCliArgsVersion = async ( await client.spawnFromDef(podDef); const logs = await client.getNodeLogs(podName); - return logs.includes("--ws-port ") - ? SubstrateCliArgsVersion.V0 - : SubstrateCliArgsVersion.V2; + if logs.includes("--ws-port ") { + return SubstrateCliArgsVersion.V0; + } else if !logs.includes("--insecure-validator-i-know-what-i-do") { + return SubstrateCliArgsVersion.V1; + } else { + return SubstrateCliArgsVersion.V2; + } }; diff --git a/javascript/packages/orchestrator/src/providers/native/substrateCliArgsHelper.ts b/javascript/packages/orchestrator/src/providers/native/substrateCliArgsHelper.ts index 2f0176ee5..bc72c12c3 100644 --- a/javascript/packages/orchestrator/src/providers/native/substrateCliArgsHelper.ts +++ b/javascript/packages/orchestrator/src/providers/native/substrateCliArgsHelper.ts @@ -10,7 +10,12 @@ export const getCliArgsVersion = async ( const logs = (await client.runCommand(["-c", fullCmd], { allowFail: true })) .stdout; - return logs.includes("--ws-port ") - ? SubstrateCliArgsVersion.V0 - : SubstrateCliArgsVersion.V2; + + if logs.includes("--ws-port ") { + return SubstrateCliArgsVersion.V0; + } else if !logs.includes("--insecure-validator-i-know-what-i-do") { + return SubstrateCliArgsVersion.V1; + } else { + return SubstrateCliArgsVersion.V2; + } }; diff --git a/javascript/packages/orchestrator/src/providers/podman/substrateCliArgsHelper.ts b/javascript/packages/orchestrator/src/providers/podman/substrateCliArgsHelper.ts index dd7af21e2..a32bfceff 100644 --- a/javascript/packages/orchestrator/src/providers/podman/substrateCliArgsHelper.ts +++ b/javascript/packages/orchestrator/src/providers/podman/substrateCliArgsHelper.ts @@ -20,7 +20,12 @@ export const getCliArgsVersion = async ( await client.spawnFromDef(podDef); const logs = await client.getNodeLogs(podName); - return logs.includes("--ws-port ") - ? SubstrateCliArgsVersion.V0 - : SubstrateCliArgsVersion.V2; + + if logs.includes("--ws-port ") { + return SubstrateCliArgsVersion.V0; + } else if !logs.includes("--insecure-validator-i-know-what-i-do") { + return SubstrateCliArgsVersion.V1; + } else { + return SubstrateCliArgsVersion.V2; + } };