mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-03 20:17:59 +00:00
Handle missed error case in seal status output format (#4001)
Fixes #3998
This commit is contained in:
@@ -298,6 +298,11 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo
|
|||||||
leaderStatus, err := client.Sys().Leader()
|
leaderStatus, err := client.Sys().Leader()
|
||||||
if err != nil && strings.Contains(err.Error(), "Vault is sealed") {
|
if err != nil && strings.Contains(err.Error(), "Vault is sealed") {
|
||||||
leaderStatus = &api.LeaderResponse{HAEnabled: true}
|
leaderStatus = &api.LeaderResponse{HAEnabled: true}
|
||||||
|
err = nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
ui.Error(fmt.Sprintf("Error checking leader status: %s", err))
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
// Output if HA is enabled
|
// Output if HA is enabled
|
||||||
@@ -305,16 +310,23 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo
|
|||||||
if leaderStatus.HAEnabled {
|
if leaderStatus.HAEnabled {
|
||||||
mode := "sealed"
|
mode := "sealed"
|
||||||
if !status.Sealed {
|
if !status.Sealed {
|
||||||
|
out = append(out, fmt.Sprintf("HA Cluster | %s", leaderStatus.LeaderClusterAddress))
|
||||||
mode = "standby"
|
mode = "standby"
|
||||||
|
showLeaderAddr := false
|
||||||
if leaderStatus.IsSelf {
|
if leaderStatus.IsSelf {
|
||||||
mode = "active"
|
mode = "active"
|
||||||
|
} else {
|
||||||
|
if leaderStatus.LeaderAddress == "" {
|
||||||
|
leaderStatus.LeaderAddress = "<none>"
|
||||||
|
}
|
||||||
|
showLeaderAddr = true
|
||||||
}
|
}
|
||||||
}
|
out = append(out, fmt.Sprintf("HA Mode | %s", mode))
|
||||||
|
|
||||||
out = append(out, fmt.Sprintf("HA Mode | %s", mode))
|
// This is down here just to keep ordering consistent
|
||||||
|
if showLeaderAddr {
|
||||||
if !status.Sealed {
|
out = append(out, fmt.Sprintf("Active Node Address: | %s", leaderStatus.LeaderAddress))
|
||||||
out = append(out, fmt.Sprintf("HA Cluster | %s", leaderStatus.LeaderClusterAddress))
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user