Show elevated service runbook command
This commit is contained in:
parent
4cfad131d9
commit
d1fb4e69ff
3 changed files with 14 additions and 2 deletions
|
|
@ -2707,6 +2707,12 @@ fn main() -> Result<()> {
|
|||
"present",
|
||||
)
|
||||
))
|
||||
&& row.contains(&format!(
|
||||
"exec={}",
|
||||
elevated_powershell_runbook_command(
|
||||
&service_smoke_runbook_path.display().to_string(),
|
||||
)
|
||||
))
|
||||
&& row.contains("audit=cluster-service-execution-audit")
|
||||
&& row.contains("aftercare=tools/epiphany_local_run.ps1 -Mode cluster-service-execution-audit")
|
||||
})
|
||||
|
|
@ -2718,6 +2724,7 @@ fn main() -> Result<()> {
|
|||
&& row.contains("failedChecks=6")
|
||||
&& row.contains("missingChecks=6")
|
||||
&& row.contains("artifact=present")
|
||||
&& row.contains("exec=Start-Process PowerShell")
|
||||
&& row.contains("audit=service-execution-audit")
|
||||
&& row.contains("aftercare=tools/epiphany_local_run.ps1 -Mode service-execution-audit")
|
||||
})
|
||||
|
|
@ -3965,7 +3972,7 @@ fn swarm_action_rows(
|
|||
|
||||
fn swarm_action_tui_row(row: &SwarmActionRow) -> String {
|
||||
format!(
|
||||
"{:03} | {} | {} | {} | {} | service={} | route={} | command={} | mutates={} | elevated={} | failedChecks={} | missingChecks={} | artifact={} | sha256={} | audit={} | aftercare={}",
|
||||
"{:03} | {} | {} | {} | {} | service={} | route={} | command={} | mutates={} | elevated={} | failedChecks={} | missingChecks={} | artifact={} | sha256={} | exec={} | audit={} | aftercare={}",
|
||||
row.priority,
|
||||
row.family,
|
||||
row.status,
|
||||
|
|
@ -3980,6 +3987,7 @@ fn swarm_action_tui_row(row: &SwarmActionRow) -> String {
|
|||
row.service_execution_missing_check_count,
|
||||
row.operator_artifact_status,
|
||||
row.operator_artifact_sha256,
|
||||
row.operator_artifact_execution_command,
|
||||
row.completion_audit_wrapper_mode,
|
||||
row.operator_aftercare_command
|
||||
)
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1916,6 +1916,10 @@ if ($resultPath -ne "" -and (Test-Path -LiteralPath $resultPath)) {
|
|||
if ($null -eq $command -or $command -eq "") {
|
||||
$command = "none"
|
||||
}
|
||||
$executionCommand = $_.operatorArtifactExecutionCommand
|
||||
if ($null -eq $executionCommand -or $executionCommand -eq "") {
|
||||
$executionCommand = "none"
|
||||
}
|
||||
$failedChecks = $_.serviceExecutionFailedCheckCount
|
||||
if ($null -eq $failedChecks) {
|
||||
$failedChecks = 0
|
||||
|
|
@ -1932,7 +1936,7 @@ if ($resultPath -ne "" -and (Test-Path -LiteralPath $resultPath)) {
|
|||
if ($null -eq $serviceRoute -or $serviceRoute -eq "") {
|
||||
$serviceRoute = "none"
|
||||
}
|
||||
"$($_.priority):$($_.family):$($_.wrapperMode):$($_.status):service=${serviceId}:route=${serviceRoute}:command=${command}:mutates=$($_.mutatesState):elevated=$($_.requiresElevatedAuthority):failedChecks=${failedChecks}:missingChecks=${missingChecks}:artifactStatus=${artifactStatus}:sha256=${artifactSha256}:audit=${audit}:aftercare=${aftercare}:artifact=$artifact"
|
||||
"$($_.priority):$($_.family):$($_.wrapperMode):$($_.status):service=${serviceId}:route=${serviceRoute}:command=${command}:mutates=$($_.mutatesState):elevated=$($_.requiresElevatedAuthority):failedChecks=${failedChecks}:missingChecks=${missingChecks}:artifactStatus=${artifactStatus}:sha256=${artifactSha256}:exec=${executionCommand}:audit=${audit}:aftercare=${aftercare}:artifact=$artifact"
|
||||
}) -join "; ")
|
||||
}
|
||||
$serviceExecutionFailedChecks = Format-ServiceExecutionFailedChecks $result.serviceExecutionFailedCheckRows
|
||||
|
|
|
|||
Reference in a new issue