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

hashicorp · Jul 27, 2020 · 7880875 · 7880875
1 parent f5f1123
commit 7880875
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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,14 +348,15 @@ 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
 	}
 
 	// 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
@@ -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
 	}