luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Always provide version & storage type in status output (#9598)

This commit is contained in:
aphorise 2020-07-27 20:33:57 +02:00 committed by GitHub
parent 389f57ffa8
commit 7e2f80b8c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/format.go
View File

@ -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("Version | %s", status.Version))
out = append(out, fmt.Sprintf("Storage Type | %s", status.StorageType))
if status.ClusterName != "" && status.ClusterID != "" { if status.ClusterName != "" && status.ClusterID != "" {
out = append(out, fmt.Sprintf("Cluster Name | %s", status.ClusterName)) 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") { if err != nil && strings.Contains(err.Error(), "Vault is sealed") {
leaderStatus = &api.LeaderResponse{HAEnabled: true} leaderStatus = &api.LeaderResponse{HAEnabled: true}
err = nil err = nil
} }
if err != nil { if err != nil {
ui.Error(fmt.Sprintf("Error checking leader status: %s", err)) ui.Error(fmt.Sprintf("Error checking leader status: %s", err))
return 1 return 1
@ -355,6 +356,7 @@ func OutputSealStatus(ui cli.Ui, client *api.Client, status *api.SealStatusRespo
// Output if HA is enabled // Output if HA is enabled
out = append(out, fmt.Sprintf("HA Enabled | %t", leaderStatus.HAEnabled)) out = append(out, fmt.Sprintf("HA Enabled | %t", leaderStatus.HAEnabled))
if leaderStatus.HAEnabled { if leaderStatus.HAEnabled {
mode := "sealed" mode := "sealed"
if !status.Sealed { if !status.Sealed {

1
http/sys_seal.go
View File

@ -199,6 +199,7 @@ func handleSysSealStatusRaw(core *vault.Core, w http.ResponseWriter, r *http.Req
Sealed: true, Sealed: true,
RecoverySeal: core.SealAccess().RecoveryKeySupported(), RecoverySeal: core.SealAccess().RecoveryKeySupported(),
StorageType: core.StorageType(), StorageType: core.StorageType(),
Version: version.GetVersion().VersionNumber(),
}) })
return return
} }