Merge pull request 'Task #253 follow-up — fix test-all.ps1 StrictMode crash on missing JSON keys' (#215) from task-253d-e2e-debug-harness into v2

scripts/e2e/test-all.ps1

@@ -32,9 +32,20 @@ if (-not (Test-Path $ConfigFile)) {
     exit 2
 }
 
-$config = Get-Content $ConfigFile -Raw | ConvertFrom-Json
+# -AsHashtable + Get-Or below keeps access tolerant of missing keys even under
+# Set-StrictMode -Version 3.0 (inherited from _common.ps1). Without this a
+# missing "$config.ablegacy" throws "property cannot be found on this object".
+$config = Get-Content $ConfigFile -Raw | ConvertFrom-Json -AsHashtable
 $summary = [ordered]@{}
 
+# Return $Table[$Key] if present, else $Default. Nested tables are themselves
+# hashtables so this composes: (Get-Or $config modbus)['opcUaUrl'].
+function Get-Or {
+    param($Table, [string]$Key, $Default = $null)
+    if ($Table -and $Table.ContainsKey($Key)) { return $Table[$Key] }
+    return $Default
+}
+
 function Run-Suite {
     param(
         [string]$Name,
@@ -54,13 +65,14 @@ function Run-Suite {
 # Modbus
 # ---------------------------------------------------------------------------
 
-if ($config.modbus) {
+$modbus = Get-Or $config "modbus"
+if ($modbus) {
     Write-Header "== MODBUS =="
     Run-Suite "modbus" {
         & "$PSScriptRoot/test-modbus.ps1" `
-            -ModbusHost   $config.modbus.endpoint `
+            -ModbusHost   $modbus["endpoint"] `
-            -OpcUaUrl     ($config.modbus.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $modbus "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.modbus.bridgeNodeId
+            -BridgeNodeId $modbus["bridgeNodeId"]
     }
 }
 else { $summary["modbus"] = "SKIP (no config entry)" }
@@ -69,15 +81,16 @@ else { $summary["modbus"] = "SKIP (no config entry)" }
 # AB CIP
 # ---------------------------------------------------------------------------
 
-if ($config.abcip) {
+$abcip = Get-Or $config "abcip"
+if ($abcip) {
     Write-Header "== AB CIP =="
     Run-Suite "abcip" {
         & "$PSScriptRoot/test-abcip.ps1" `
-            -Gateway      $config.abcip.gateway `
+            -Gateway      $abcip["gateway"] `
-            -Family       ($config.abcip.family ?? "ControlLogix") `
+            -Family       (Get-Or $abcip "family" "ControlLogix") `
-            -TagPath      ($config.abcip.tagPath ?? "TestDINT") `
+            -TagPath      (Get-Or $abcip "tagPath" "TestDINT") `
-            -OpcUaUrl     ($config.abcip.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $abcip "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.abcip.bridgeNodeId
+            -BridgeNodeId $abcip["bridgeNodeId"]
     }
 }
 else { $summary["abcip"] = "SKIP (no config entry)" }
@@ -86,15 +99,16 @@ else { $summary["abcip"] = "SKIP (no config entry)" }
 # AB Legacy
 # ---------------------------------------------------------------------------
 
-if ($config.ablegacy) {
+$ablegacy = Get-Or $config "ablegacy"
+if ($ablegacy) {
     Write-Header "== AB LEGACY =="
     Run-Suite "ablegacy" {
         & "$PSScriptRoot/test-ablegacy.ps1" `
-            -Gateway      $config.ablegacy.gateway `
+            -Gateway      $ablegacy["gateway"] `
-            -PlcType      ($config.ablegacy.plcType ?? "Slc500") `
+            -PlcType      (Get-Or $ablegacy "plcType" "Slc500") `
-            -Address      ($config.ablegacy.address ?? "N7:5") `
+            -Address      (Get-Or $ablegacy "address" "N7:5") `
-            -OpcUaUrl     ($config.ablegacy.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $ablegacy "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.ablegacy.bridgeNodeId
+            -BridgeNodeId $ablegacy["bridgeNodeId"]
     }
 }
 else { $summary["ablegacy"] = "SKIP (no config entry)" }
@@ -103,16 +117,17 @@ else { $summary["ablegacy"] = "SKIP (no config entry)" }
 # S7
 # ---------------------------------------------------------------------------
 
-if ($config.s7) {
+$s7 = Get-Or $config "s7"
+if ($s7) {
     Write-Header "== S7 =="
     Run-Suite "s7" {
         & "$PSScriptRoot/test-s7.ps1" `
-            -S7Host       $config.s7.endpoint `
+            -S7Host       $s7["endpoint"] `
-            -Cpu          ($config.s7.cpu ?? "S71500") `
+            -Cpu          (Get-Or $s7 "cpu" "S71500") `
-            -Slot         ($config.s7.slot ?? 0) `
+            -Slot         (Get-Or $s7 "slot" 0) `
-            -Address      ($config.s7.address ?? "DB1.DBW0") `
+            -Address      (Get-Or $s7 "address" "DB1.DBW0") `
-            -OpcUaUrl     ($config.s7.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $s7 "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.s7.bridgeNodeId
+            -BridgeNodeId $s7["bridgeNodeId"]
     }
 }
 else { $summary["s7"] = "SKIP (no config entry)" }
@@ -121,15 +136,16 @@ else { $summary["s7"] = "SKIP (no config entry)" }
 # FOCAS
 # ---------------------------------------------------------------------------
 
-if ($config.focas) {
+$focas = Get-Or $config "focas"
+if ($focas) {
     Write-Header "== FOCAS =="
     Run-Suite "focas" {
         & "$PSScriptRoot/test-focas.ps1" `
-            -CncHost      $config.focas.host `
+            -CncHost      $focas["host"] `
-            -CncPort      ($config.focas.port ?? 8193) `
+            -CncPort      (Get-Or $focas "port" 8193) `
-            -Address      ($config.focas.address ?? "R100") `
+            -Address      (Get-Or $focas "address" "R100") `
-            -OpcUaUrl     ($config.focas.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $focas "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.focas.bridgeNodeId
+            -BridgeNodeId $focas["bridgeNodeId"]
     }
 }
 else { $summary["focas"] = "SKIP (no config entry)" }
@@ -138,15 +154,16 @@ else { $summary["focas"] = "SKIP (no config entry)" }
 # TwinCAT
 # ---------------------------------------------------------------------------
 
-if ($config.twincat) {
+$twincat = Get-Or $config "twincat"
+if ($twincat) {
     Write-Header "== TWINCAT =="
     Run-Suite "twincat" {
         & "$PSScriptRoot/test-twincat.ps1" `
-            -AmsNetId     $config.twincat.amsNetId `
+            -AmsNetId     $twincat["amsNetId"] `
-            -AmsPort      ($config.twincat.amsPort ?? 851) `
+            -AmsPort      (Get-Or $twincat "amsPort" 851) `
-            -SymbolPath   ($config.twincat.symbolPath ?? "MAIN.iCounter") `
+            -SymbolPath   (Get-Or $twincat "symbolPath" "MAIN.iCounter") `
-            -OpcUaUrl     ($config.twincat.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl     (Get-Or $twincat "opcUaUrl" $OpcUaUrl) `
-            -BridgeNodeId $config.twincat.bridgeNodeId
+            -BridgeNodeId $twincat["bridgeNodeId"]
     }
 }
 else { $summary["twincat"] = "SKIP (no config entry)" }
@@ -155,15 +172,17 @@ else { $summary["twincat"] = "SKIP (no config entry)" }
 # Phase 7 virtual tags + scripted alarms
 # ---------------------------------------------------------------------------
 
-if ($config.phase7) {
+$phase7 = Get-Or $config "phase7"
+if ($phase7) {
     Write-Header "== PHASE 7 virtual tags + scripted alarms =="
     Run-Suite "phase7" {
+        $defaultModbus = if ($modbus) { $modbus["endpoint"] } else { $null }
         & "$PSScriptRoot/test-phase7-virtualtags.ps1" `
-            -ModbusHost    ($config.phase7.modbusEndpoint ?? $config.modbus.endpoint) `
+            -ModbusHost    (Get-Or $phase7 "modbusEndpoint" $defaultModbus) `
-            -OpcUaUrl      ($config.phase7.opcUaUrl ?? $OpcUaUrl) `
+            -OpcUaUrl      (Get-Or $phase7 "opcUaUrl" $OpcUaUrl) `
-            -InputNodeId   $config.phase7.inputNodeId `
+            -InputNodeId   $phase7["inputNodeId"] `
-            -VirtualNodeId $config.phase7.virtualNodeId `
+            -VirtualNodeId $phase7["virtualNodeId"] `
-            -AlarmNodeId   ($config.phase7.alarmNodeId ?? $null)
+            -AlarmNodeId   (Get-Or $phase7 "alarmNodeId" $null)
     }
 }
 else { $summary["phase7"] = "SKIP (no config entry)" }