From 7880875f64fbaafdc6be432fdeec5fc6a3a6c5aa Mon Sep 17 00:00:00 2001 From: aphorise Date: Mon, 27 Jul 2020 20:33:57 +0200 Subject: [PATCH] Always provide version & storage type in status output (#9598) --- command/format.go | 4 +++- http/sys_seal.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/command/format.go b/command/format.go index d359901d50..b62c72c62c 100644 --- a/command/format.go +++ b/command/format.go @@ -335,6 +335,7 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo } out = append(out, fmt.Sprintf("Version | %s", status.Version)) + out = append(out, fmt.Sprintf("Storage Type | %s", status.StorageType)) if status.ClusterName != "" && status.ClusterID != "" { out = append(out, fmt.Sprintf("Cluster Name | %s", status.ClusterName)) @@ -347,7 +348,7 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo if err != nil && strings.Contains(err.Error(), "Vault is sealed") { leaderStatus = &api.LeaderResponse{HAEnabled: true} err = nil - } + } if err != nil { ui.Error(fmt.Sprintf("Error checking leader status: %s", err)) return 1 @@ -355,6 +356,7 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo // Output if HA is enabled out = append(out, fmt.Sprintf("HA Enabled | %t", leaderStatus.HAEnabled)) + if leaderStatus.HAEnabled { mode := "sealed" if !status.Sealed { diff --git a/http/sys_seal.go b/http/sys_seal.go index a13573addd..3221f90fac 100644 --- a/http/sys_seal.go +++ b/http/sys_seal.go @@ -199,6 +199,7 @@ func handleSysSealStatusRaw(core *vault.Core, w http.ResponseWriter, r *http.Req Sealed: true, RecoverySeal: core.SealAccess().RecoveryKeySupported(), StorageType: core.StorageType(), + Version: version.GetVersion().VersionNumber(), }) return }